Adopt apiEndpoint config in cloud-provider-stackit

Author: dergeberl

charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/configmap.yaml

@@ -7,6 +7,6 @@ data:
   cloud.yaml: |-
     global:
       projectId: "{{ .Values.projectID }}"
-      iaasApi: "{{ .Values.stackitEndpoints.iaasUrl }}"
+      apiEndpoints: {{ .Values.apiEndpoints }}
     blockStorage:
       rescanOnResize: true

charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/deployment-csi-driver-controller.yaml

@@ -57,9 +57,9 @@ spec:
           value: unix://{{ .Values.socketPath }}/csi.sock
         - name: STACKIT_SERVICE_ACCOUNT_KEY_PATH
           value: /etc/serviceaccount/serviceaccount.json
-        {{- if .Values.stackitEndpoints.tokenUrl }}
+        {{- if .Values.apiEndpoints.tokenEndpoint }}
         - name: STACKIT_TOKEN_BASEURL
-          value: {{ .Values.stackitEndpoints.tokenUrl }}
+          value: {{ .Values.apiEndpoints.tokenEndpoint }}
         {{- end }}
         - name: STACKIT_REGION
           value: {{ .Values.region }}

charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/values.yaml

@@ -19,9 +19,7 @@ region: ""
 timeout: 6m
 userAgentHeaders: []
 
-stackitEndpoints:
-  tokenUrl: ""
-  iaasUrl: ""
+apiEndpoints: []
 
 csiSnapshotController:
   replicas: 1

charts/internal/seed-controlplane/charts/stackit-cloud-controller-manager/templates/configmap.yaml

@@ -8,12 +8,8 @@ data:
     global:
       projectId: {{ .Values.config.stackitProjectID }}
       region: {{ .Values.config.stackitRegion }}
-    {{- if .Values.config.iaasApiUrl }}
-    instances:
-      api: {{ .Values.config.iaasApiUrl }}
-    {{- end }}
+      apiEndpoints: {{ .Values.config.apiEndpoints }}
     loadBalancer:
-      api: {{ .Values.config.loadBalancerApiUrl }}
       networkId: {{ .Values.config.stackitNetworkID }}
       {{- if .Values.config.extraLabels }}
       extraLabels:

charts/internal/seed-controlplane/charts/stackit-cloud-controller-manager/templates/stackit-cloud-controller-manager.yaml

@@ -61,7 +61,7 @@ spec:
           value: /etc/serviceaccount/serviceaccount.json
 {{- if .Values.config.tokenUrl }}
         - name: STACKIT_TOKEN_BASEURL
-          value: {{ .Values.config.tokenUrl }}
+          value: {{ .Values.config.apiEndpoints.tokenUrl }}
 {{- end }}
 {{- if .Values.config.loadBalancerEmergencyToken }}
         - name: STACKIT_LB_API_EMERGENCY_TOKEN

charts/internal/seed-controlplane/charts/stackit-cloud-controller-manager/values.yaml

@@ -5,9 +5,7 @@ config:
   stackitProjectID: foo
   stackitNetworkID: foo
   stackitRegion: foo
-  #loadBalancerApiUrl: foo.bar.example.com/v1
-  #iaasApiUrl: foo.bar.example.com/v1
-  #tokenUrl: foo.bar.example.com/v1
+  apiEndpoints: []
   port: 10258
   metricsPort: 9090
 podAnnotations: {}

pkg/controller/controlplane/valuesprovider.go

@@ -841,14 +841,15 @@ func getSTACKITCCMChartValues(
 	}
 
 	if apiEndpoints != nil {
+		endpoints := map[string]any{}
 		if apiEndpoints.LoadBalancer != nil {
-			ccmConfig["loadBalancerApiUrl"] = *apiEndpoints.LoadBalancer
+			endpoints["loadBalancerApi"] = *apiEndpoints.LoadBalancer
 		}
 		if apiEndpoints.IaaS != nil {
-			ccmConfig["iaasApiUrl"] = *apiEndpoints.IaaS
+			endpoints["iaasApi"] = *apiEndpoints.IaaS
 		}
 		if apiEndpoints.TokenEndpoint != nil {
-			ccmConfig["tokenUrl"] = *apiEndpoints.TokenEndpoint
+			endpoints["tokenEndpoint"] = *apiEndpoints.TokenEndpoint
 		}
 	}
 
@@ -927,10 +928,10 @@ func getCSISTACKITControllerChartValues(cluster *extensionscontroller.Cluster, c
 	endpointConfig := map[string]string{}
 	if apiEndpoints != nil {
 		if apiEndpoints.TokenEndpoint != nil {
-			endpointConfig["tokenUrl"] = *apiEndpoints.TokenEndpoint
+			endpointConfig["tokenEndpoint"] = *apiEndpoints.TokenEndpoint
 		}
 		if apiEndpoints.IaaS != nil {
-			endpointConfig["iaasUrl"] = *apiEndpoints.IaaS
+			endpointConfig["iaasApi"] = *apiEndpoints.IaaS
 		}
 	}
 
@@ -945,7 +946,7 @@ func getCSISTACKITControllerChartValues(cluster *extensionscontroller.Cluster, c
 		"csiSnapshotController": map[string]any{
 			"replicas": extensionscontroller.GetControlPlaneReplicas(cluster, scaledDown, 1),
 		},
-		"stackitEndpoints":  endpointConfig,
+		"apiEndpoints":      endpointConfig,
 		"customLabelDomain": customLabelDomain,
 	}
 	if userAgentHeaders != nil {