Merge pull request #337 from shiftstack/openstack-cluster-name

OCPBUGS-13680: Pass --cluster-name to OpenStack CCM

Author: openshift-merge-bot[bot]

pkg/cloud/openstack/assets/deployment.yaml

@@ -54,6 +54,8 @@ spec:
           env:
             - name: CLOUD_CONFIG
               value: /etc/openstack/config/cloud.conf
+            - name: OCP_INFRASTRUCTURE_NAME
+              value: {{ .infrastructureName }}
           command:
           - /bin/bash
           - -c
@@ -67,6 +69,7 @@ spec:
             --v=1 \
             --cloud-config=$(CLOUD_CONFIG) \
             --cloud-provider=openstack \
+            --cluster-name=$(OCP_INFRASTRUCTURE_NAME) \
             --use-service-account-credentials=true \
             --configure-cloud-routes=false \
             --bind-address=127.0.0.1 \

pkg/cloud/openstack/openstack.go

@@ -32,9 +32,10 @@ type imagesReference struct {
 }
 
 var templateValuesValidationMap = map[string]interface{}{
-	"images":            "required",
-	"cloudproviderName": "required,type(string)",
-	"featureGates":      "type(string)",
+	"images":             "required",
+	"cloudproviderName":  "required,type(string)",
+	"featureGates":       "type(string)",
+	"infrastructureName": "required,type(string)",
 }
 
 type openstackAssets struct {
@@ -48,9 +49,10 @@ func (o *openstackAssets) GetRenderedResources() []client.Object {
 
 func getTemplateValues(images *imagesReference, operatorConfig config.OperatorConfig) (common.TemplateValues, error) {
 	values := common.TemplateValues{
-		"images":            images,
-		"cloudproviderName": operatorConfig.GetPlatformNameString(),
-		"featureGates":      operatorConfig.FeatureGates,
+		"images":             images,
+		"cloudproviderName":  operatorConfig.GetPlatformNameString(),
+		"featureGates":       operatorConfig.FeatureGates,
+		"infrastructureName": operatorConfig.InfrastructureName,
 	}
 	_, err := govalidator.ValidateMap(values, templateValuesValidationMap)
 	if err != nil {

pkg/cloud/openstack/openstack_test.go

@@ -31,6 +31,7 @@ func TestResourcesRenderingSmoke(t *testing.T) {
 		}, {
 			name: "Minimal allowed config",
 			config: config.OperatorConfig{
+				InfrastructureName: "infra-name",
 				ImagesReference: config.ImagesReference{
 					CloudControllerManagerOpenStack: "CloudControllerManagerOpenstack",
 				},