Bump to v1.15.12

diffs/helm__Makefile.values.patch

@@ -1,8 +1,8 @@
 diff --git a/vendor/cilium/install/kubernetes/Makefile.values b/helm/Makefile.values
-index 89f3f9e..7f7912d 100644
+index fc8ed9a..7f7912d 100644
 --- a/vendor/cilium/install/kubernetes/Makefile.values
 +++ b/helm/Makefile.values
-@@ -13,47 +13,47 @@ export RELEASE := yes
+@@ -13,63 +13,56 @@ export RELEASE := yes
  ifeq ($(RELEASE),yes)
      export CILIUM_BRANCH:=v1.15
      export PULL_POLICY:=IfNotPresent
@@ -33,35 +33,64 @@ index 89f3f9e..7f7912d 100644
  $(error "CILIUM_BRANCH needs to be defined")
  endif
 
+-# renovate: datasource=docker
 -export CERTGEN_REPO:=quay.io/cilium/certgen
+-export CERTGEN_VERSION:=v0.1.15
+-export CERTGEN_DIGEST:=sha256:a82265cd78234505802772fb6256bcfa8231b718d2652ad815eb479fc3cc8028
 +export CERTGEN_REPO:=giantswarm/cilium-certgen
- # renovate: datasource=docker depName=quay.io/cilium/certgen
- export CERTGEN_VERSION:=v0.1.12
- export CERTGEN_DIGEST:=sha256:bbc5e65e9dc65bc6b58967fe536b7f3b54e12332908aeb0a96a36866b4372b4e
++# renovate: datasource=docker depName=quay.io/cilium/certgen
++export CERTGEN_VERSION:=v0.1.12
++export CERTGEN_DIGEST:=sha256:bbc5e65e9dc65bc6b58967fe536b7f3b54e12332908aeb0a96a36866b4372b4e
 
+-# renovate: datasource=docker
 -export CILIUM_ETCD_OPERATOR_REPO:=quay.io/cilium/cilium-etcd-operator
 -export CILIUM_ETCD_OPERATOR_VERSION:=v2.0.7
 +export CILIUM_ETCD_OPERATOR_REPO:=giantswarm/cilium-etcd-operator
 +export CILIUM_ETCD_OPERATOR_VERSION:=v2.0.7@sha256:04b8327f7f992693c2cb483b999041ed8f92efc8e14f2a5f3ab95574a65ea2dc
  export CILIUM_ETCD_OPERATOR_DIGEST:=sha256:04b8327f7f992693c2cb483b999041ed8f92efc8e14f2a5f3ab95574a65ea2dc
 
+-# renovate: datasource=docker
 -export CILIUM_NODEINIT_REPO:=quay.io/cilium/startup-script
+-export CILIUM_NODEINIT_VERSION:=c54c7edeab7fde4da68e59acd319ab24af242c3f
+-export CILIUM_NODEINIT_DIGEST:=sha256:8d7b41c4ca45860254b3c19e20210462ef89479bb6331d6760c4e609d651b29c
 +export CILIUM_NODEINIT_REPO:=giantswarm/cilium-startup-script
- # renovate: datasource=docker depName=quay.io/cilium/startup-script
- export CILIUM_NODEINIT_VERSION:=19fb149fb3d5c7a37d3edfaf10a2be3ab7386661
- export CILIUM_NODEINIT_DIGEST:=sha256:820155cb3b7f00c8d61c1cffa68c44440906cb046bdbad8ff544f5deb1103456
++# renovate: datasource=docker depName=quay.io/cilium/startup-script
++export CILIUM_NODEINIT_VERSION:=19fb149fb3d5c7a37d3edfaf10a2be3ab7386661
++export CILIUM_NODEINIT_DIGEST:=sha256:820155cb3b7f00c8d61c1cffa68c44440906cb046bdbad8ff544f5deb1103456
 
+-# renovate: datasource=docker
 -export CILIUM_ENVOY_REPO:=quay.io/cilium/cilium-envoy
