UPSTREAM: <carry>: Update openshift CAs to operator-controller

The /run/secrets/kubernetes.io/serviceaccount/ directory is projected
into the pod and contains the following CA certificates:

* configmap/kube-root-ca.crt as ca.crt
* configmap/openshift-service-ca.crt as service-ca.crt

Update the --ca-certs-dir argument to reference the directory.

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

openshift/kustomize/overlays/openshift/olmv1-ns/kustomization.yaml

@@ -2,7 +2,6 @@
 namespace: OPENSHIFT-NAMESPACE
 
 resources:
-  - resources/ca_configmap.yaml
   - ../../../../../config/base/crd
   - ../../../../../config/base/rbac
   - ../../../../../config/base/manager

openshift/kustomize/overlays/openshift/olmv1-ns/patches/manager_deployment_ca.yaml

@@ -1,9 +1,3 @@
-- op: add
-  path: /spec/template/spec/volumes/-
-  value: {"name":"olmv1-certificate", "configMap":{"name":"operator-controller-openshift-ca", "optional": false, "items": [{"key": "service-ca.crt", "path": "olm-ca.crt"}]}}
-- op: add
-  path: /spec/template/spec/containers/0/volumeMounts/-
-  value: {"name":"olmv1-certificate", "readOnly": true, "mountPath":"/var/certs/olm-ca.crt", "subPath":"olm-ca.crt"}
 - op: add
   path: /spec/template/spec/containers/0/args/-
-  value: "--ca-certs-dir=/var/certs"
+  value: "--ca-certs-dir=/run/secrets/kubernetes.io/serviceaccount"

openshift/kustomize/overlays/openshift/olmv1-ns/resources/ca_configmap.yaml

@@ -43,7 +43,7 @@ spec:
             - --health-probe-bind-address=:8081
             - --metrics-bind-address=127.0.0.1:8080
             - --leader-elect
-            - --ca-certs-dir=/var/certs
+            - --ca-certs-dir=/run/secrets/kubernetes.io/serviceaccount
             - --v=${LOG_VERBOSITY}
             - --global-pull-secret=openshift-config/pull-secret
           command:
@@ -76,10 +76,6 @@ spec:
           volumeMounts:
             - mountPath: /var/cache
               name: cache
-            - mountPath: /var/certs/olm-ca.crt
-              name: olmv1-certificate
-              readOnly: true
-              subPath: olm-ca.crt
             - mountPath: /etc/containers
               name: etc-containers
               readOnly: true
@@ -114,13 +110,6 @@ spec:
       volumes:
         - emptyDir: {}
           name: cache
-        - configMap:
-            items:
-              - key: service-ca.crt
-                path: olm-ca.crt
-            name: operator-controller-openshift-ca
-            optional: false
-          name: olmv1-certificate
         - hostPath:
             path: /etc/containers
             type: Directory