From 35ad8590805c54db53e111e917b2dfdfda134885 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 15 Apr 2025 14:49:39 +0100 Subject: [PATCH] assets: Change name of driver metrics sidecar This aligns us closer with the other sidecar containers' own metrics sidecars. Signed-off-by: Stephen Finucane --- assets/common/sidecars/controller_driver_kube_rbac_proxy.yaml | 2 +- assets/common/sidecars/node_driver_kube_rbac_proxy.yaml | 2 +- assets/overlays/aws-ebs/generated/hypershift/controller.yaml | 2 +- assets/overlays/aws-ebs/generated/standalone/controller.yaml | 2 +- assets/overlays/azure-disk/generated/hypershift/controller.yaml | 2 +- assets/overlays/azure-disk/generated/hypershift/node.yaml | 2 +- assets/overlays/azure-disk/generated/standalone/controller.yaml | 2 +- assets/overlays/azure-disk/generated/standalone/node.yaml | 2 +- assets/overlays/azure-file/generated/hypershift/controller.yaml | 2 +- assets/overlays/azure-file/generated/standalone/controller.yaml | 2 +- .../openstack-cinder/generated/hypershift/controller.yaml | 2 +- .../openstack-cinder/generated/standalone/controller.yaml | 2 +- assets/overlays/samba/generated/standalone/controller.yaml | 2 +- pkg/driver/common/operator/hooks_test.go | 2 +- .../operator/test_manifests/aws_ebs_controller_hypershift.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/assets/common/sidecars/controller_driver_kube_rbac_proxy.yaml b/assets/common/sidecars/controller_driver_kube_rbac_proxy.yaml index 62418f29f..fcd7886fe 100644 --- 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 securityContext: readOnlyRootFilesystem: true args: diff --git a/assets/common/sidecars/node_driver_kube_rbac_proxy.yaml b/assets/common/sidecars/node_driver_kube_rbac_proxy.yaml index 49fe51bae..0d787049e 100644 --- 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 securityContext: readOnlyRootFilesystem: true args: diff --git a/assets/overlays/aws-ebs/generated/hypershift/controller.yaml b/assets/overlays/aws-ebs/generated/hypershift/controller.yaml index 771ec4155..9611f2014 100644 --- a/assets/overlays/aws-ebs/generated/hypershift/controller.yaml +++ b/assets/overlays/aws-ebs/generated/hypershift/controller.yaml @@ -156,7 +156,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 index b34bd2df6..5251d8a9e 100644 --- a/assets/overlays/aws-ebs/generated/standalone/controller.yaml +++ b/assets/overlays/aws-ebs/generated/standalone/controller.yaml @@ -122,7 +122,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 index 66c8d1bbb..a4d3a5cd2 100644 --- a/assets/overlays/azure-disk/generated/hypershift/controller.yaml +++ b/assets/overlays/azure-disk/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/azure-disk/generated/hypershift/node.yaml b/assets/overlays/azure-disk/generated/hypershift/node.yaml index 9dca9405d..fccdf56e5 100644 --- a/assets/overlays/azure-disk/generated/hypershift/node.yaml +++ b/assets/overlays/azure-disk/generated/hypershift/node.yaml @@ -106,7 +106,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 index 4da258cb2..8f17ab164 100644 --- a/assets/overlays/azure-disk/generated/standalone/controller.yaml +++ b/assets/overlays/azure-disk/generated/standalone/controller.yaml @@ -117,7 +117,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 index 9dca9405d..fccdf56e5 100644 --- a/assets/overlays/azure-disk/generated/standalone/node.yaml +++ b/assets/overlays/azure-disk/generated/standalone/node.yaml @@ -106,7 +106,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 index 20090fc5d..a525748c2 100644 --- a/assets/overlays/azure-file/generated/hypershift/controller.yaml +++ b/assets/overlays/azure-file/generated/hypershift/controller.yaml @@ -165,7 +165,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 index e6aec7062..d406b85df 100644 --- a/assets/overlays/azure-file/generated/standalone/controller.yaml +++ b/assets/overlays/azure-file/generated/standalone/controller.yaml @@ -125,7 +125,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 index 5469d033a..8a885dfea 100644 --- a/assets/overlays/openstack-cinder/generated/hypershift/controller.yaml +++ b/assets/overlays/openstack-cinder/generated/hypershift/controller.yaml @@ -158,7 +158,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 index 4b5d0b812..1a98c072b 100644 --- a/assets/overlays/openstack-cinder/generated/standalone/controller.yaml +++ b/assets/overlays/openstack-cinder/generated/standalone/controller.yaml @@ -124,7 +124,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 index 6ab88e976..2e732c3c2 100644 --- a/assets/overlays/samba/generated/standalone/controller.yaml +++ b/assets/overlays/samba/generated/standalone/controller.yaml @@ -126,7 +126,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 index 5cdf12d99..4141eebf3 100644 --- a/pkg/driver/common/operator/hooks_test.go +++ b/pkg/driver/common/operator/hooks_test.go @@ -219,7 +219,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 index 33317ecda..e358f97b7 100644 --- 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