+-export CILIUM_ENVOY_VERSION:=v1.30.8-1733837904-eaae5aca0fb988583e5617170a65ac5aa51c0aa8
+-export CILIUM_ENVOY_DIGEST:=sha256:709c08ade3d17d52da4ca2af33f431360ec26268d288d9a6cd1d98acc9a1dced
 +export CILIUM_ENVOY_REPO:=giantswarm/cilium-envoy
- export CILIUM_ENVOY_VERSION:=v1.28.4-b35188ffa1bbe54d1720d2e392779f7a48e58f6b
- export CILIUM_ENVOY_DIGEST:=sha256:b528b291561e459024f66414ac3325b88cdd8f9f4854828a155a11e5b10b78a3
++export CILIUM_ENVOY_VERSION:=v1.28.4-b35188ffa1bbe54d1720d2e392779f7a48e58f6b
++export CILIUM_ENVOY_DIGEST:=sha256:b528b291561e459024f66414ac3325b88cdd8f9f4854828a155a11e5b10b78a3
 
+-# renovate: datasource=docker
 -export HUBBLE_UI_BACKEND_REPO:=quay.io/cilium/hubble-ui-backend
-+export HUBBLE_UI_BACKEND_REPO:=giantswarm/hubble-ui-backend
- export HUBBLE_UI_BACKEND_VERSION:=v0.13.0
- export HUBBLE_UI_BACKEND_DIGEST:=sha256:1e7657d997c5a48253bb8dc91ecee75b63018d16ff5e5797e5af367336bc8803
+-export HUBBLE_UI_BACKEND_VERSION:=v0.13.1
+-export HUBBLE_UI_BACKEND_DIGEST:=sha256:0e0eed917653441fded4e7cdb096b7be6a3bddded5a2dd10812a27b1fc6ed95b
+-# renovate: datasource=docker
 -export HUBBLE_UI_FRONTEND_REPO:=quay.io/cilium/hubble-ui
+-export HUBBLE_UI_FRONTEND_VERSION:=v0.13.1
+-export HUBBLE_UI_FRONTEND_DIGEST:=sha256:e2e9313eb7caf64b0061d9da0efbdad59c6c461f6ca1752768942bfeda0796c6
++export HUBBLE_UI_BACKEND_REPO:=giantswarm/hubble-ui-backend
++export HUBBLE_UI_BACKEND_VERSION:=v0.13.0
++export HUBBLE_UI_BACKEND_DIGEST:=sha256:1e7657d997c5a48253bb8dc91ecee75b63018d16ff5e5797e5af367336bc8803
 +export HUBBLE_UI_FRONTEND_REPO:=giantswarm/hubble-ui
- export HUBBLE_UI_FRONTEND_VERSION:=v0.13.0
- export HUBBLE_UI_FRONTEND_DIGEST:=sha256:7d663dc16538dd6e29061abd1047013a645e6e69c115e008bee9ea9fef9a6666
++export HUBBLE_UI_FRONTEND_VERSION:=v0.13.0
++export HUBBLE_UI_FRONTEND_DIGEST:=sha256:7d663dc16538dd6e29061abd1047013a645e6e69c115e008bee9ea9fef9a6666
 
+-# renovate: datasource=docker
+ export SPIRE_INIT_REPO:=docker.io/library/busybox
+ export SPIRE_INIT_VERSION:=1.36.1
+-export SPIRE_INIT_DIGEST:=sha256:d75b758a4fea99ffff4db799e16f853bbde8643671b5b72464a8ba94cbe3dbe3
+-# renovate: datasource=docker
++export SPIRE_INIT_DIGEST:=sha256:223ae047b1065bd069aac01ae3ac8088b3ca4a527827e283b85112f29385fb1b
+ export SPIRE_SERVER_REPO:=ghcr.io/spiffe/spire-server
+ export SPIRE_SERVER_VERSION:=1.8.5
+ export SPIRE_SERVER_DIGEST:=sha256:28269265882048dcf0fed32fe47663cd98613727210b8d1a55618826f9bf5428
+-# renovate: datasource=docker
+ export SPIRE_AGENT_REPO:=ghcr.io/spiffe/spire-agent
+ export SPIRE_AGENT_VERSION:=1.8.5
+ export SPIRE_AGENT_DIGEST:=sha256:99405637647968245ff9fe215f8bd2bd0ea9807be9725f8bf19fe1b21471e52b

