assets: Change name of driver metrics sidecar

stephenfin · stephenfin · commit 43f656983056 · 2025-10-30T11:21:09.000Z
This aligns us closer with the other sidecar containers own metrics
sidecars. This is also, coincidentally, the first and only change in the
series of changes that actually has an effect on the generated assets.

Signed-off-by: Stephen Finucane &lt;stephenfin@redhat.com&gt;
diff --git a/assets/common/sidecars/controller_driver_kube_rbac_proxy.yaml b/assets/common/sidecars/controller_driver_kube_rbac_proxy.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     spec:
       containers:
-        - name: kube-rbac-proxy-${LOCAL_METRICS_PORT}
+        - name: driver-kube-rbac-proxy
           args:
           - --secure-listen-address=0.0.0.0:${EXPOSED_METRICS_PORT}
           - --upstream=http://127.0.0.1:${LOCAL_METRICS_PORT}/
diff --git a/assets/common/sidecars/node_driver_kube_rbac_proxy.yaml b/assets/common/sidecars/node_driver_kube_rbac_proxy.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     spec:
       containers:
-        - name: kube-rbac-proxy-${LOCAL_METRICS_PORT}
+        - name: driver-kube-rbac-proxy
           args:
           - --secure-listen-address=0.0.0.0:${EXPOSED_METRICS_PORT}
           - --upstream=http://127.0.0.1:${LOCAL_METRICS_PORT}/
diff --git a/assets/overlays/aws-ebs/generated/hypershift/controller.yaml b/assets/overlays/aws-ebs/generated/hypershift/controller.yaml
@@ -150,7 +150,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8201
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9201
           name: driver-m
diff --git a/assets/overlays/aws-ebs/generated/standalone/controller.yaml b/assets/overlays/aws-ebs/generated/standalone/controller.yaml
@@ -119,7 +119,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8201
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9201
           name: driver-m
diff --git a/assets/overlays/azure-disk/generated/hypershift/controller.yaml b/assets/overlays/azure-disk/generated/hypershift/controller.yaml
@@ -144,7 +144,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8201
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9201
           name: driver-m
diff --git a/assets/overlays/azure-disk/generated/hypershift/node.yaml b/assets/overlays/azure-disk/generated/hypershift/node.yaml
@@ -104,7 +104,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8206
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9206
           name: driver-m
diff --git a/assets/overlays/azure-disk/generated/standalone/controller.yaml b/assets/overlays/azure-disk/generated/standalone/controller.yaml
@@ -114,7 +114,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8201
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9201
           name: driver-m
diff --git a/assets/overlays/azure-disk/generated/standalone/node.yaml b/assets/overlays/azure-disk/generated/standalone/node.yaml
@@ -104,7 +104,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8206
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9206
           name: driver-m
diff --git a/assets/overlays/azure-file/generated/hypershift/controller.yaml b/assets/overlays/azure-file/generated/hypershift/controller.yaml
@@ -157,7 +157,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8211
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9211
           name: driver-m
diff --git a/assets/overlays/azure-file/generated/standalone/controller.yaml b/assets/overlays/azure-file/generated/standalone/controller.yaml
@@ -120,7 +120,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8211
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9211
           name: driver-m
diff --git a/assets/overlays/openstack-cinder/generated/hypershift/controller.yaml b/assets/overlays/openstack-cinder/generated/hypershift/controller.yaml
@@ -152,7 +152,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8202
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9202
           name: driver-m
diff --git a/assets/overlays/openstack-cinder/generated/standalone/controller.yaml b/assets/overlays/openstack-cinder/generated/standalone/controller.yaml
@@ -121,7 +121,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8202
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9202
           name: driver-m
diff --git a/assets/overlays/samba/generated/standalone/controller.yaml b/assets/overlays/samba/generated/standalone/controller.yaml
@@ -97,7 +97,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8221
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9221
           name: driver-m
diff --git a/pkg/driver/common/operator/hooks_test.go b/pkg/driver/common/operator/hooks_test.go
@@ -229,7 +229,7 @@ func Test_WithHyperShiftControlPlaneImages(t *testing.T) {
 			expectedContainerImages: map[string]string{
 				"csi-driver":                  "control_plane_driver_image:1",
 				"csi-liveness-probe":          "control_plane_livenessprobe_image:1",
-				"kube-rbac-proxy-8201":        "control_plane_kube_rbac_proxy_image:1",
+				"driver-kube-rbac-proxy":      "control_plane_kube_rbac_proxy_image:1",
 				"provisioner-kube-rbac-proxy": "control_plane_kube_rbac_proxy_image:1",
 				"attacher-kube-rbac-proxy":    "control_plane_kube_rbac_proxy_image:1",
 				"resizer-kube-rbac-proxy":     "control_plane_kube_rbac_proxy_image:1",
diff --git a/pkg/driver/common/operator/test_manifests/aws_ebs_controller_hypershift.yaml b/pkg/driver/common/operator/test_manifests/aws_ebs_controller_hypershift.yaml
@@ -112,7 +112,7 @@ spec:
         - --logtostderr=true
         image: ${KUBE_RBAC_PROXY_IMAGE}
         imagePullPolicy: IfNotPresent
-        name: kube-rbac-proxy-8201
+        name: driver-kube-rbac-proxy
         ports:
         - containerPort: 9201
           name: driver-m
