WIP: STOR-2770: Mount metrics certs of azure-disk and azure-file CSI driver operator for Hypershift

assets/csidriveroperators/azure-disk/base/08_deployment.yaml

@@ -69,6 +69,8 @@ spec:
         volumeMounts:
         - mountPath: /tmp
           name: tmp
+        - mountPath: /var/run/secrets/serving-cert
+          name: serving-cert
       serviceAccountName: azure-disk-csi-driver-operator
       securityContext:
         runAsNonRoot: true
@@ -78,3 +80,7 @@ spec:
       - name: tmp
         emptyDir:
           medium: Memory
+      - name: serving-cert
+        secret:
+          defaultMode: 420
+          secretName: azure-disk-csi-driver-operator-serving-cert

assets/csidriveroperators/azure-disk/hypershift/mgmt/generated/apps_v1_deployment_azure-disk-csi-driver-operator.yaml

@@ -108,6 +108,8 @@ spec:
           name: guest-kubeconfig
         - mountPath: /tmp
           name: tmp
+        - mountPath: /var/run/secrets/serving-cert
+          name: serving-cert
       priorityClassName: hypershift-control-plane
       securityContext:
         runAsNonRoot: true
@@ -132,3 +134,7 @@ spec:
       - emptyDir:
           medium: Memory
         name: tmp
+      - name: serving-cert
+        secret:
+          defaultMode: 420
+          secretName: azure-disk-csi-driver-operator-serving-cert

assets/csidriveroperators/azure-disk/hypershift/mgmt/generated/v1_service_azure-disk-csi-driver-operator-metrics.yaml

@@ -1,8 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    service.beta.openshift.io/serving-cert-secret-name: azure-disk-csi-driver-operator-serving-cert
   labels:
     app: azure-disk-csi-driver-operator
   name: azure-disk-csi-driver-operator-metrics

assets/csidriveroperators/azure-disk/hypershift/mgmt/hypershift_service.patch.yaml

@@ -0,0 +1,2 @@
+- op: "remove"
+  path: "/metadata/annotations/service.beta.openshift.io~1serving-cert-secret-name"

assets/csidriveroperators/azure-disk/hypershift/mgmt/kustomization.yaml

@@ -10,6 +10,10 @@ patches:
     target:
       kind: Role
       version: v1
+  - path: hypershift_service.patch.yaml
+    target:
+      kind: Service
+      version: v1
   - path: deployment.patch.yaml
     target:
       kind: Deployment

assets/csidriveroperators/azure-disk/standalone/deployment.patch.yaml

@@ -14,13 +14,3 @@ spec:
         - key: node-role.kubernetes.io/master
           operator: Exists
           effect: "NoSchedule"
-      containers:
-      - name: azure-disk-csi-driver-operator
-        volumeMounts:
-        - mountPath: /var/run/secrets/serving-cert
-          name: serving-cert
-      volumes:
-      - name: serving-cert
-        secret:
-          defaultMode: 420
-          secretName: azure-disk-csi-driver-operator-serving-cert

assets/csidriveroperators/azure-disk/standalone/generated/apps_v1_deployment_azure-disk-csi-driver-operator.yaml

@@ -67,10 +67,10 @@ spec:
           readOnlyRootFilesystem: true
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
-        - mountPath: /var/run/secrets/serving-cert
-          name: serving-cert
         - mountPath: /tmp
           name: tmp
+        - mountPath: /var/run/secrets/serving-cert
+          name: serving-cert
       nodeSelector:
         node-role.kubernetes.io/master: ""
       priorityClassName: system-cluster-critical
@@ -86,10 +86,10 @@ spec:
         key: node-role.kubernetes.io/master
         operator: Exists
       volumes:
+      - emptyDir:
+          medium: Memory
+        name: tmp
       - name: serving-cert
         secret:
           defaultMode: 420
           secretName: azure-disk-csi-driver-operator-serving-cert