diffs/helm__cilium__templates___helpers.tpl.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/_helpers.tpl b/helm/cilium/templates/_helpers.tpl
-index 3e5429e..b96b3f8 100644
+index 39b3d69..4ef0bc4 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/_helpers.tpl
 +++ b/helm/cilium/templates/_helpers.tpl
 @@ -18,11 +18,20 @@ then `include "cilium.image" .Values.image`

diffs/helm__cilium__templates__cilium-agent__daemonset.yaml.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/cilium-agent/daemonset.yaml b/helm/cilium/templates/cilium-agent/daemonset.yaml
-index 2949091..2eebb44 100644
+index c18cc09..6b3c1e3 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/cilium-agent/daemonset.yaml
 +++ b/helm/cilium/templates/cilium-agent/daemonset.yaml
 @@ -94,7 +94,7 @@ spec:
@@ -11,7 +11,7 @@ index 2949091..2eebb44 100644
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- if .Values.sleepAfterInit }}
          command:
-@@ -209,6 +209,18 @@ spec:
+@@ -196,6 +196,18 @@ spec:
              resourceFieldRef:
                resource: limits.memory
                divisor: '1'
@@ -30,7 +30,7 @@ index 2949091..2eebb44 100644
          {{- if .Values.k8sServiceHost }}
          - name: KUBERNETES_SERVICE_HOST
            value: {{ .Values.k8sServiceHost | quote }}
-@@ -394,7 +406,7 @@ spec:
+@@ -381,7 +393,7 @@ spec:
          {{- end }}
        {{- if .Values.monitor.enabled }}
        - name: cilium-monitor
@@ -39,7 +39,7 @@ index 2949091..2eebb44 100644
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
          - /bin/bash
-@@ -426,7 +438,7 @@ spec:
+@@ -413,7 +425,7 @@ spec:
        {{- end }}
        initContainers:
        - name: config
@@ -48,7 +48,7 @@ index 2949091..2eebb44 100644
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
          - cilium-dbg
-@@ -454,6 +466,18 @@ spec:
+@@ -441,6 +453,18 @@ spec:
              fieldRef:
                apiVersion: v1
                fieldPath: metadata.namespace
@@ -67,7 +67,7 @@ index 2949091..2eebb44 100644
          {{- if .Values.k8sServiceHost }}
          - name: KUBERNETES_SERVICE_HOST
            value: {{ .Values.k8sServiceHost | quote }}
-@@ -481,7 +505,7 @@ spec:
+@@ -468,7 +492,7 @@ spec:
        # Required to mount cgroup2 filesystem on the underlying Kubernetes node.
        # We use nsenter command with host's cgroup and mount namespaces enabled.
        - name: mount-cgroup
@@ -76,16 +76,16 @@ index 2949091..2eebb44 100644
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          env:
          - name: CGROUP_ROOT
-@@ -527,7 +551,7 @@ spec:
-               - ALL
-           {{- end}}
+@@ -516,7 +540,7 @@ spec:
+       {{- end }}
+       {{- if .Values.sysctlfix.enabled }}
        - name: apply-sysctl-overwrites
 -        image: {{ include "cilium.image" .Values.image | quote }}
 +        image: {{ include "cilium.image" (list $ .Values.image) | quote }}
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- with .Values.initResources }}
          resources:
-@@ -576,7 +600,7 @@ spec:
+@@ -565,7 +589,7 @@ spec:
        # from a privileged container because the mount propagation bidirectional
        # only works from privileged containers.
        - name: mount-bpf-fs
@@ -94,7 +94,7 @@ index 2949091..2eebb44 100644
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- with .Values.initResources }}
          resources:
