NO-JIRA: Normalize generation of driver metrics RBAC proxy sidecar (extended)

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}/
@@ -19,7 +19,7 @@ spec:
           imagePullPolicy: IfNotPresent
           ports:
           - containerPort: ${EXPOSED_METRICS_PORT}
-            name: ${PORT_NAME}
+            name: driver-m
             protocol: TCP
           resources:
             requests:

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}/
@@ -19,7 +19,7 @@ spec:
           imagePullPolicy: IfNotPresent
           ports:
           - containerPort: ${EXPOSED_METRICS_PORT}
-            name: ${PORT_NAME}
+            name: driver-m
             protocol: TCP
           resources:
             requests:

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

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

assets/overlays/aws-ebs/patches/controller_add_driver.yaml

@@ -65,7 +65,7 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --k8s-tag-cluster-id=${CLUSTER_ID}
             - --logtostderr
-            - --http-endpoint=localhost:8201
+            - --http-endpoint=localhost:${DRIVER_METRICS_PORT}
             - --v=${LOG_LEVEL}
             - --batching=true
           env:

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

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

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

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

assets/overlays/azure-disk/patches/controller_add_driver.yaml

@@ -22,7 +22,7 @@ spec:
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
-            - --metrics-address=localhost:8201
+            - --metrics-address=localhost:${DRIVER_METRICS_PORT}
             - --v=${LOG_LEVEL}
             # Use credentials provided by the azure-inject-credentials container
             - --cloud-config-secret-name=""

assets/overlays/azure-disk/patches/node_add_driver.yaml

@@ -19,7 +19,7 @@ spec:
             - --logtostderr
             - --v=${LOG_LEVEL}
             - --nodeid=$(KUBE_NODE_NAME)
-            - --metrics-address=localhost:8206
+            - --metrics-address=localhost:${DRIVER_METRICS_PORT}
             # Use credentials provided by the azure-inject-credentials container
             - --cloud-config-secret-name=""
             - --cloud-config-secret-namespace=""

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

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

assets/overlays/azure-file/patches/controller_add_driver.yaml

@@ -25,7 +25,7 @@ spec:
             - --enable-vhd=false
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
-            - --metrics-address=localhost:8211
+            - --metrics-address=localhost:${DRIVER_METRICS_PORT}
             - --v=${LOG_LEVEL}
             # Use credentials provided by the azure-inject-credentials container
             - --cloud-config-secret-name=""

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

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

assets/overlays/openstack-cinder/patches/controller_add_driver.yaml

@@ -40,16 +40,14 @@ spec:
           imagePullPolicy: IfNotPresent
           args:
             - /bin/cinder-csi-plugin
-            - "--provide-controller-service=true"
-            - "--provide-node-service=false"
-            - "--endpoint=$(CSI_ENDPOINT)"
-            # this is the generated value of the LOCAL_METRICS_PORT variable
-            # we hardcode it because we don't currently support substitution
-            - "--http-endpoint=localhost:8202"
-            - "--cloud-config=$(CLOUD_CONFIG)"
-            - "--cluster=${CLUSTER_ID}"
-            - "--with-topology=$(ENABLE_TOPOLOGY)"
-            - "--v=${LOG_LEVEL}"
+            - --provide-controller-service=true
+            - --provide-node-service=false
+            - --endpoint=$(CSI_ENDPOINT)
+            - --http-endpoint=localhost:${DRIVER_METRICS_PORT}
+            - --cloud-config=$(CLOUD_CONFIG)
+            - --cluster=${CLUSTER_ID}
+            - --with-topology=$(ENABLE_TOPOLOGY)
+            - --v=${LOG_LEVEL}
           env:
             - name: CSI_ENDPOINT
               value: unix://csi/csi.sock

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

assets/overlays/samba/patches/controller_add_driver.yaml

@@ -17,7 +17,7 @@ spec:
           imagePullPolicy: IfNotPresent
           args:
             - --endpoint=$(CSI_ENDPOINT)
-            - --metrics-address=localhost:8221
+            - --metrics-address=localhost:${DRIVER_METRICS_PORT}
             - --v=${LOG_LEVEL}
           ports:
             - containerPort: 10307

pkg/driver/aws-ebs/aws_ebs.go

