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

fix(argo-cd): Expose clusterResources in cluster secret (#1131)

Browse source 
* fix(argo-cd): Expose clusterResources in cluster secret

Signed-off-by: Matthias Lisin <ml@visu.li>

* Change indent

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

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Matthias Lisin 2022-03-01 22:57:52 +01:00 committed by GitHub
parent cbdcd902d7
commit 326d87a70c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.2.5 appVersion: v2.2.5
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 3.34.0 version: 3.35.0
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,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Changed]: Always mount argocd-tls-certs-cm in server and repo-server" - "[Added]: Expose 'clusterResources' parameter in configs.clusterCredentials"

7
charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml
View file

@ -20,8 +20,11 @@ type: Opaque
stringData: stringData:
name: {{ required "A valid .Values.configs.clusterCredentials[].name entry is required!" .name }} name: {{ required "A valid .Values.configs.clusterCredentials[].name entry is required!" .name }}
server: {{ required "A valid .Values.configs.clusterCredentials[].server entry is required!" .server }} server: {{ required "A valid .Values.configs.clusterCredentials[].server entry is required!" .server }}
{{- with .namespaces }} {{- if .namespaces }}
namespaces: {{ . }} namespaces: {{ .namespaces }}
{{- if .clusterResources }}
clusterResources: {{ .clusterResources }}
{{- end }}
{{- end }} {{- end }}
config: | config: |
{{- required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toPrettyJson | nindent 4 }} {{- required "A valid .Values.configs.clusterCredentials[].config entry is required!" .config | toPrettyJson | nindent 4 }}

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

@ -1670,6 +1670,7 @@ configs:
# labels: {} # labels: {}
# annotations: {} # annotations: {}
# namespaces: namespace1,namespace2 # namespaces: namespace1,namespace2
# clusterResources: true
# config: # config:
# bearerToken: "<authentication token>" # bearerToken: "<authentication token>"
# tlsClientConfig: # tlsClientConfig: