Merge branch 'main' into amcamina/customize_rbca

.github/workflows/lint-and-test.yml

@@ -13,7 +13,7 @@ jobs:
       options: --user 1001
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Run ah lint
         working-directory: ./charts
         run: ah lint
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           fetch-depth: 0
 

.github/workflows/publish.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           fetch-depth: 0
 
@@ -66,7 +66,7 @@ jobs:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Login to GHCR
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/scorecard.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           persist-credentials: false
 

charts/argo-cd/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: v2.10.3
+appVersion: v2.10.4
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 6.7.2
+version: 6.7.3
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -27,4 +27,4 @@ annotations:
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: changed
-      description: Bump argo-cd to v2.10.3
+      description: Bump argo-cd to v2.10.4

charts/argocd-image-updater/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-image-updater
 description: A Helm chart for Argo CD Image Updater, a tool to automatically update the container images of Kubernetes workloads which are managed by Argo CD
 type: application
-version: 0.9.5
+version: 0.9.6
 appVersion: v0.12.2
 home: https://github.com/argoproj-labs/argocd-image-updater
 icon: https://argocd-image-updater.readthedocs.io/en/stable/assets/logo.png
@@ -18,5 +18,9 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: added
+    - kind: fixed
-      description: Allow overriding of .Release.Namespace with .Values.namespaceOverride
+      description: Properly quoting the config map values
+    - kind: fixed
+      description: Only adding a data field to argocd-image-updater-ssh-config when there's data to be added
+    - kind: changed
+      description: Only include config.argocd if config.applicationsAPIKind is set to 'argocd'

charts/argocd-image-updater/templates/configmap-sshconfig.yaml

@@ -5,7 +5,7 @@ metadata:
     {{- include "argocd-image-updater.labels" . | nindent 4 }}
   name: argocd-image-updater-ssh-config
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
+{{- with .Values.config.sshConfig }}
 data:
-  {{- with .Values.config.sshConfig }}
   {{- toYaml . | nindent 2 }}
-  {{- end }}
+{{- end }}

charts/argocd-image-updater/templates/configmap.yaml

@@ -8,30 +8,32 @@ metadata:
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
 data:
   {{- with .Values.config.applicationsAPIKind }}
-  applications_api: {{ . }}
+  applications_api: {{ . | quote }}
+  {{- if eq . "argocd" }}
+  argocd.grpc_web: {{ $.Values.config.argocd.grpcWeb | quote }}
+  {{- with $.Values.config.argocd.serverAddress }}
+  argocd.server_addr: {{ . | quote }}
   {{- end }}
-  argocd.grpc_web: {{ .Values.config.argocd.grpcWeb | quote }}
+  argocd.insecure: {{ $.Values.config.argocd.insecure | quote }}
-  {{- with .Values.config.argocd.serverAddress }}
+  argocd.plaintext: {{ $.Values.config.argocd.plaintext | quote }}
-  argocd.server_addr: {{ . }}
+  {{- end -}}
   {{- end }}
-  argocd.insecure: {{ .Values.config.argocd.insecure | quote }}
-  argocd.plaintext: {{ .Values.config.argocd.plaintext | quote }}
   {{- with .Values.config.logLevel }}
-  log.level: {{ . }}
+  log.level: {{ . | quote }}
   {{- end }}
   {{- with .Values.config.gitCommitUser }}
-  git.user: {{ . }}
+  git.user: {{ . | quote }}
   {{- end }}
   {{- with .Values.config.gitCommitMail }}
-  git.email: {{ . }}
+  git.email: {{ . | quote }}
   {{- end }}
   {{- with .Values.config.gitCommitTemplate }}
   git.commit-message-template: |
     {{- nindent 4 . }}
   {{- end }}
   kube.events: {{ .Values.config.disableKubeEvents | quote }}
+  {{- with .Values.config.registries }}
   registries.conf: |
-    {{- with .Values.config.registries }}
+    registries:
-      registries:
+      {{- toYaml . | nindent 6 }}
-        {{- toYaml . | nindent 6 }}
+  {{- end }}
-    {{- end }}

charts/argocd-image-updater/templates/rbac.yaml

@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    {{ include "argocd-image-updater.labels" . | nindent 4 }}
+    {{- include "argocd-image-updater.labels" . | nindent 4 }}
   name: {{ include "argocd-image-updater.fullname" . }}
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
 rules:
@@ -37,7 +37,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    {{ include "argocd-image-updater.labels" . | nindent 4 }}
+    {{- include "argocd-image-updater.labels" . | nindent 4 }}
   name: {{ include "argocd-image-updater.fullname" . }}
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
 roleRef:

charts/argocd-image-updater/values.yaml

@@ -101,6 +101,7 @@ config:
   applicationsAPIKind: ""
 
   # Described in detail here https://argocd-image-updater.readthedocs.io/en/stable/install/running/#flags
+  # Note: this is only relevant if config.applicationsAPIKind == 'argocd'
   argocd:
     # -- Use the gRPC-web protocol to connect to the Argo CD API
     grpcWeb: true