Fix rest issues

Makefile

@@ -7,6 +7,7 @@ ADMISSION_NAME              := admission-ironcore
 IMAGE_PREFIX                := $(REGISTRY)/extensions
 REPO_ROOT                   := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 HACK_DIR                    := $(REPO_ROOT)/hack
+VERSION                     := $(shell cat "$(REPO_ROOT)/VERSION")
 EFFECTIVE_VERSION           := $(VERSION)-$(shell git rev-parse HEAD)
 LD_FLAGS                    := "-w $(shell bash $(GARDENER_HACK_DIR)/get-build-ld-flags.sh k8s.io/component-base $(REPO_ROOT)/VERSION $(EXTENSION_PREFIX))"
 LEADER_ELECTION             := false

pkg/apis/ironcore/types_infrastructure.go

@@ -33,6 +33,6 @@ type InfrastructureStatus struct {
 	NetworkRef commonv1alpha1.LocalUIDReference
 	// NATGatewayRef is the reference to the NAT gateway used
 	NATGatewayRef commonv1alpha1.LocalUIDReference
-	// PrefixRef is the reference to the Prefix used
-	PrefixRef commonv1alpha1.LocalUIDReference
+	// PrefixRefs are the references to the Prefixes used
+	PrefixRefs []commonv1alpha1.LocalUIDReference
 }

pkg/apis/ironcore/v1alpha1/types_infrastructure.go

@@ -33,6 +33,6 @@ type InfrastructureStatus struct {
 	NetworkRef commonv1alpha1.LocalUIDReference `json:"networkRef,omitempty"`
 	// NATGatewayRef is the reference to the NAT gateway used
 	NATGatewayRef commonv1alpha1.LocalUIDReference `json:"natGatewayRef,omitempty"`
-	// PrefixRef is the reference to the Prefix used
+	// PrefixRefs are the references to the Prefixes used
 	PrefixRefs []commonv1alpha1.LocalUIDReference `json:"prefixRefs,omitempty"`
 }

pkg/controller/bastion/actuator_reconcile.go

@@ -252,8 +252,9 @@ func generateMachine(namespace string, bastionConfig *controllerconfig.BastionCo
 													Spec: ipamv1alpha1.PrefixSpec{
 														// request single IP
 														PrefixLength: 32,
+														// TODO do we need to generate IPv6 bastion hosts?
 														ParentRef: &corev1.LocalObjectReference{
-															Name: infraStatus.PrefixRef.Name,
+															Name: infraStatus.PrefixRefs[0].Name,
 														},
 													},
 												},

pkg/controller/bastion/configvalidator.go

@@ -122,8 +122,10 @@ func validateInfrastructureStatus(infrastructureStatus *api.InfrastructureStatus
 		return fmt.Errorf("network ref must be not empty for infrastructure provider status")
 	}
 
-	if infrastructureStatus.PrefixRef == emptyref {
-		return fmt.Errorf("prefix ref must be not empty for infrastructure provider status")
+	for _, prefixRef := range infrastructureStatus.PrefixRefs {
+		if prefixRef == emptyref {
+			return fmt.Errorf("prefix ref must be not empty for infrastructure provider status")
+		}
 	}
 
 	return nil

pkg/controller/controlplane/valuesprovider.go

@@ -217,10 +217,14 @@ func (vp *valuesProvider) GetConfigChartValues(
 		return nil, fmt.Errorf("failed to decode infrastructure status: %w", err)
 	}
 	// Collect config chart values
+	var prefixNames []string
+	for _, prefix := range infrastructureStatus.PrefixRefs {
+		prefixNames = append(prefixNames, prefix.Name)
+	}
 	return map[string]interface{}{
-		ironcore.NetworkFieldName: infrastructureStatus.NetworkRef.Name,
-		ironcore.PrefixFieldName:  infrastructureStatus.PrefixRef.Name,
-		ironcore.ClusterFieldName: cluster.ObjectMeta.Name,
+		ironcore.NetworkFieldName:  infrastructureStatus.NetworkRef.Name,
+		ironcore.PrefixesFieldName: prefixNames,
+		ironcore.ClusterFieldName:  cluster.ObjectMeta.Name,
 	}, nil
 }
 

pkg/controller/worker/machines.go

@@ -144,7 +144,7 @@ func (w *workerDelegate) generateMachineClassAndSecrets(ctx context.Context) ([]
 				prefixNames = append(prefixNames, prefix.Name)
 			}
 			machineClassProviderSpec[ironcore.NetworkFieldName] = infrastructureStatus.NetworkRef.Name
-			machineClassProviderSpec[ironcore.PrefixFieldName] = prefixNames
+			machineClassProviderSpec[ironcore.PrefixesFieldName] = prefixNames
 			machineClassProviderSpec[ironcore.LabelsFieldName] = map[string]string{
 				ironcore.ClusterNameLabel: w.cluster.ObjectMeta.Name,
 			}

pkg/ironcore/types.go

@@ -50,8 +50,8 @@ const (
 	TokenFieldName = "token"
 	// NetworkFieldName is the name of network field
 	NetworkFieldName = "networkName"
-	// PrefixFieldName is the name of the prefix field
-	PrefixFieldName = "prefixNames"
+	// PrefixesFieldName is the name of the prefix field
+	PrefixesFieldName = "prefixNames"
 	// ClusterFieldName is the name of the cluster field
 	ClusterFieldName = "clusterName"
 	// LabelsFieldName is the name of the labels field

pkg/webhook/controlplane/ensurer.go

@@ -16,7 +16,6 @@ import (
 	"github.com/go-logr/logr"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 	vpaautoscalingv1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
 	kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
 
@@ -77,24 +76,13 @@ func (e *ensurer) EnsureMachineControllerManagerDeployment(_ context.Context, _
 
 // EnsureMachineControllerManagerVPA ensures that the machine-controller-manager VPA conforms to the provider requirements.
 func (e *ensurer) EnsureMachineControllerManagerVPA(_ context.Context, _ extensionscontextwebhook.GardenContext, newObj, _ *vpaautoscalingv1.VerticalPodAutoscaler) error {
-	var (
-		minAllowed = corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse("30m"),
-			corev1.ResourceMemory: resource.MustParse("64Mi"),
-		}
-		maxAllowed = corev1.ResourceList{
-			corev1.ResourceCPU:    resource.MustParse("2"),
-			corev1.ResourceMemory: resource.MustParse("5G"),
-		}
-	)
-
 	if newObj.Spec.ResourcePolicy == nil {
 		newObj.Spec.ResourcePolicy = &vpaautoscalingv1.PodResourcePolicy{}
 	}
 
 	newObj.Spec.ResourcePolicy.ContainerPolicies = extensionswebhook.EnsureVPAContainerResourcePolicyWithName(
 		newObj.Spec.ResourcePolicy.ContainerPolicies,
-		machinecontrollermanager.ProviderSidecarVPAContainerPolicy(ironcore.ProviderName, minAllowed, maxAllowed),
+		machinecontrollermanager.ProviderSidecarVPAContainerPolicy(ironcore.ProviderName),
 	)
 	return nil
 }