-@@ -601,7 +625,7 @@ spec:
+@@ -590,7 +614,7 @@ spec:
        {{- end }}
        {{- if and .Values.nodeinit.enabled .Values.nodeinit.bootstrapFile }}
        - name: wait-for-node-init
@@ -103,7 +103,7 @@ index 2949091..2eebb44 100644
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- with .Values.initResources }}
          resources:
-@@ -621,7 +645,7 @@ spec:
+@@ -610,7 +634,7 @@ spec:
            mountPath: "/tmp/cilium-bootstrap.d"
        {{- end }}
        - name: clean-cilium-state
@@ -112,7 +112,7 @@ index 2949091..2eebb44 100644
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
          - /init-container.sh
-@@ -693,7 +717,7 @@ spec:
+@@ -682,7 +706,7 @@ spec:
          {{- end }}
        {{- if and .Values.waitForKubeProxy (and (ne (toString $kubeProxyReplacement) "strict") (ne (toString $kubeProxyReplacement) "true"))  }}
        - name: wait-for-kube-proxy
@@ -121,7 +121,7 @@ index 2949091..2eebb44 100644
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          {{- with .Values.initResources }}
          resources:
-@@ -728,10 +752,22 @@ spec:
+@@ -717,10 +741,22 @@ spec:
              done
          terminationMessagePolicy: FallbackToLogsOnError
        {{- end }} # wait-for-kube-proxy

diffs/helm__cilium__templates__cilium-configmap.yaml.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/cilium-configmap.yaml b/helm/cilium/templates/cilium-configmap.yaml
-index 9531ca1..f1362e5 100644
+index 8ca8469..1571fb5 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/cilium-configmap.yaml
 +++ b/helm/cilium/templates/cilium-configmap.yaml
 @@ -810,10 +810,7 @@ data:

diffs/helm__cilium__templates__cilium-envoy__daemonset.yaml.patch

@@ -1,8 +1,8 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/cilium-envoy/daemonset.yaml b/helm/cilium/templates/cilium-envoy/daemonset.yaml
-index 30b9af0..a9cd4b7 100644
+index d20e383..26ffd96 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/cilium-envoy/daemonset.yaml
 +++ b/helm/cilium/templates/cilium-envoy/daemonset.yaml
-@@ -69,7 +69,7 @@ spec:
+@@ -65,7 +65,7 @@ spec:
        {{- end }}
        containers:
        - name: cilium-envoy

diffs/helm__cilium__templates__cilium-nodeinit__daemonset.yaml.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/cilium-nodeinit/daemonset.yaml b/helm/cilium/templates/cilium-nodeinit/daemonset.yaml
-index 3ed0926..e268da7 100644
+index c92eabf..86492b1 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/cilium-nodeinit/daemonset.yaml
 +++ b/helm/cilium/templates/cilium-nodeinit/daemonset.yaml
 @@ -58,7 +58,7 @@ spec:

diffs/helm__cilium__templates__cilium-operator__deployment.yaml.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/cilium-operator/deployment.yaml b/helm/cilium/templates/cilium-operator/deployment.yaml
-index 4f4450e..cd73c8a 100644
+index 5c6c467..53ddcae 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/cilium-operator/deployment.yaml
 +++ b/helm/cilium/templates/cilium-operator/deployment.yaml
 @@ -71,7 +71,7 @@ spec:

diffs/helm__cilium__templates__cilium-preflight__daemonset.yaml.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/cilium-preflight/daemonset.yaml b/helm/cilium/templates/cilium-preflight/daemonset.yaml
-index b0f646d..f9ace4d 100644
+index b522861..3d0b6d2 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/cilium-preflight/daemonset.yaml
 +++ b/helm/cilium/templates/cilium-preflight/daemonset.yaml
 @@ -42,7 +42,7 @@ spec:

