chore(deps): update docker.io/kiwigrid/k8s-sidecar docker tag to v2 (#1527)

Co-authored-by: jenkins-dependency-updater[bot] <81680575+jenkins-dependency-updater[bot]@users.noreply.github.com>
Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>

Author: jenkins-dependency-updater[bot]

charts/jenkins/CHANGELOG.md

@@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 The changelog until v1.5.7 was auto-generated based on git commits.
 Those entries include a reference to the git commit to be able to get more details.
 
+## 5.8.121
+
+Update `docker.io/kiwigrid/k8s-sidecar` to version `2.1.4`
+
 ## 5.8.120
 
 Update `configuration-as-code` to version `2031.veb_a_fdda_b_3ffd`

charts/jenkins/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: jenkins
 type: application
 home: https://www.jenkins.io/
-version: 5.8.120
+version: 5.8.121
 appVersion: 2.528.3
 description: >
   Jenkins - Build great things at any scale! As the leading open source automation server, Jenkins provides over 2000 plugins to support building, deploying and automating any project.

charts/jenkins/VALUES.md

@@ -651,6 +651,8 @@ Create the HTTP port for interacting with the controller
           fieldPath: metadata.name
     - name: LABEL
       value: "{{ template "jenkins.fullname" $root }}-jenkins-config"
+    - name: HEALTH_PORT
+      value: "{{ $root.Values.controller.sidecars.configAutoReload.healthPort }}"
     - name: FOLDER
       value: "{{ $root.Values.controller.sidecars.configAutoReload.folder }}"
     - name: NAMESPACE
@@ -699,6 +701,8 @@ Create the HTTP port for interacting with the controller
       {{- if $root.Values.persistence.subPath }}
       subPath: {{ $root.Values.persistence.subPath }}
       {{- end }}
+    - name: tmp-volume
+      mountPath: /tmp
     {{- if $root.Values.controller.sidecars.configAutoReload.logging.configuration.override }}
     - name: auto-reload-config
       mountPath: {{ $root.Values.controller.jenkinsHome }}/auto-reload

charts/jenkins/templates/_helpers.tpl

@@ -124,6 +124,8 @@ default values:
                     fieldPath: metadata.name
               - name: LABEL
                 value: my-release-jenkins-jenkins-config
+              - name: HEALTH_PORT
+                value: "8060"
               - name: FOLDER
                 value: /var/jenkins_home/casc_configs
               - name: NAMESPACE
@@ -134,7 +136,7 @@ default values:
                 value: POST
               - name: REQ_RETRY_CONNECT
                 value: "10"
-            image: docker.io/kiwigrid/k8s-sidecar:1.30.7
+            image: docker.io/kiwigrid/k8s-sidecar:2.1.4
             imagePullPolicy: IfNotPresent
             name: config-reload
             resources: {}
@@ -146,6 +148,8 @@ default values:
                 name: sc-config-volume
               - mountPath: /var/jenkins_home
                 name: jenkins-home
+              - mountPath: /tmp
+                name: tmp-volume
         enableServiceLinks: false
         initContainers:
           - env:
@@ -155,13 +159,15 @@ default values:
                     fieldPath: metadata.name
               - name: LABEL
                 value: my-release-jenkins-jenkins-config
+              - name: HEALTH_PORT
+                value: "8060"
               - name: FOLDER
                 value: /var/jenkins_home/casc_configs
               - name: NAMESPACE
                 value: my-namespace
               - name: METHOD
                 value: LIST
-            image: docker.io/kiwigrid/k8s-sidecar:1.30.7
+            image: docker.io/kiwigrid/k8s-sidecar:2.1.4
             imagePullPolicy: IfNotPresent
             name: config-reload-init
             resources: {}
@@ -173,6 +179,8 @@ default values:
                 name: sc-config-volume
               - mountPath: /var/jenkins_home
                 name: jenkins-home
+              - mountPath: /tmp
+                name: tmp-volume
           - command:
               - sh
               - /var/jenkins_config/apply_config.sh
@@ -346,6 +354,8 @@ test scheme for config-reload:
                     fieldPath: metadata.name
               - name: LABEL
                 value: my-release-jenkins-jenkins-config
+              - name: HEALTH_PORT
+                value: "8060"
               - name: FOLDER
                 value: /var/jenkins_home/casc_configs
               - name: NAMESPACE
@@ -356,7 +366,7 @@ test scheme for config-reload:
                 value: POST
               - name: REQ_RETRY_CONNECT
                 value: "10"
-            image: docker.io/kiwigrid/k8s-sidecar:1.30.7
+            image: docker.io/kiwigrid/k8s-sidecar:2.1.4
             imagePullPolicy: IfNotPresent
             name: config-reload
             resources: {}
@@ -368,6 +378,8 @@ test scheme for config-reload:
                 name: sc-config-volume
               - mountPath: /var/jenkins_home
                 name: jenkins-home
+              - mountPath: /tmp
+                name: tmp-volume
         enableServiceLinks: false
         initContainers:
           - env:
@@ -377,13 +389,15 @@ test scheme for config-reload:
                     fieldPath: metadata.name
               - name: LABEL
                 value: my-release-jenkins-jenkins-config
+              - name: HEALTH_PORT
+                value: "8060"
               - name: FOLDER
                 value: /var/jenkins_home/casc_configs
               - name: NAMESPACE
                 value: my-namespace
               - name: METHOD
                 value: LIST
-            image: docker.io/kiwigrid/k8s-sidecar:1.30.7
+            image: docker.io/kiwigrid/k8s-sidecar:2.1.4
             imagePullPolicy: IfNotPresent
             name: config-reload-init
             resources: {}
@@ -395,6 +409,8 @@ test scheme for config-reload:
                 name: sc-config-volume
               - mountPath: /var/jenkins_home
                 name: jenkins-home
+              - mountPath: /tmp
+                name: tmp-volume
           - command:
               - sh
               - /var/jenkins_config/apply_config.sh

charts/jenkins/unittests/__snapshot__/jenkins-controller-statefulset-test.yaml.snap

@@ -308,12 +308,12 @@ tests:
             configMap:
               name: my-release-jenkins-auto-reload-config
       - equal:
-          path: spec.template.spec.initContainers[0].env[5]
+          path: spec.template.spec.initContainers[0].env[6]
           value:
             name: LOG_CONFIG
             value: /var/jenkins_home/auto-reload/auto-reload-config.yaml
       - equal:
-          path: spec.template.spec.containers[1].env[7]
+          path: spec.template.spec.containers[1].env[8]
           value:
             name: LOG_CONFIG
             value: /var/jenkins_home/auto-reload/auto-reload-config.yaml

charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml

@@ -576,8 +576,10 @@ controller:
         # -- Repository of the image that triggers the reload
         repository: kiwigrid/k8s-sidecar
         # -- Tag for the image that triggers the reload
-        tag: 1.30.7
+        tag: 2.1.4
       imagePullPolicy: IfNotPresent
+      # -- Port for sidecar health probes
+      healthPort: 8060
       resources:
         {}
         #   limits: