From 2005c2f1430972f4c5efcc4f4a4c4a7dbc9f4b9c Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 14 Apr 2025 18:57:12 +0100 Subject: [PATCH 1/4] generator: There is only one driver metrics port No need to use a slice. Signed-off-by: Stephen Finucane --- pkg/driver/aws-ebs/aws_ebs.go | 12 ++- pkg/driver/azure-disk/azure_disk.go | 24 +++--- pkg/driver/azure-file/azure_file.go | 12 ++- .../openstack-cinder/openstack_cinder.go | 12 ++- pkg/driver/samba/samba.go | 12 ++- pkg/generator/asset_generator.go | 86 +++++++++---------- pkg/generator/types.go | 8 +- 7 files changed, 77 insertions(+), 89 deletions(-) diff --git a/pkg/driver/aws-ebs/aws_ebs.go b/pkg/driver/aws-ebs/aws_ebs.go index 2e2e6a6b7..ccc8dd98a 100644 --- a/pkg/driver/aws-ebs/aws_ebs.go +++ b/pkg/driver/aws-ebs/aws_ebs.go @@ -57,13 +57,11 @@ func GetAWSEBSGeneratorConfig() *generator.CSIDriverGeneratorConfig { 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", - }, + MetricsPort: &generator.MetricsPort{ + LocalPort: commongenerator.AWSEBSLoopbackMetricsPortStart, + InjectKubeRBACProxy: true, + ExposedPort: commongenerator.AWSEBSExposedMetricsPortStart, + Name: "driver-m", }, SidecarLocalMetricsPortStart: commongenerator.AWSEBSLoopbackMetricsPortStart + 1, SidecarExposedMetricsPortStart: commongenerator.AWSEBSExposedMetricsPortStart + 1, diff --git a/pkg/driver/azure-disk/azure_disk.go b/pkg/driver/azure-disk/azure_disk.go index 46b89febc..51049a4d9 100644 --- a/pkg/driver/azure-disk/azure_disk.go +++ b/pkg/driver/azure-disk/azure_disk.go @@ -74,13 +74,11 @@ func GetAzureDiskGeneratorConfig() *generator.CSIDriverGeneratorConfig { 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", - }, + MetricsPort: &generator.MetricsPort{ + LocalPort: commongenerator.AzureDiskControllerLoopbackMetricsPortStart, + InjectKubeRBACProxy: true, + ExposedPort: commongenerator.AzureDiskControllerExposedMetricsPortStart, + Name: "driver-m", }, SidecarLocalMetricsPortStart: commongenerator.AzureDiskControllerLoopbackMetricsPortStart + 1, SidecarExposedMetricsPortStart: commongenerator.AzureDiskControllerExposedMetricsPortStart + 1, @@ -122,13 +120,11 @@ 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, - }, + MetricsPort: &generator.MetricsPort{ + LocalPort: commongenerator.AzureDiskNodeLoopbackMetricsPortStart, + InjectKubeRBACProxy: true, + ExposedPort: commongenerator.AzureDiskNodeExposedMetricsPortStart, + Name: "driver-m", }, LivenessProbePort: 10300, // 10303 port is taken by azurefile stuff and hence we must use 10304 here diff --git a/pkg/driver/azure-file/azure_file.go b/pkg/driver/azure-file/azure_file.go index 183e106ac..86f392e30 100644 --- a/pkg/driver/azure-file/azure_file.go +++ b/pkg/driver/azure-file/azure_file.go @@ -58,13 +58,11 @@ func GetAzureFileGeneratorConfig() *generator.CSIDriverGeneratorConfig { 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", - }, + MetricsPort: &generator.MetricsPort{ + LocalPort: commongenerator.AzureFileLoopbackMetricsPortStart, + InjectKubeRBACProxy: true, + ExposedPort: commongenerator.AzureFileExposedMetricsPortStart, + Name: "driver-m", }, SidecarLocalMetricsPortStart: commongenerator.AzureFileLoopbackMetricsPortStart + 1, SidecarExposedMetricsPortStart: commongenerator.AzureFileExposedMetricsPortStart + 1, diff --git a/pkg/driver/openstack-cinder/openstack_cinder.go b/pkg/driver/openstack-cinder/openstack_cinder.go index 81bdd8126..b5adf6d74 100644 --- a/pkg/driver/openstack-cinder/openstack_cinder.go +++ b/pkg/driver/openstack-cinder/openstack_cinder.go @@ -40,13 +40,11 @@ func GetOpenStackCinderGeneratorConfig() *generator.CSIDriverGeneratorConfig { 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", - }, + MetricsPort: &generator.MetricsPort{ + LocalPort: commongenerator.OpenStackCinderLoopbackMetricsPortStart, + InjectKubeRBACProxy: true, + ExposedPort: commongenerator.OpenStackCinderExposedMetricsPortStart, + Name: "driver-m", }, SidecarLocalMetricsPortStart: commongenerator.OpenStackCinderLoopbackMetricsPortStart + 1, SidecarExposedMetricsPortStart: commongenerator.OpenStackCinderExposedMetricsPortStart + 1, diff --git a/pkg/driver/samba/samba.go b/pkg/driver/samba/samba.go index a8d9e0ee2..32bfa0268 100644 --- a/pkg/driver/samba/samba.go +++ b/pkg/driver/samba/samba.go @@ -30,13 +30,11 @@ func GetSambaGeneratorConfig() *generator.CSIDriverGeneratorConfig { 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", - }, + MetricsPort: &generator.MetricsPort{ + LocalPort: commongenerator.SambaLoopbackMetricsPortStart, + InjectKubeRBACProxy: true, + ExposedPort: commongenerator.SambaExposedMetricsPortStart, + Name: "driver-m", }, SidecarLocalMetricsPortStart: commongenerator.SambaLoopbackMetricsPortStart + 1, SidecarExposedMetricsPortStart: commongenerator.SambaExposedMetricsPortStart + 1, diff --git a/pkg/generator/asset_generator.go b/pkg/generator/asset_generator.go index 939c55d04..b2de8dc1c 100644 --- a/pkg/generator/asset_generator.go +++ b/pkg/generator/asset_generator.go @@ -102,26 +102,25 @@ func (gen *AssetGenerator) patchController() error { return nil } -// Inject kube-rbac-proxy container for all metrics ports into yamlFile. The yamlFile can be a Deployment or a +// Inject kube-rbac-proxy container for the metrics port into yamlFile. The yamlFile can be a Deployment or a // DaemonSet. proxyPatchFile is the path to Deployment / DaemonSet patch file that adds the proxy container. -func (gen *AssetGenerator) addDriverRBACProxyContainers(yamlFile *YAMLWithHistory, proxyPatchFile string, metricPorts []MetricsPort, baseExtraReplacements []string) error { - for i := 0; i < len(metricPorts); i++ { - port := metricPorts[i] - if !port.InjectKubeRBACProxy { - continue - } - extraReplacements := append([]string{}, baseExtraReplacements...) // Poor man's copy of the array. - extraReplacements = append(extraReplacements, - "${LOCAL_METRICS_PORT}", strconv.Itoa(int(port.LocalPort)), - "${EXPOSED_METRICS_PORT}", strconv.Itoa(int(port.ExposedPort)), - "${PORT_NAME}", port.Name, - ) - port.LocalPort++ - port.ExposedPort++ - err := gen.applyAssetPatch(yamlFile, proxyPatchFile, extraReplacements) - if err != nil { - return err - } +func (gen *AssetGenerator) addDriverRBACProxyContainers(yamlFile *YAMLWithHistory, proxyPatchFile string, metricsPort *MetricsPort, baseExtraReplacements []string) error { + if metricsPort == nil { + return nil + } + + if !metricsPort.InjectKubeRBACProxy { + return nil + } + extraReplacements := append([]string{}, baseExtraReplacements...) // Poor man's copy of the array. + extraReplacements = append(extraReplacements, + "${LOCAL_METRICS_PORT}", strconv.Itoa(int(metricsPort.LocalPort)), + "${EXPOSED_METRICS_PORT}", strconv.Itoa(int(metricsPort.ExposedPort)), + "${PORT_NAME}", metricsPort.Name, + ) + err := gen.applyAssetPatch(yamlFile, proxyPatchFile, extraReplacements) + if err != nil { + return err } return nil } @@ -143,7 +142,7 @@ func (gen *AssetGenerator) generateDeployment() error { baseExtraReplacements = append(baseExtraReplacements, "${LIVENESS_PROBE_PORT}", strconv.Itoa(int(ctrlCfg.LivenessProbePort))) } - err = gen.addDriverRBACProxyContainers(deploymentYAML, "common/sidecars/controller_driver_kube_rbac_proxy.yaml", ctrlCfg.MetricsPorts, baseExtraReplacements) + err = gen.addDriverRBACProxyContainers(deploymentYAML, "common/sidecars/controller_driver_kube_rbac_proxy.yaml", ctrlCfg.MetricsPort, baseExtraReplacements) if err != nil { return err } @@ -170,25 +169,26 @@ func (gen *AssetGenerator) generateDeployment() error { return nil } -// Add driver's MetricsPorts to the metrics Service and ServiceMonitor. -func (gen *AssetGenerator) generateDriverMetricsService(serviceYAML, serviceMonitorYAML *YAMLWithHistory, metricsPorts []MetricsPort, servicePrefix string) error { - for i := 0; i < len(metricsPorts); i++ { - port := metricsPorts[i] - extraReplacements := []string{ - "${EXPOSED_METRICS_PORT}", strconv.Itoa(int(port.ExposedPort)), - "${LOCAL_METRICS_PORT}", strconv.Itoa(int(port.LocalPort)), - "${PORT_NAME}", port.Name, - "${SERVICE_PREFIX}", servicePrefix, - } - var err error - err = gen.applyAssetPatch(serviceYAML, "common/metrics/service_add_port.yaml", extraReplacements) - if err != nil { - return err - } - err = gen.applyAssetPatch(serviceMonitorYAML, "common/metrics/service_monitor_add_port.yaml.patch", extraReplacements) - if err != nil { - return err - } +// Add driver's MetricsPort to the metrics Service and ServiceMonitor. +func (gen *AssetGenerator) generateDriverMetricsService(serviceYAML, serviceMonitorYAML *YAMLWithHistory, metricsPort *MetricsPort, servicePrefix string) error { + if metricsPort == nil { + return nil + } + + extraReplacements := []string{ + "${EXPOSED_METRICS_PORT}", strconv.Itoa(int(metricsPort.ExposedPort)), + "${LOCAL_METRICS_PORT}", strconv.Itoa(int(metricsPort.LocalPort)), + "${PORT_NAME}", metricsPort.Name, + "${SERVICE_PREFIX}", servicePrefix, + } + var err error + err = gen.applyAssetPatch(serviceYAML, "common/metrics/service_add_port.yaml", extraReplacements) + if err != nil { + return err + } + err = gen.applyAssetPatch(serviceMonitorYAML, "common/metrics/service_monitor_add_port.yaml.patch", extraReplacements) + if err != nil { + return err } return nil } @@ -232,7 +232,7 @@ func (gen *AssetGenerator) generateControllerMonitoringService() error { if err := gen.generateSidecarMetricsServices(serviceYAML, serviceMonitorYAML, int(ctrlCfg.SidecarLocalMetricsPortStart), int(ctrlCfg.SidecarExposedMetricsPortStart), ctrlCfg.Sidecars, "controller"); err != nil { return err } - if err := gen.generateDriverMetricsService(serviceYAML, serviceMonitorYAML, ctrlCfg.MetricsPorts, "controller"); err != nil { + if err := gen.generateDriverMetricsService(serviceYAML, serviceMonitorYAML, ctrlCfg.MetricsPort, "controller"); err != nil { return err } @@ -292,7 +292,7 @@ func (gen *AssetGenerator) generateDaemonSet() error { return err } - err = gen.addDriverRBACProxyContainers(dsYAML, "common/sidecars/node_driver_kube_rbac_proxy.yaml", cfg.MetricsPorts, extraReplacements) + err = gen.addDriverRBACProxyContainers(dsYAML, "common/sidecars/node_driver_kube_rbac_proxy.yaml", cfg.MetricsPort, extraReplacements) if err != nil { return err } @@ -311,7 +311,7 @@ func (gen *AssetGenerator) generateDaemonSet() error { func (gen *AssetGenerator) generateGuestMonitoringService() error { cfg := gen.operatorConfig.GuestConfig - if len(cfg.MetricsPorts) == 0 { + if cfg.MetricsPort == nil { // Do not add metrics service if driver does not expose any metrics. // There is no node-level sidecar that would export one. return nil @@ -319,7 +319,7 @@ func (gen *AssetGenerator) generateGuestMonitoringService() error { serviceYAML := gen.mustReadBaseAsset("base/node_metrics_service.yaml", nil) serviceMonitorYAML := gen.mustReadBaseAsset("base/node_metrics_servicemonitor.yaml", nil) - err := gen.generateDriverMetricsService(serviceYAML, serviceMonitorYAML, cfg.MetricsPorts, "node") + err := gen.generateDriverMetricsService(serviceYAML, serviceMonitorYAML, cfg.MetricsPort, "node") if err != nil { return err } diff --git a/pkg/generator/types.go b/pkg/generator/types.go index 4f8905d2c..38910b03d 100644 --- a/pkg/generator/types.go +++ b/pkg/generator/types.go @@ -55,9 +55,9 @@ type ControlPlaneConfig struct { // The Deployment will be available as "controller.yaml" in the generated assets and can be patched // by DeploymentTemplateAssetName string - // List of metric ports exposed by the driver itself and any containers defined in DeploymentTemplateAssetName. + // Metric port exposed by the driver itself. // Sidecar metrics ports are not included here, they will be added dynamically from sidecar config below. - MetricsPorts []MetricsPort + MetricsPort *MetricsPort // Liveness probe TCP port number exposed by the driver itself, i.e. by DeploymentTemplateAssetName. // It will be injected to liveness probe sidecar automatically. LivenessProbePort uint16 @@ -114,8 +114,8 @@ type SidecarConfig struct { type GuestConfig struct { // Name of the template asset that contains DaemonSet of the guest components. DaemonSetTemplateAssetName string - // List of metric ports exposed by the driver itself and any containers defined in DeploymentTemplateAssetName. - MetricsPorts []MetricsPort + // Metric ports exposed by the driver itself. + MetricsPort *MetricsPort // Liveness probe TCP port number exposed by the driver itself, i.e. by DaemonSetTemplateAssetName. LivenessProbePort uint16 // port where node-registrar will expose health check endpoint From 8b905543707b8c20480e75c142367f684600e6ce Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 15 Apr 2025 09:56:52 +0100 Subject: [PATCH 2/4] generator: Remove MetricsPort The 'InjectKubeRBACProxy' field was was always set to True in users and was therefore a no-op. The 'Name' field was likewise always set to 'driver-m' and doesn't need to be templated. Flatten the remaining two fields into the parent structs and remove MetricsPorts entirely. Signed-off-by: Stephen Finucane --- .../controller_driver_kube_rbac_proxy.yaml | 2 +- .../sidecars/node_driver_kube_rbac_proxy.yaml | 2 +- pkg/driver/aws-ebs/aws_ebs.go | 12 +++---- pkg/driver/azure-disk/azure_disk.go | 22 ++++--------- pkg/driver/azure-file/azure_file.go | 12 +++---- .../openstack-cinder/openstack_cinder.go | 12 +++---- pkg/driver/samba/samba.go | 12 +++---- pkg/generator/asset_generator.go | 32 ++++++++----------- pkg/generator/types.go | 27 ++++++---------- 9 files changed, 48 insertions(+), 85 deletions(-) diff --git a/assets/common/sidecars/controller_driver_kube_rbac_proxy.yaml b/assets/common/sidecars/controller_driver_kube_rbac_proxy.yaml index 29bad8fd6..13268e062 100644 --- a/assets/common/sidecars/controller_driver_kube_rbac_proxy.yaml +++ b/assets/common/sidecars/controller_driver_kube_rbac_proxy.yaml @@ -19,7 +19,7 @@ spec: imagePullPolicy: IfNotPresent ports: - containerPort: ${EXPOSED_METRICS_PORT} - name: ${PORT_NAME} + name: driver-m protocol: TCP resources: requests: diff --git a/assets/common/sidecars/node_driver_kube_rbac_proxy.yaml b/assets/common/sidecars/node_driver_kube_rbac_proxy.yaml index 97ea506d8..06fd6011a 100644 --- a/assets/common/sidecars/node_driver_kube_rbac_proxy.yaml +++ b/assets/common/sidecars/node_driver_kube_rbac_proxy.yaml @@ -19,7 +19,7 @@ spec: imagePullPolicy: IfNotPresent ports: - containerPort: ${EXPOSED_METRICS_PORT} - name: ${PORT_NAME} + name: driver-m protocol: TCP resources: requests: diff --git a/pkg/driver/aws-ebs/aws_ebs.go b/pkg/driver/aws-ebs/aws_ebs.go index ccc8dd98a..a05c3cf61 100644 --- a/pkg/driver/aws-ebs/aws_ebs.go +++ b/pkg/driver/aws-ebs/aws_ebs.go @@ -55,14 +55,10 @@ func GetAWSEBSGeneratorConfig() *generator.CSIDriverGeneratorConfig { OutputDir: generatedAssetBase, ControllerConfig: &generator.ControlPlaneConfig{ - DeploymentTemplateAssetName: "overlays/aws-ebs/patches/controller_add_driver.yaml", - LivenessProbePort: 10301, - MetricsPort: &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{ diff --git a/pkg/driver/azure-disk/azure_disk.go b/pkg/driver/azure-disk/azure_disk.go index 51049a4d9..d3a74b805 100644 --- a/pkg/driver/azure-disk/azure_disk.go +++ b/pkg/driver/azure-disk/azure_disk.go @@ -72,14 +72,10 @@ func GetAzureDiskGeneratorConfig() *generator.CSIDriverGeneratorConfig { OutputDir: generatedAssetBase, ControllerConfig: &generator.ControlPlaneConfig{ - DeploymentTemplateAssetName: "overlays/azure-disk/patches/controller_add_driver.yaml", - LivenessProbePort: 10301, - MetricsPort: &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{ @@ -120,13 +116,9 @@ func GetAzureDiskGeneratorConfig() *generator.CSIDriverGeneratorConfig { GuestConfig: &generator.GuestConfig{ DaemonSetTemplateAssetName: "overlays/azure-disk/patches/node_add_driver.yaml", - MetricsPort: &generator.MetricsPort{ - LocalPort: commongenerator.AzureDiskNodeLoopbackMetricsPortStart, - InjectKubeRBACProxy: true, - ExposedPort: commongenerator.AzureDiskNodeExposedMetricsPortStart, - Name: "driver-m", - }, - 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{ diff --git a/pkg/driver/azure-file/azure_file.go b/pkg/driver/azure-file/azure_file.go index 86f392e30..420585447 100644 --- a/pkg/driver/azure-file/azure_file.go +++ b/pkg/driver/azure-file/azure_file.go @@ -56,14 +56,10 @@ func GetAzureFileGeneratorConfig() *generator.CSIDriverGeneratorConfig { OutputDir: generatedAssetBase, ControllerConfig: &generator.ControlPlaneConfig{ - DeploymentTemplateAssetName: "overlays/azure-file/patches/controller_add_driver.yaml", - LivenessProbePort: 10303, - MetricsPort: &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{ diff --git a/pkg/driver/openstack-cinder/openstack_cinder.go b/pkg/driver/openstack-cinder/openstack_cinder.go index b5adf6d74..226908672 100644 --- a/pkg/driver/openstack-cinder/openstack_cinder.go +++ b/pkg/driver/openstack-cinder/openstack_cinder.go @@ -38,14 +38,10 @@ func GetOpenStackCinderGeneratorConfig() *generator.CSIDriverGeneratorConfig { OutputDir: generatedAssetBase, ControllerConfig: &generator.ControlPlaneConfig{ - DeploymentTemplateAssetName: "overlays/openstack-cinder/patches/controller_add_driver.yaml", - LivenessProbePort: 10301, - MetricsPort: &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{ diff --git a/pkg/driver/samba/samba.go b/pkg/driver/samba/samba.go index 32bfa0268..5c2d30b4c 100644 --- a/pkg/driver/samba/samba.go +++ b/pkg/driver/samba/samba.go @@ -28,14 +28,10 @@ func GetSambaGeneratorConfig() *generator.CSIDriverGeneratorConfig { OutputDir: generatedAssetBase, ControllerConfig: &generator.ControlPlaneConfig{ - DeploymentTemplateAssetName: "overlays/samba/patches/controller_add_driver.yaml", - LivenessProbePort: 10307, - MetricsPort: &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{ diff --git a/pkg/generator/asset_generator.go b/pkg/generator/asset_generator.go index b2de8dc1c..e1c7b761a 100644 --- a/pkg/generator/asset_generator.go +++ b/pkg/generator/asset_generator.go @@ -104,19 +104,15 @@ func (gen *AssetGenerator) patchController() error { // Inject kube-rbac-proxy container for the metrics port into yamlFile. The yamlFile can be a Deployment or a // DaemonSet. proxyPatchFile is the path to Deployment / DaemonSet patch file that adds the proxy container. -func (gen *AssetGenerator) addDriverRBACProxyContainers(yamlFile *YAMLWithHistory, proxyPatchFile string, metricsPort *MetricsPort, baseExtraReplacements []string) error { - if metricsPort == nil { +func (gen *AssetGenerator) addDriverRBACProxyContainers(yamlFile *YAMLWithHistory, proxyPatchFile string, localMetricsPort, exposedMetricsPort uint16, baseExtraReplacements []string) error { + if localMetricsPort == 0 { return nil } - if !metricsPort.InjectKubeRBACProxy { - return nil - } extraReplacements := append([]string{}, baseExtraReplacements...) // Poor man's copy of the array. extraReplacements = append(extraReplacements, - "${LOCAL_METRICS_PORT}", strconv.Itoa(int(metricsPort.LocalPort)), - "${EXPOSED_METRICS_PORT}", strconv.Itoa(int(metricsPort.ExposedPort)), - "${PORT_NAME}", metricsPort.Name, + "${LOCAL_METRICS_PORT}", strconv.Itoa(int(localMetricsPort)), + "${EXPOSED_METRICS_PORT}", strconv.Itoa(int(exposedMetricsPort)), ) err := gen.applyAssetPatch(yamlFile, proxyPatchFile, extraReplacements) if err != nil { @@ -142,7 +138,7 @@ func (gen *AssetGenerator) generateDeployment() error { baseExtraReplacements = append(baseExtraReplacements, "${LIVENESS_PROBE_PORT}", strconv.Itoa(int(ctrlCfg.LivenessProbePort))) } - err = gen.addDriverRBACProxyContainers(deploymentYAML, "common/sidecars/controller_driver_kube_rbac_proxy.yaml", ctrlCfg.MetricsPort, baseExtraReplacements) + err = gen.addDriverRBACProxyContainers(deploymentYAML, "common/sidecars/controller_driver_kube_rbac_proxy.yaml", ctrlCfg.LocalMetricsPort, ctrlCfg.ExposedMetricsPort, baseExtraReplacements) if err != nil { return err } @@ -170,15 +166,15 @@ func (gen *AssetGenerator) generateDeployment() error { } // Add driver's MetricsPort to the metrics Service and ServiceMonitor. -func (gen *AssetGenerator) generateDriverMetricsService(serviceYAML, serviceMonitorYAML *YAMLWithHistory, metricsPort *MetricsPort, servicePrefix string) error { - if metricsPort == nil { +func (gen *AssetGenerator) generateDriverMetricsService(serviceYAML, serviceMonitorYAML *YAMLWithHistory, localMetricsPort, exposedMetricsPort uint16, servicePrefix string) error { + if localMetricsPort == 0 { return nil } extraReplacements := []string{ - "${EXPOSED_METRICS_PORT}", strconv.Itoa(int(metricsPort.ExposedPort)), - "${LOCAL_METRICS_PORT}", strconv.Itoa(int(metricsPort.LocalPort)), - "${PORT_NAME}", metricsPort.Name, + "${LOCAL_METRICS_PORT}", strconv.Itoa(int(localMetricsPort)), + "${EXPOSED_METRICS_PORT}", strconv.Itoa(int(exposedMetricsPort)), + "${PORT_NAME}", "driver-m", "${SERVICE_PREFIX}", servicePrefix, } var err error @@ -232,7 +228,7 @@ func (gen *AssetGenerator) generateControllerMonitoringService() error { if err := gen.generateSidecarMetricsServices(serviceYAML, serviceMonitorYAML, int(ctrlCfg.SidecarLocalMetricsPortStart), int(ctrlCfg.SidecarExposedMetricsPortStart), ctrlCfg.Sidecars, "controller"); err != nil { return err } - if err := gen.generateDriverMetricsService(serviceYAML, serviceMonitorYAML, ctrlCfg.MetricsPort, "controller"); err != nil { + if err := gen.generateDriverMetricsService(serviceYAML, serviceMonitorYAML, ctrlCfg.LocalMetricsPort, ctrlCfg.ExposedMetricsPort, "controller"); err != nil { return err } @@ -292,7 +288,7 @@ func (gen *AssetGenerator) generateDaemonSet() error { return err } - err = gen.addDriverRBACProxyContainers(dsYAML, "common/sidecars/node_driver_kube_rbac_proxy.yaml", cfg.MetricsPort, extraReplacements) + err = gen.addDriverRBACProxyContainers(dsYAML, "common/sidecars/node_driver_kube_rbac_proxy.yaml", cfg.LocalMetricsPort, cfg.ExposedMetricsPort, extraReplacements) if err != nil { return err } @@ -311,7 +307,7 @@ func (gen *AssetGenerator) generateDaemonSet() error { func (gen *AssetGenerator) generateGuestMonitoringService() error { cfg := gen.operatorConfig.GuestConfig - if cfg.MetricsPort == nil { + if cfg.LocalMetricsPort == 0 { // Do not add metrics service if driver does not expose any metrics. // There is no node-level sidecar that would export one. return nil @@ -319,7 +315,7 @@ func (gen *AssetGenerator) generateGuestMonitoringService() error { serviceYAML := gen.mustReadBaseAsset("base/node_metrics_service.yaml", nil) serviceMonitorYAML := gen.mustReadBaseAsset("base/node_metrics_servicemonitor.yaml", nil) - err := gen.generateDriverMetricsService(serviceYAML, serviceMonitorYAML, cfg.MetricsPort, "node") + err := gen.generateDriverMetricsService(serviceYAML, serviceMonitorYAML, cfg.LocalMetricsPort, cfg.ExposedMetricsPort, "node") if err != nil { return err } diff --git a/pkg/generator/types.go b/pkg/generator/types.go index 38910b03d..d23598abf 100644 --- a/pkg/generator/types.go +++ b/pkg/generator/types.go @@ -55,14 +55,15 @@ type ControlPlaneConfig struct { // The Deployment will be available as "controller.yaml" in the generated assets and can be patched // by DeploymentTemplateAssetName string - // Metric port exposed by the driver itself. - // Sidecar metrics ports are not included here, they will be added dynamically from sidecar config below. - MetricsPort *MetricsPort + // Metrics TCP port exposed by the driver itself on loopback interface. + LocalMetricsPort uint16 + // Metrics TCP port number that should be exposed by kube-rbac-proxy on the container interface. + ExposedMetricsPort uint16 // Liveness probe TCP port number exposed by the driver itself, i.e. by DeploymentTemplateAssetName. // It will be injected to liveness probe sidecar automatically. LivenessProbePort uint16 - // Start of TCP port number range to be used by sidecar to expose metrics on loopback interface. + // Start of TCP port number range to be used by sidecars to expose metrics on loopback interface. // The generator will allocate a port for each sidecar and add kube-rbac-proxy in front of it. SidecarLocalMetricsPortStart uint16 // Start of TCP port number range to be used by sidecar to expose metrics via kube-rbac-proxy on the container @@ -79,18 +80,6 @@ type ControlPlaneConfig struct { AssetPatches AssetPatches } -// Configuration of metric ports exposed by the CSI driver itself. -type MetricsPort struct { - // TCP port number exposed by the driver itself on loopback interface. - LocalPort uint16 - // TCP port number that should be exposed by kube-rbac-proxy on the container interface. - ExposedPort uint16 - // Name of the port. It is used in metrics Service and ServiceMonitor. - Name string - // If true, kube-rbac-proxy will be injected in front of the LocalPort by the generator, exposing ExposedPort. - InjectKubeRBACProxy bool -} - // Configuration of a single CSI sidecar. It usually contains also kube-rbac-proxy sidecar. type SidecarConfig struct { // Name of the template asset that contains strategic merge patch with Deployment of the sidecar. @@ -114,8 +103,10 @@ type SidecarConfig struct { type GuestConfig struct { // Name of the template asset that contains DaemonSet of the guest components. DaemonSetTemplateAssetName string - // Metric ports exposed by the driver itself. - MetricsPort *MetricsPort + // Metrics TCP port exposed by the driver itself on loopback interface. + LocalMetricsPort uint16 + // Metrics TCP port number that should be exposed by kube-rbac-proxy on the container interface. + ExposedMetricsPort uint16 // Liveness probe TCP port number exposed by the driver itself, i.e. by DaemonSetTemplateAssetName. LivenessProbePort uint16 // port where node-registrar will expose health check endpoint From a4dcd7d04ad6988d58492f6c9f7becf510b8c57d Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 15 Apr 2025 10:13:03 +0100 Subject: [PATCH 3/4] generator: Start templating driver metrics port Signed-off-by: Stephen Finucane --- .../aws-ebs/patches/controller_add_driver.yaml | 2 +- .../patches/controller_add_driver.yaml | 2 +- .../azure-disk/patches/node_add_driver.yaml | 2 +- .../patches/controller_add_driver.yaml | 2 +- .../patches/controller_add_driver.yaml | 18 ++++++++---------- .../samba/patches/controller_add_driver.yaml | 2 +- .../aws_ebs_controller_hypershift.yaml | 2 +- pkg/generator/asset_generator.go | 13 +++++++++++-- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/assets/overlays/aws-ebs/patches/controller_add_driver.yaml b/assets/overlays/aws-ebs/patches/controller_add_driver.yaml index dabacd837..bded5fad5 100644 --- a/assets/overlays/aws-ebs/patches/controller_add_driver.yaml +++ b/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: diff --git a/assets/overlays/azure-disk/patches/controller_add_driver.yaml b/assets/overlays/azure-disk/patches/controller_add_driver.yaml index 7516c6997..a78e33f3d 100644 --- a/assets/overlays/azure-disk/patches/controller_add_driver.yaml +++ b/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="" diff --git a/assets/overlays/azure-disk/patches/node_add_driver.yaml b/assets/overlays/azure-disk/patches/node_add_driver.yaml index 943d06db1..48dcf835f 100644 --- a/assets/overlays/azure-disk/patches/node_add_driver.yaml +++ b/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="" diff --git a/assets/overlays/azure-file/patches/controller_add_driver.yaml b/assets/overlays/azure-file/patches/controller_add_driver.yaml index 0d3984c19..db133c4a2 100644 --- a/assets/overlays/azure-file/patches/controller_add_driver.yaml +++ b/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="" diff --git a/assets/overlays/openstack-cinder/patches/controller_add_driver.yaml b/assets/overlays/openstack-cinder/patches/controller_add_driver.yaml index 7eb641502..a0bdcaa90 100644 --- a/assets/overlays/openstack-cinder/patches/controller_add_driver.yaml +++ b/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 diff --git a/assets/overlays/samba/patches/controller_add_driver.yaml b/assets/overlays/samba/patches/controller_add_driver.yaml index 1ce09ce17..8de5f0756 100644 --- a/assets/overlays/samba/patches/controller_add_driver.yaml +++ b/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 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 9cd693a7b..33317ecda 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 @@ -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} diff --git a/pkg/generator/asset_generator.go b/pkg/generator/asset_generator.go index e1c7b761a..1f6eb4b1d 100644 --- a/pkg/generator/asset_generator.go +++ b/pkg/generator/asset_generator.go @@ -126,7 +126,12 @@ func (gen *AssetGenerator) generateDeployment() error { deploymentYAML := gen.mustReadBaseAsset("base/controller.yaml", nil) var err error - err = gen.applyAssetPatch(deploymentYAML, ctrlCfg.DeploymentTemplateAssetName, nil) + extraReplacements := []string{} + if ctrlCfg.LocalMetricsPort != 0 { + extraReplacements = append(extraReplacements, "${DRIVER_METRICS_PORT}", strconv.Itoa(int(ctrlCfg.LocalMetricsPort))) + } + + err = gen.applyAssetPatch(deploymentYAML, ctrlCfg.DeploymentTemplateAssetName, extraReplacements) if err != nil { return err } @@ -165,7 +170,7 @@ func (gen *AssetGenerator) generateDeployment() error { return nil } -// Add driver's MetricsPort to the metrics Service and ServiceMonitor. +// Add driver's metrics port to the metrics Service and ServiceMonitor. func (gen *AssetGenerator) generateDriverMetricsService(serviceYAML, serviceMonitorYAML *YAMLWithHistory, localMetricsPort, exposedMetricsPort uint16, servicePrefix string) error { if localMetricsPort == 0 { return nil @@ -283,6 +288,10 @@ func (gen *AssetGenerator) generateDaemonSet() error { extraReplacements = append(extraReplacements, "${NODE_DRIVER_REGISTRAR_HEALTH_PORT}", strconv.Itoa(int(cfg.NodeRegistrarHealthCheckPort))) } + if cfg.LocalMetricsPort != 0 { + extraReplacements = append(extraReplacements, "${DRIVER_METRICS_PORT}", strconv.Itoa(int(cfg.LocalMetricsPort))) + } + err = gen.applyAssetPatch(dsYAML, cfg.DaemonSetTemplateAssetName, extraReplacements) if err != nil { return err From 6764a2caa8524a521295fe0aaa582007b087c37f Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 15 Apr 2025 14:49:39 +0100 Subject: [PATCH 4/4] assets: Change name of driver metrics sidecar 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 --- 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 13268e062..8ad161911 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 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 index 06fd6011a..2b6f90d18 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 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 index 6108b7d9c..e7beec9b6 100644 --- 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 index f2808d75c..a642e1122 100644 --- 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 index 9d3aaf3df..cfd774174 100644 --- 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 index 7c70bcd69..6f0e51793 100644 --- 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 index 1d44c8c41..2ba420a43 100644 --- 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 index 7c70bcd69..6f0e51793 100644 --- 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 index 5da02b8a8..a1cf7f0c7 100644 --- 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 index 63c9cb98c..c6bbb4d5c 100644 --- 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 index 2c9338b2d..5d49f278b 100644 --- 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 index 19c739816..05cffa9f2 100644 --- 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 index 17dd27a06..e7b170010 100644 --- 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 index d0104efec..9684a95fd 100644 --- 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 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