diffs/helm__cilium__templates__cilium-preflight__deployment.yaml.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/cilium-preflight/deployment.yaml b/helm/cilium/templates/cilium-preflight/deployment.yaml
-index af0a31b..9c259d4 100644
+index 1f87d20..78ad792 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/cilium-preflight/deployment.yaml
 +++ b/helm/cilium/templates/cilium-preflight/deployment.yaml
 @@ -37,7 +37,7 @@ spec:

diffs/helm__cilium__templates__clustermesh-apiserver__deployment.yaml.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/clustermesh-apiserver/deployment.yaml b/helm/cilium/templates/clustermesh-apiserver/deployment.yaml
-index 6c5e6c3..332c655 100644
+index f0d551b..a91d4fb 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/clustermesh-apiserver/deployment.yaml
 +++ b/helm/cilium/templates/clustermesh-apiserver/deployment.yaml
 @@ -48,7 +48,7 @@ spec:

diffs/helm__cilium__templates__etcd-operator__cilium-etcd-operator-deployment.yaml.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/etcd-operator/cilium-etcd-operator-deployment.yaml b/helm/cilium/templates/etcd-operator/cilium-etcd-operator-deployment.yaml
-index 5946219..e5b730b 100644
+index 7aefc0d..9802aed 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/etcd-operator/cilium-etcd-operator-deployment.yaml
 +++ b/helm/cilium/templates/etcd-operator/cilium-etcd-operator-deployment.yaml
 @@ -94,7 +94,7 @@ spec:

diffs/helm__cilium__templates__hubble-relay__deployment.yaml.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/hubble-relay/deployment.yaml b/helm/cilium/templates/hubble-relay/deployment.yaml
-index 52b9eba..525885c 100644
+index 5a5fb35..0040546 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/hubble-relay/deployment.yaml
 +++ b/helm/cilium/templates/hubble-relay/deployment.yaml
 @@ -53,7 +53,7 @@ spec:

diffs/helm__cilium__templates__hubble-ui__deployment.yaml.patch

@@ -1,8 +1,8 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/templates/hubble-ui/deployment.yaml b/helm/cilium/templates/hubble-ui/deployment.yaml
-index cb6bd5d..f567cac 100644
+index 105907a..3292482 100644
 --- a/vendor/cilium/install/kubernetes/cilium/templates/hubble-ui/deployment.yaml
 +++ b/helm/cilium/templates/hubble-ui/deployment.yaml
-@@ -53,7 +53,7 @@ spec:
+@@ -52,7 +52,7 @@ spec:
        {{- end }}
        containers:
        - name: frontend
@@ -11,7 +11,7 @@ index cb6bd5d..f567cac 100644
          imagePullPolicy: {{ .Values.hubble.ui.frontend.image.pullPolicy }}
          ports:
          - name: http
-@@ -89,7 +89,7 @@ spec:
+@@ -88,7 +88,7 @@ spec:
            {{- toYaml . | trim | nindent 10 }}
          {{- end }}
        - name: backend

diffs/helm__cilium__values.yaml.tmpl.patch

@@ -1,5 +1,5 @@
 diff --git a/vendor/cilium/install/kubernetes/cilium/values.yaml.tmpl b/helm/cilium/values.yaml.tmpl
-index 679b4ca..1ba50fc 100644
+index d130050..1ad0115 100644
 --- a/vendor/cilium/install/kubernetes/cilium/values.yaml.tmpl
 +++ b/helm/cilium/values.yaml.tmpl
 @@ -8,6 +8,9 @@
@@ -869,7 +869,7 @@ index 679b4ca..1ba50fc 100644
        repository: "${CLUSTERMESH_APISERVER_REPO}"
        tag: "${CILIUM_VERSION}"
        # clustermesh-apiserver-digest
-@@ -3059,12 +3290,17 @@ clustermesh:
+@@ -3056,11 +3287,17 @@ clustermesh:
        # For EKS LoadBalancer, use annotation service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
        annotations: {}
 
@@ -885,12 +885,11 @@ index 679b4ca..1ba50fc 100644
 +      # @schema
        # -- The internalTrafficPolicy of service used for apiserver access.
 -      internalTrafficPolicy:
--
 +      internalTrafficPolicy: Cluster
-     # -- Number of replicas run for the clustermesh-apiserver deployment.
-     replicas: 1
 
-@@ -3103,9 +3339,15 @@ clustermesh:
+       # @schema
+       # type: [null, string]
+@@ -3115,9 +3352,15 @@ clustermesh:
        # -- enable PodDisruptionBudget
        # ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
        enabled: false
@@ -906,7 +905,7 @@ index 679b4ca..1ba50fc 100644
        # -- Maximum number/percentage of pods that may be made unavailable
        maxUnavailable: 1
 
-@@ -3154,6 +3396,9 @@ clustermesh:
+@@ -3166,6 +3409,9 @@ clustermesh:
      updateStrategy:
        type: RollingUpdate
        rollingUpdate:
@@ -916,7 +915,7 @@ index 679b4ca..1ba50fc 100644
          maxUnavailable: 1
 
      # -- The priority class to use for clustermesh-apiserver
-@@ -3276,24 +3521,42 @@ clustermesh:
+@@ -3288,24 +3534,42 @@ clustermesh:
 
          # -- Interval for scrape metrics (apiserver metrics)
          interval: "10s"
@@ -959,7 +958,7 @@ index 679b4ca..1ba50fc 100644
            # -- Metrics relabeling configs for the ServiceMonitor clustermesh-apiserver (etcd metrics)
            metricRelabelings: ~
 
-@@ -3401,7 +3664,7 @@ authentication:
+@@ -3418,7 +3682,7 @@ authentication:
          existingNamespace: false
          # -- init container image of SPIRE agent and server
          initImage:
@@ -968,7 +967,7 @@ index 679b4ca..1ba50fc 100644
            repository: "${SPIRE_INIT_REPO}"
            tag: "${SPIRE_INIT_VERSION}"
            digest: "${SPIRE_INIT_DIGEST}"
-@@ -3411,7 +3674,7 @@ authentication:
+@@ -3428,7 +3692,7 @@ authentication:
          agent:
            # -- SPIRE agent image
            image:
@@ -977,7 +976,7 @@ index 679b4ca..1ba50fc 100644
              repository: "${SPIRE_AGENT_REPO}"
              tag: "${SPIRE_AGENT_VERSION}"
              digest: "${SPIRE_AGENT_DIGEST}"
-@@ -3459,7 +3722,7 @@ authentication:
+@@ -3476,7 +3740,7 @@ authentication:
          server:
            # -- SPIRE server image
            image:
@@ -986,7 +985,7 @@ index 679b4ca..1ba50fc 100644
              repository: "${SPIRE_SERVER_REPO}"
              tag: "${SPIRE_SERVER_VERSION}"
              digest: "${SPIRE_SERVER_DIGEST}"
-@@ -3499,6 +3762,9 @@ authentication:
+@@ -3516,6 +3780,9 @@ authentication:
              size: 1Gi
              # -- Access mode of the SPIRE server data storage
              accessMode: ReadWriteOnce
@@ -996,7 +995,7 @@ index 679b4ca..1ba50fc 100644
              # -- StorageClass of the SPIRE server data storage
              storageClass: null
            # -- Security context to be added to spire server pods.
-@@ -3519,6 +3785,9 @@ authentication:
+@@ -3536,6 +3803,9 @@ authentication:
                country: "US"
                organization: "SPIRE"
                commonName: "Cilium SPIRE CA"
@@ -1006,7 +1005,7 @@ index 679b4ca..1ba50fc 100644
        # -- SPIRE server address used by Cilium Operator
        #
        # If k8s Service DNS along with port number is used (e.g. <service-name>.<namespace>.svc(.*):<port-number> format),
-@@ -3535,3 +3804,40 @@ authentication:
+@@ -3552,3 +3822,40 @@ authentication:
        agentSocketPath: /run/spire/sockets/agent/agent.sock
        # -- SPIRE connection timeout
        connectionTimeout: 30s