DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-cd): Fix server.config.url and slack service account (#1208)

Browse source 
* fix(argo-cd): Set 'server.config.url' to empty string

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* fix(argo-cd): Do not create slack service account

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marco Kilchhofer 2022-04-02 20:44:48 +02:00 committed by GitHub
parent 4b80adcfd8
commit d542b1e426
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.3.3 appVersion: v2.3.3
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 4.4.0 version: 4.4.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
keywords: keywords:
@ -21,4 +21,5 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Added]: Ability to use external/existing Redis (eg. a managed cloud service)" - "[Fixed]: Set 'server.config.url' to empty string so logout function can calculate the right redirect URL"
- "[Fixed]: Do not create slack service account when notifications controller is disabled"

2
charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml
View file

@ -1,4 +1,4 @@
{{ if .Values.notifications.bots.slack.enabled }} {{ if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:

2
charts/argo-cd/templates/argocd-notifications/bots/slack/role.yaml
View file

@ -1,4 +1,4 @@
{{ if .Values.notifications.bots.slack.enabled }} {{ if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:

2
charts/argo-cd/templates/argocd-notifications/bots/slack/rolebinding.yaml
View file

@ -1,4 +1,4 @@
{{ if .Values.notifications.bots.slack.enabled }} {{ if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:

2
charts/argo-cd/templates/argocd-notifications/bots/slack/service.yaml
View file

@ -1,4 +1,4 @@
{{ if .Values.notifications.bots.slack.enabled }} {{ if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled }}
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:

2
charts/argo-cd/templates/argocd-notifications/bots/slack/serviceaccount.yaml
View file

@ -1,4 +1,4 @@
{{- if .Values.notifications.bots.slack.serviceAccount.create }} {{- if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled .Values.notifications.bots.slack.serviceAccount.create }}
apiVersion: v1 apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
automountServiceAccountToken: {{ .Values.notifications.bots.slack.serviceAccount.automountServiceAccountToken }} automountServiceAccountToken: {{ .Values.notifications.bots.slack.serviceAccount.automountServiceAccountToken }}

2
charts/argo-cd/values.yaml
View file

@ -1152,7 +1152,7 @@ server:
# @default -- See [values.yaml] # @default -- See [values.yaml]
config: config:
# Argo CD's externally facing base URL (optional). Required when configuring SSO # Argo CD's externally facing base URL (optional). Required when configuring SSO
url: https://argocd.example.com url: ""
# Argo CD instance label key # Argo CD instance label key
application.instanceLabelKey: argocd.argoproj.io/instance application.instanceLabelKey: argocd.argoproj.io/instance