diff --git a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/configmap.yaml b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/configmap.yaml index f1543e5b..f9ff98b2 100644 --- a/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/configmap.yaml +++ b/charts/internal/seed-controlplane/charts/stackit-blockstorage-csi-driver/templates/configmap.yaml @@ -6,7 +6,10 @@ metadata: data: cloud.yaml: |- global: + {{- if .Values.stackitEndpoints.iaasUrl }} + apiEndpoints: + iaasApi: {{ .Values.stackitEndpoints.iaasUrl }} + {{- end }} projectId: "{{ .Values.projectID }}" - iaasApi: "{{ .Values.stackitEndpoints.iaasUrl }}" blockStorage: rescanOnResize: true diff --git a/charts/internal/seed-controlplane/charts/stackit-cloud-controller-manager/templates/configmap.yaml b/charts/internal/seed-controlplane/charts/stackit-cloud-controller-manager/templates/configmap.yaml index f54cb61b..b636f9fb 100644 --- a/charts/internal/seed-controlplane/charts/stackit-cloud-controller-manager/templates/configmap.yaml +++ b/charts/internal/seed-controlplane/charts/stackit-cloud-controller-manager/templates/configmap.yaml @@ -8,12 +8,16 @@ data: global: projectId: {{ .Values.config.stackitProjectID }} region: {{ .Values.config.stackitRegion }} - {{- if .Values.config.iaasApiUrl }} - instances: - api: {{ .Values.config.iaasApiUrl }} - {{- end }} + {{- if or .Values.config.iaasApiUrl .Values.config.loadBalancerApiUrl }} + apiEndpoints: + {{- if .Values.config.iaasApiUrl }} + iaasApi: {{ .Values.config.iaasApiUrl }} + {{- end }} + {{- if .Values.config.loadBalancerApiUrl }} + loadBalancerApi: {{ .Values.config.loadBalancerApiUrl }} + {{- end }} + {{- end }} loadBalancer: - api: {{ .Values.config.loadBalancerApiUrl }} networkId: {{ .Values.config.stackitNetworkID }} {{- if .Values.config.extraLabels }} extraLabels: diff --git a/imagevector/images.yaml b/imagevector/images.yaml index 4e62d4a7..ac1212a6 100644 --- a/imagevector/images.yaml +++ b/imagevector/images.yaml @@ -24,22 +24,22 @@ images: - name: stackit-cloud-controller-manager sourceRepository: https://github.com/stackitcloud/cloud-provider-stackit repository: ghcr.io/stackitcloud/cloud-provider-stackit/cloud-controller-manager - tag: "v1.32.14" + tag: "v1.32.15" targetVersion: "1.32.x" - name: stackit-cloud-controller-manager sourceRepository: https://github.com/stackitcloud/cloud-provider-stackit repository: ghcr.io/stackitcloud/cloud-provider-stackit/cloud-controller-manager - tag: "v1.33.13" + tag: "v1.33.14" targetVersion: "1.33.x" - name: stackit-cloud-controller-manager sourceRepository: https://github.com/stackitcloud/cloud-provider-stackit repository: ghcr.io/stackitcloud/cloud-provider-stackit/cloud-controller-manager - tag: "v1.34.6" + tag: "v1.34.7" targetVersion: "1.34.x" - name: stackit-cloud-controller-manager sourceRepository: https://github.com/stackitcloud/cloud-provider-stackit repository: ghcr.io/stackitcloud/cloud-provider-stackit/cloud-controller-manager - tag: "v1.35.1" + tag: "v1.35.2" targetVersion: ">= 1.35" - name: machine-controller-manager-provider-openstack @@ -75,22 +75,22 @@ images: - name: csi-driver-stackit sourceRepository: github.com/stackitcloud/cloud-provider-stackit repository: ghcr.io/stackitcloud/cloud-provider-stackit/stackit-csi-plugin - tag: "v1.32.14" + tag: "v1.32.15" targetVersion: "1.32.x" - name: csi-driver-stackit sourceRepository: github.com/stackitcloud/cloud-provider-stackit repository: ghcr.io/stackitcloud/cloud-provider-stackit/stackit-csi-plugin - tag: "v1.33.13" + tag: "v1.33.14" targetVersion: "1.33.x" - name: csi-driver-stackit sourceRepository: github.com/stackitcloud/cloud-provider-stackit repository: ghcr.io/stackitcloud/cloud-provider-stackit/stackit-csi-plugin - tag: "v1.34.6" + tag: "v1.34.7" targetVersion: "1.34.x" - name: csi-driver-stackit sourceRepository: github.com/stackitcloud/cloud-provider-stackit repository: ghcr.io/stackitcloud/cloud-provider-stackit/stackit-csi-plugin - tag: "v1.35.1" + tag: "v1.35.2" targetVersion: ">= 1.35" - name: csi-provisioner