@@ -55,16 +55,10 @@ func GetAWSEBSGeneratorConfig() *generator.CSIDriverGeneratorConfig {
 		OutputDir:        generatedAssetBase,
 
 		ControllerConfig: &generator.ControlPlaneConfig{
-			DeploymentTemplateAssetName: "overlays/aws-ebs/patches/controller_add_driver.yaml",
-			LivenessProbePort:           10301,
-			MetricsPorts: []generator.MetricsPort{
-				{
-					LocalPort:           commongenerator.AWSEBSLoopbackMetricsPortStart,
-					InjectKubeRBACProxy: true,
-					ExposedPort:         commongenerator.AWSEBSExposedMetricsPortStart,
-					Name:                "driver-m",
-				},
-			},
+			DeploymentTemplateAssetName:    "overlays/aws-ebs/patches/controller_add_driver.yaml",
+			LivenessProbePort:              10301,
+			LocalMetricsPort:               commongenerator.AWSEBSLoopbackMetricsPortStart,
+			ExposedMetricsPort:             commongenerator.AWSEBSExposedMetricsPortStart,
 			SidecarLocalMetricsPortStart:   commongenerator.AWSEBSLoopbackMetricsPortStart + 1,
 			SidecarExposedMetricsPortStart: commongenerator.AWSEBSExposedMetricsPortStart + 1,
 			Sidecars: []generator.SidecarConfig{

pkg/driver/azure-disk/azure_disk.go

@@ -72,16 +72,10 @@ func GetAzureDiskGeneratorConfig() *generator.CSIDriverGeneratorConfig {
 		OutputDir:        generatedAssetBase,
 
 		ControllerConfig: &generator.ControlPlaneConfig{
-			DeploymentTemplateAssetName: "overlays/azure-disk/patches/controller_add_driver.yaml",
-			LivenessProbePort:           10301,
-			MetricsPorts: []generator.MetricsPort{
-				{
-					LocalPort:           commongenerator.AzureDiskControllerLoopbackMetricsPortStart,
-					InjectKubeRBACProxy: true,
-					ExposedPort:         commongenerator.AzureDiskControllerExposedMetricsPortStart,
-					Name:                "driver-m",
-				},
-			},
+			DeploymentTemplateAssetName:    "overlays/azure-disk/patches/controller_add_driver.yaml",
+			LivenessProbePort:              10301,
+			LocalMetricsPort:               commongenerator.AzureDiskControllerLoopbackMetricsPortStart,
+			ExposedMetricsPort:             commongenerator.AzureDiskControllerExposedMetricsPortStart,
 			SidecarLocalMetricsPortStart:   commongenerator.AzureDiskControllerLoopbackMetricsPortStart + 1,
 			SidecarExposedMetricsPortStart: commongenerator.AzureDiskControllerExposedMetricsPortStart + 1,
 			Sidecars: []generator.SidecarConfig{
@@ -122,15 +116,9 @@ func GetAzureDiskGeneratorConfig() *generator.CSIDriverGeneratorConfig {
 
 		GuestConfig: &generator.GuestConfig{
 			DaemonSetTemplateAssetName: "overlays/azure-disk/patches/node_add_driver.yaml",
-			MetricsPorts: []generator.MetricsPort{
-				{
-					LocalPort:           commongenerator.AzureDiskNodeLoopbackMetricsPortStart,
-					ExposedPort:         commongenerator.AzureDiskNodeExposedMetricsPortStart,
-					Name:                "driver-m",
-					InjectKubeRBACProxy: true,
-				},
-			},
-			LivenessProbePort: 10300,
+			LocalMetricsPort:           commongenerator.AzureDiskNodeLoopbackMetricsPortStart,
+			ExposedMetricsPort:         commongenerator.AzureDiskNodeExposedMetricsPortStart,
+			LivenessProbePort:          10300,
 			// 10303 port is taken by azurefile stuff and hence we must use 10304 here
 			NodeRegistrarHealthCheckPort: 10304,
 			Sidecars: []generator.SidecarConfig{

pkg/driver/azure-file/azure_file.go

@@ -56,16 +56,10 @@ func GetAzureFileGeneratorConfig() *generator.CSIDriverGeneratorConfig {
 		OutputDir:        generatedAssetBase,
 
 		ControllerConfig: &generator.ControlPlaneConfig{
-			DeploymentTemplateAssetName: "overlays/azure-file/patches/controller_add_driver.yaml",
-			LivenessProbePort:           10303,
-			MetricsPorts: []generator.MetricsPort{
-				{
-					LocalPort:           commongenerator.AzureFileLoopbackMetricsPortStart,
-					InjectKubeRBACProxy: true,
-					ExposedPort:         commongenerator.AzureFileExposedMetricsPortStart,
-					Name:                "driver-m",
-				},
-			},
+			DeploymentTemplateAssetName:    "overlays/azure-file/patches/controller_add_driver.yaml",
+			LivenessProbePort:              10303,
+			LocalMetricsPort:               commongenerator.AzureFileLoopbackMetricsPortStart,
+			ExposedMetricsPort:             commongenerator.AzureFileExposedMetricsPortStart,
 			SidecarLocalMetricsPortStart:   commongenerator.AzureFileLoopbackMetricsPortStart + 1,
 			SidecarExposedMetricsPortStart: commongenerator.AzureFileExposedMetricsPortStart + 1,
 			Sidecars: []generator.SidecarConfig{

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",

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
@@ -273,7 +273,7 @@ spec:
           name: metrics-serving-cert
       - args:
         - --csi-address=/var/lib/csi/sockets/pluginproxy/csi.sock
-        - --metrics-address=localhost:8206
+        - --metrics-address=localhost:${DRIVER_METRICS_PORT}
         - --leader-election
         - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
         - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}

pkg/driver/openstack-cinder/openstack_cinder.go

@@ -38,16 +38,10 @@ func GetOpenStackCinderGeneratorConfig() *generator.CSIDriverGeneratorConfig {
 		OutputDir:        generatedAssetBase,
 
 		ControllerConfig: &generator.ControlPlaneConfig{
-			DeploymentTemplateAssetName: "overlays/openstack-cinder/patches/controller_add_driver.yaml",
-			LivenessProbePort:           10301,
-			MetricsPorts: []generator.MetricsPort{
-				{
-					LocalPort:           commongenerator.OpenStackCinderLoopbackMetricsPortStart,
-					InjectKubeRBACProxy: true,
-					ExposedPort:         commongenerator.OpenStackCinderExposedMetricsPortStart,
-					Name:                "driver-m",
-				},
-			},
+			DeploymentTemplateAssetName:    "overlays/openstack-cinder/patches/controller_add_driver.yaml",
+			LivenessProbePort:              10301,
+			LocalMetricsPort:               commongenerator.OpenStackCinderLoopbackMetricsPortStart,
+			ExposedMetricsPort:             commongenerator.OpenStackCinderExposedMetricsPortStart,
 			SidecarLocalMetricsPortStart:   commongenerator.OpenStackCinderLoopbackMetricsPortStart + 1,
 			SidecarExposedMetricsPortStart: commongenerator.OpenStackCinderExposedMetricsPortStart + 1,
 			Sidecars: []generator.SidecarConfig{

pkg/driver/samba/samba.go

@@ -28,16 +28,10 @@ func GetSambaGeneratorConfig() *generator.CSIDriverGeneratorConfig {
 		OutputDir:        generatedAssetBase,
 
 		ControllerConfig: &generator.ControlPlaneConfig{
-			DeploymentTemplateAssetName: "overlays/samba/patches/controller_add_driver.yaml",
-			LivenessProbePort:           10307,
-			MetricsPorts: []generator.MetricsPort{
-				{
-					LocalPort:           commongenerator.SambaLoopbackMetricsPortStart,
-					InjectKubeRBACProxy: true,
-					ExposedPort:         commongenerator.SambaExposedMetricsPortStart,
-					Name:                "driver-m",
-				},
-			},
+			DeploymentTemplateAssetName:    "overlays/samba/patches/controller_add_driver.yaml",
+			LivenessProbePort:              10307,
+			LocalMetricsPort:               commongenerator.SambaLoopbackMetricsPortStart,
+			ExposedMetricsPort:             commongenerator.SambaExposedMetricsPortStart,
 			SidecarLocalMetricsPortStart:   commongenerator.SambaLoopbackMetricsPortStart + 1,
 			SidecarExposedMetricsPortStart: commongenerator.SambaExposedMetricsPortStart + 1,
 			Sidecars: []generator.SidecarConfig{