[v2.1] Backport oauth cfg (#854)

kiali · Dec 3, 2024 · e3a8f4f · e3a8f4f
1 parent 91d4e77
commit e3a8f4f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/roles/default/kiali-deploy/templates/openshift/deployment.yaml b/roles/default/kiali-deploy/templates/openshift/deployment.yaml
@@ -162,8 +162,13 @@ spec:
           secretName: {{ kiali_vars.deployment.secret_name }}
           optional: true
       - name: kiali-cabundle
-        configMap:
-          name: {{ kiali_vars.deployment.instance_name }}-cabundle
+        projected:
+          sources:
+          - configMap:
+              name: {{ kiali_vars.deployment.instance_name }}-cabundle
+          - configMap:
+              name: {{ kiali_vars.deployment.instance_name }}-oauth-cabundle
+              optional: true
 {% for sec in kiali_deployment_secret_volumes %}
       - name: {{ sec }}
         secret:

diff --git a/roles/v2.1/kiali-deploy/templates/openshift/deployment.yaml b/roles/v2.1/kiali-deploy/templates/openshift/deployment.yaml
@@ -162,8 +162,13 @@ spec:
           secretName: {{ kiali_vars.deployment.secret_name }}
           optional: true
       - name: kiali-cabundle
-        configMap:
-          name: {{ kiali_vars.deployment.instance_name }}-cabundle
+        projected:
+          sources:
+          - configMap:
+              name: {{ kiali_vars.deployment.instance_name }}-cabundle
+          - configMap:
+              name: {{ kiali_vars.deployment.instance_name }}-oauth-cabundle
+              optional: true
 {% for sec in kiali_deployment_secret_volumes %}
       - name: {{ sec }}
         secret: