Add configure-cloud-routes flag and related values and functions (#234

)

- Add `--configure-cloud-routes` flag to the `cloud-controller-manager.yaml` file
- Set `configureCloudRoutes` value to `false` in the `values.yaml` file
- Add `isOverlayEnabled` function to the `valuesprovider.go` file
- Add `networkProviderConfig` and `networkProviderConfigData` variables to the `valuesprovider_test.go` file

Signed-off-by: Andreas Fritzler <andreas.fritzler@sap.com>

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

@@ -45,6 +45,7 @@ spec:
             - --cluster-cidr={{ .Values.podNetwork }}
             - --cluster-name={{ .Values.clusterName }}
             - --concurrent-service-syncs=10
+            - --configure-cloud-routes={{ .Values.configureCloudRoutes }}
         {{- include "cloud-controller-manager.featureGates" . | trimSuffix "," | indent 8 }}
             - --kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig
             - --authentication-kubeconfig=/var/run/secrets/gardener.cloud/shoot/generic-kubeconfig/kubeconfig
@@ -115,4 +116,4 @@ spec:
             name: cloud-provider-config
         - name: cloudprovider
           secret:
-            secretName: cloudprovider
+            secretName: cloudprovider

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

@@ -10,7 +10,7 @@ images:
   cloud-controller-manager: image-repository:image-tag
 resources:
   requests:
-    cpu: 100m 
+    cpu: 100m
     memory: 75Mi
   limits:
     memory: 400Mi
@@ -22,3 +22,5 @@ vpa:
     maxAllowed:
       cpu: 4
       memory: 10G
+
+configureCloudRoutes: false

pkg/controller/controlplane/valuesprovider.go

@@ -20,6 +20,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+
 	"github.com/Masterminds/semver"
 	extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
 	"github.com/gardener/gardener/extensions/pkg/controller/common"
@@ -320,7 +324,6 @@ func (vp *valuesProvider) GetStorageClassesChartValues(
 }
 
 func isExpandable(ctx context.Context, onmetalClient client.Client, namespace, volumeClassName string) (bool, error) {
-
 	volumeClass := &storagev1alpha1.VolumeClass{}
 	if err := onmetalClient.Get(ctx, client.ObjectKey{Namespace: namespace, Name: volumeClassName}, volumeClass); err != nil {
 		if apierrors.IsNotFound(err) {
@@ -402,9 +405,41 @@ func getCCMChartValues(
 		values["featureGates"] = cpConfig.CloudControllerManager.FeatureGates
 	}
 
+	configureCloudRoutes, err := isOverlayEnabled(cluster.Shoot.Spec.Networking)
+	if err != nil {
+		return nil, fmt.Errorf("failed to determine if overlay is enabled: %w", err)
+	}
+	values["configureCloudRoutes"] = configureCloudRoutes
+
 	return values, nil
 }
 
+func isOverlayEnabled(networking *gardencorev1beta1.Networking) (bool, error) {
+	if networking == nil {
+		return false, nil
+	}
+
+	obj, err := runtime.Decode(unstructured.UnstructuredJSONScheme, networking.ProviderConfig.Raw)
+	if err != nil {
+		return false, err
+	}
+
+	u, ok := obj.(*unstructured.Unstructured)
+	if !ok {
+		return false, fmt.Errorf("object %T is not an unstructured.Unstructured", obj)
+	}
+
+	enabled, ok, err := unstructured.NestedBool(u.UnstructuredContent(), "overlay", "enabled")
+	if err != nil {
+		return false, err
+	}
+	if !ok {
+		return false, nil
+	}
+
+	return enabled, nil
+}
+
 // getCSIControllerChartValues collects and returns the CSIController chart values.
 func getCSIControllerChartValues(
 	_ *apisonmetal.ControlPlaneConfig,
@@ -421,9 +456,7 @@ func getCSIControllerChartValues(
 }
 
 // getControlPlaneShootChartValues collects and returns the control plane shoot chart values.
-func (vp *valuesProvider) getControlPlaneShootChartValues(
-	cluster *extensionscontroller.Cluster,
-) (map[string]interface{}, error) {
+func (vp *valuesProvider) getControlPlaneShootChartValues(cluster *extensionscontroller.Cluster) (map[string]interface{}, error) {
 	if cluster.Shoot == nil {
 		return nil, fmt.Errorf("cluster %s does not contain a shoot object", cluster.ObjectMeta.Name)
 	}

pkg/controller/controlplane/valuesprovider_test.go

@@ -18,6 +18,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 	"github.com/gardener/gardener/extensions/pkg/controller"
 	gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
@@ -430,6 +432,15 @@ var _ = Describe("Valueprovider Reconcile", func() {
 			}
 			providerCloudProfileJson, err := json.Marshal(providerCloudProfile)
 			Expect(err).NotTo(HaveOccurred())
+			networkProviderConfig := &unstructured.Unstructured{Object: map[string]any{
+				"kind":       "FooNetworkConfig",
+				"apiVersion": "v1alpha1",
+				"overlay": map[string]any{
+					"enabled": true,
+				},
+			}}
+			networkProviderConfigData, err := runtime.Encode(unstructured.UnstructuredJSONScheme, networkProviderConfig)
+			Expect(err).NotTo(HaveOccurred())
 			cluster := &controller.Cluster{
 				CloudProfile: &gardencorev1beta1.CloudProfile{
 					Spec: gardencorev1beta1.CloudProfileSpec{
@@ -445,7 +456,8 @@ var _ = Describe("Valueprovider Reconcile", func() {
 					},
 					Spec: gardencorev1beta1.ShootSpec{
 						Networking: &gardencorev1beta1.Networking{
-							Pods: pointer.String("10.0.0.0/16"),
+							ProviderConfig: &runtime.RawExtension{Raw: networkProviderConfigData},
+							Pods:           pointer.String("10.0.0.0/16"),
 						},
 						Kubernetes: gardencorev1beta1.Kubernetes{
 							Version: "1.26.0",
@@ -493,7 +505,8 @@ var _ = Describe("Valueprovider Reconcile", func() {
 					"featureGates": map[string]bool{
 						"CustomResourceValidation": true,
 					},
-					"podNetwork": "10.0.0.0/16",
+					"podNetwork":           "10.0.0.0/16",
+					"configureCloudRoutes": true,
 				},
 				"csi-driver-controller": map[string]interface{}{
 					"enabled":  true,