UPSTREAM: <carry>: resolve issue with pre-mature mounting of trusted CA configmap

Signed-off-by: Joe Lanford <[email protected]>

Author: joelanford

openshift/catalogd/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_certs.yaml

@@ -3,7 +3,7 @@
   value: {"name":"catalogserver-certs", "secret":{"optional":false,"secretName":"catalogserver-cert"}}
 - op: add
   path: /spec/template/spec/volumes/-
-  value: {"name":"trusted-ca-bundle", "configMap":{"optional":false,"name":"trusted-ca-bundle"}}
+  value: {"name":"trusted-ca-bundle", "configMap":{"optional":false,"name":"trusted-ca-bundle", "items":[{"key":"ca-bundle.crt","path":"ca-bundle.crt"}]}}
 - op: add
   path: /spec/template/spec/volumes/-
   value: {"name":"service-ca", "configMap":{"optional":false,"name":"openshift-service-ca.crt"}}

openshift/catalogd/manifests/14-deployment-openshift-catalogd-catalogd-controller-manager.yml

@@ -119,6 +119,9 @@ spec:
             optional: false
             secretName: catalogserver-cert
         - configMap:
+            items:
+              - key: ca-bundle.crt
+                path: ca-bundle.crt
             name: catalogd-trusted-ca-bundle
             optional: false
           name: trusted-ca-bundle

openshift/operator-controller/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_certs.yaml

@@ -3,7 +3,7 @@
   value: {"name":"operator-controller-certs", "secret":{"optional":false,"secretName":"operator-controller-cert"}}
 - op: add
   path: /spec/template/spec/volumes/-
-  value: {"name":"trusted-ca-bundle", "configMap":{"optional":false,"name":"trusted-ca-bundle"}}
+  value: {"name":"trusted-ca-bundle", "configMap":{"optional":false,"name":"trusted-ca-bundle", "items":[{"key":"ca-bundle.crt","path":"ca-bundle.crt"}]}}
 - op: add
   path: /spec/template/spec/volumes/-
   value: {"name":"service-ca", "configMap":{"optional":false,"name":"openshift-service-ca.crt"}}

openshift/operator-controller/manifests/20-deployment-openshift-operator-controller-operator-controller-controller-manager.yml

@@ -118,6 +118,9 @@ spec:
             optional: false
             secretName: operator-controller-cert
         - configMap:
+            items:
+              - key: ca-bundle.crt
+                path: ca-bundle.crt
             name: operator-controller-trusted-ca-bundle
             optional: false
           name: trusted-ca-bundle