Set --service-cluster-ip-range= to CCM based on actual network status…

… and config Signed-off-by: Artiom Diomin <artiom.diomin@sap.com>
gardener · Nov 5, 2024 · a4564cd · a4564cd
1 parent 430461e
commit a4564cd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/...seed-controlplane/charts/cloud-controller-manager/templates/cloud-controller-manager.yaml b/...seed-controlplane/charts/cloud-controller-manager/templates/cloud-controller-manager.yaml
@@ -42,8 +42,8 @@ spec:
         - --allocate-node-cidrs=true
         - --cloud-provider=gce
         - --cloud-config=/etc/kubernetes/cloudprovider/cloudprovider.conf
-        - --service-cluster-ip-range=10.96.0.0/12,fd00::/108
         - --cluster-cidr={{ .Values.podNetwork }}
+        - --service-cluster-ip-range={{ .Values.serviceNetwork }}
         - --cluster-name={{ .Values.clusterName }}
         - --cidr-allocator-type={{ .Values.allocatorType }}
         - --concurrent-service-syncs=10

diff --git a/charts/internal/seed-controlplane/charts/cloud-controller-manager/values.yaml b/charts/internal/seed-controlplane/charts/cloud-controller-manager/values.yaml
@@ -3,6 +3,7 @@ allocatorType: CloudAllocator
 clusterName: shoot-foo-bar
 kubernetesVersion: 1.27.5
 podNetwork: 192.168.0.0/16
+serviceNetwork: 10.96.0.0/12
 podAnnotations: {}
 podLabels: {}
 featureGates: {}

diff --git a/pkg/controller/controlplane/valuesprovider.go b/pkg/controller/controlplane/valuesprovider.go
@@ -414,6 +414,7 @@ func (vp *valuesProvider) getCCMChartValues(
 		"clusterName":       cp.Namespace,
 		"kubernetesVersion": cluster.Shoot.Spec.Kubernetes.Version,
 		"podNetwork":        strings.Join(extensionscontroller.GetPodNetwork(cluster), ","),
+		"serviceNetwork":    strings.Join(extensionscontroller.GetServiceNetwork(cluster), ","),
 		"podAnnotations": map[string]interface{}{
 			"checksum/secret-" + v1beta1constants.SecretNameCloudProvider: checksums[v1beta1constants.SecretNameCloudProvider],
 			"checksum/configmap-" + internal.CloudProviderConfigName:      checksums[internal.CloudProviderConfigName],