-      - emptyDir:
-          medium: Memory
-        name: tmp

assets/csidriveroperators/azure-file/base/08_deployment.yaml

@@ -69,6 +69,8 @@ spec:
         volumeMounts:
         - mountPath: /tmp
           name: tmp
+        - mountPath: /var/run/secrets/serving-cert
+          name: serving-cert
       serviceAccountName: azure-file-csi-driver-operator
       securityContext:
         runAsNonRoot: true
@@ -78,3 +80,7 @@ spec:
       - name: tmp
         emptyDir:
           medium: Memory
+      - name: serving-cert
+        secret:
+          defaultMode: 420
+          secretName: azure-file-csi-driver-operator-serving-cert

assets/csidriveroperators/azure-file/hypershift/mgmt/generated/apps_v1_deployment_azure-file-csi-driver-operator.yaml

@@ -108,6 +108,8 @@ spec:
           name: guest-kubeconfig
         - mountPath: /tmp
           name: tmp
+        - mountPath: /var/run/secrets/serving-cert
+          name: serving-cert
       priorityClassName: hypershift-control-plane
       securityContext:
         runAsNonRoot: true
@@ -132,3 +134,7 @@ spec:
       - emptyDir:
           medium: Memory
         name: tmp
+      - name: serving-cert
+        secret:
+          defaultMode: 420
+          secretName: azure-file-csi-driver-operator-serving-cert

assets/csidriveroperators/azure-file/hypershift/mgmt/generated/v1_service_azure-file-csi-driver-operator-metrics.yaml

@@ -1,8 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    service.beta.openshift.io/serving-cert-secret-name: azure-file-csi-driver-operator-serving-cert
   labels:
     app: azure-file-csi-driver-operator
   name: azure-file-csi-driver-operator-metrics

assets/csidriveroperators/azure-file/hypershift/mgmt/hypershift_service.patch.yaml

@@ -0,0 +1,2 @@
+- op: "remove"
+  path: "/metadata/annotations/service.beta.openshift.io~1serving-cert-secret-name"

assets/csidriveroperators/azure-file/hypershift/mgmt/kustomization.yaml

@@ -10,6 +10,10 @@ patches:
     target:
       kind: Role
       version: v1
+  - path: hypershift_service.patch.yaml
+    target:
+      kind: Service
+      version: v1
   - path: deployment.patch.yaml
     target:
       kind: Deployment

assets/csidriveroperators/azure-file/standalone/deployment.patch.yaml

@@ -14,13 +14,3 @@ spec:
         - key: node-role.kubernetes.io/master
           operator: Exists
           effect: "NoSchedule"
-      containers:
-      - name: azure-file-csi-driver-operator
-        volumeMounts:
-        - mountPath: /var/run/secrets/serving-cert
-          name: serving-cert
-      volumes:
-      - name: serving-cert
-        secret:
-          defaultMode: 420
-          secretName: azure-file-csi-driver-operator-serving-cert

assets/csidriveroperators/azure-file/standalone/generated/apps_v1_deployment_azure-file-csi-driver-operator.yaml

@@ -67,10 +67,10 @@ spec:
           readOnlyRootFilesystem: true
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
-        - mountPath: /var/run/secrets/serving-cert
-          name: serving-cert
         - mountPath: /tmp
           name: tmp
+        - mountPath: /var/run/secrets/serving-cert
+          name: serving-cert
       nodeSelector:
         node-role.kubernetes.io/master: ""
       priorityClassName: system-cluster-critical
@@ -86,10 +86,10 @@ spec:
         key: node-role.kubernetes.io/master
         operator: Exists
       volumes:
+      - emptyDir:
+          medium: Memory
+        name: tmp
       - name: serving-cert
         secret:
           defaultMode: 420
           secretName: azure-file-csi-driver-operator-serving-cert
-      - emptyDir:
-          medium: Memory
-        name: tmp