Implement AliasPrefix controller

apis/networking/aliasprefix_type.go

@@ -29,7 +29,7 @@ type AliasPrefixSpec struct {
 	// NetworkInterfaceSelector defines the NetworkInterfaces
 	// for which this AliasPrefix should be applied
 	NetworkInterfaceSelector *metav1.LabelSelector
-	// Prefix is the provided Prefix or EphemeralPrefix which
+	// Prefix is the provided Prefix or Ephemeral which
 	// should be used by this AliasPrefix
 	Prefix PrefixSource
 }
@@ -39,7 +39,7 @@ type PrefixSource struct {
 	// Value is a single IPPrefix value as defined in the AliasPrefix
 	Value *commonv1alpha1.IPPrefix
 	// EphemeralPrefix defines the Prefix which should be allocated by the AliasPrefix
-	EphemeralPrefix *EphemeralPrefixSource
+	Ephemeral *EphemeralPrefixSource
 }
 
 // AliasPrefixStatus defines the observed state of AliasPrefix

apis/networking/aliasprefixrouting_type.go

@@ -18,18 +18,9 @@ package networking
 
 import (
 	commonv1alpha1 "github.com/onmetal/onmetal-api/apis/common/v1alpha1"
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// AliasPrefixSubset is one of the targets of a AliasPrefixRouting
-type AliasPrefixSubset struct {
-	// MachinePoolRef is the machine pool hosting the targeted entities.
-	MachinePoolRef commonv1alpha1.LocalUIDReference
-	// Targets are the entities targeted by the alias prefix routing.
-	Targets []commonv1alpha1.LocalUIDReference
-}
-
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
@@ -38,10 +29,8 @@ type AliasPrefixRouting struct {
 	metav1.TypeMeta
 	metav1.ObjectMeta
 
-	// NetworkRef is the Network this AliasPrefixRouting should belong to
-	NetworkRef corev1.LocalObjectReference
-	// Subsets are the subsets that make up an AliasPrefixRouting
-	Subsets []AliasPrefixSubset
+	// Destinations are the destinations for an AliasPrefix.
+	Destinations []commonv1alpha1.LocalUIDReference
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

apis/networking/v1alpha1/aliasprefix_type.go

@@ -29,7 +29,7 @@ type AliasPrefixSpec struct {
 	// NetworkInterfaceSelector defines the NetworkInterfaces
 	// for which this AliasPrefix should be applied
 	NetworkInterfaceSelector *metav1.LabelSelector `json:"networkInterfaceSelector,omitempty"`
-	// Prefix is the provided Prefix or EphemeralPrefix which
+	// Prefix is the provided Prefix or Ephemeral which
 	// should be used by this AliasPrefix
 	Prefix PrefixSource `json:"prefix,omitempty"`
 }
@@ -38,8 +38,8 @@ type AliasPrefixSpec struct {
 type PrefixSource struct {
 	// Value is a single IPPrefix value as defined in the AliasPrefix
 	Value *commonv1alpha1.IPPrefix `json:"value,omitempty"`
-	// EphemeralPrefix defines the Prefix which should be allocated by the AliasPrefix
-	EphemeralPrefix *EphemeralPrefixSource `json:"ephemeralPrefix,omitempty"`
+	// Ephemeral defines the Prefix which should be allocated by the AliasPrefix
+	Ephemeral *EphemeralPrefixSource `json:"ephemeral,omitempty"`
 }
 
 // AliasPrefixStatus defines the observed state of AliasPrefix

apis/networking/v1alpha1/aliasprefixrouting_type.go

@@ -18,18 +18,9 @@ package v1alpha1
 
 import (
 	commonv1alpha1 "github.com/onmetal/onmetal-api/apis/common/v1alpha1"
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// AliasPrefixRoutingSubset is one of the targets of a AliasPrefixRouting
-type AliasPrefixRoutingSubset struct {
-	// MachinePoolRef is the machine pool hosting the targeted entities.
-	MachinePoolRef commonv1alpha1.LocalUIDReference `json:"machinePoolRef"`
-	// Targets are the entities targeted by the alias prefix routing.
-	Targets []commonv1alpha1.LocalUIDReference `json:"targets"`
-}
-
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
@@ -38,10 +29,8 @@ type AliasPrefixRouting struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	// NetworkRef is the Network this AliasPrefixRouting should belong to
-	NetworkRef corev1.LocalObjectReference `json:"networkRef"`
-	// Subsets are the subsets that make up an AliasPrefixRouting
-	Subsets []AliasPrefixRoutingSubset `json:"subsets,omitempty"`
+	// Destinations are the destinations for an AliasPrefix.
+	Destinations []commonv1alpha1.LocalUIDReference `json:"destinations"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

apis/networking/validation/aliasprefix.go

@@ -58,12 +58,12 @@ func validateAliasPrefixSpec(spec *networking.AliasPrefixSpec, fldPath *field.Pa
 func validateAliasPrefixSources(prefixSource networking.PrefixSource, fldPath *field.Path) field.ErrorList {
 	var allErrs field.ErrorList
 
-	if prefixSource.EphemeralPrefix != nil && prefixSource.Value != nil {
-		allErrs = append(allErrs, field.Forbidden(fldPath, "only ephemeralPrefix or value should be provided"))
+	if prefixSource.Ephemeral != nil && prefixSource.Value != nil {
+		allErrs = append(allErrs, field.Forbidden(fldPath, "only ephemeral or value should be provided"))
 	}
 
-	if ephemeralPrefix := prefixSource.EphemeralPrefix; ephemeralPrefix != nil {
-		allErrs = append(allErrs, validateEphemeralAliasPrefixSource(prefixSource.EphemeralPrefix, fldPath.Child("ephemeralPrefix"))...)
+	if ephemeral := prefixSource.Ephemeral; ephemeral != nil {
+		allErrs = append(allErrs, validateEphemeralAliasPrefixSource(prefixSource.Ephemeral, fldPath.Child("ephemeral"))...)
 	}
 
 	allErrs = append(allErrs, validateValuePrefixSource(prefixSource.Value, fldPath.Child("prefixTemplate").Child("value"))...)
@@ -106,17 +106,17 @@ func ValidateAliasPrefixUpdate(newAliasPrefix, oldAliasPrefix *networking.AliasP
 	var allErrs field.ErrorList
 
 	allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessorUpdate(newAliasPrefix, oldAliasPrefix, field.NewPath("metadata"))...)
-	allErrs = append(allErrs, validateAliasPrefixUpdate(newAliasPrefix, oldAliasPrefix, field.NewPath("spec"))...)
+	allErrs = append(allErrs, validateAliasSpecPrefixUpdate(&newAliasPrefix.Spec, &oldAliasPrefix.Spec, field.NewPath("spec"))...)
 	allErrs = append(allErrs, ValidateAliasPrefix(newAliasPrefix)...)
 
 	return allErrs
 }
 
-// validateAliasPrefixUpdate validates the spec of a aliasPrefix object before an update.
-func validateAliasPrefixUpdate(new, old *networking.AliasPrefix, fldPath *field.Path) field.ErrorList {
+// validateAliasSpecPrefixUpdate validates the spec of a aliasPrefix object before an update.
+func validateAliasSpecPrefixUpdate(newSpec, oldSpec *networking.AliasPrefixSpec, fldPath *field.Path) field.ErrorList {
 	var allErrs field.ErrorList
 
-	allErrs = append(allErrs, onmetalapivalidation.ValidateImmutableField(new, old, fldPath.Child("networkRef"))...)
+	allErrs = append(allErrs, onmetalapivalidation.ValidateImmutableField(newSpec.NetworkRef, oldSpec.NetworkRef, fldPath.Child("networkRef"))...)
 
 	return allErrs
 }

apis/networking/validation/aliasprefix_test.go

@@ -62,18 +62,18 @@ var _ = Describe("AliasPrefix", func() {
 			&networking.AliasPrefix{
 				Spec: networking.AliasPrefixSpec{
 					Prefix: networking.PrefixSource{
-						EphemeralPrefix: &networking.EphemeralPrefixSource{},
+						Ephemeral: &networking.EphemeralPrefixSource{},
 					},
 				},
 			},
-			ContainElement(RequiredField("spec.prefix.ephemeralPrefix.prefixTemplate")),
+			ContainElement(RequiredField("spec.prefix.ephemeral.prefixTemplate")),
 		),
 		Entry("ephemeral prefix and value are provided",
 			&networking.AliasPrefix{
 				Spec: networking.AliasPrefixSpec{
 					Prefix: networking.PrefixSource{
-						EphemeralPrefix: &networking.EphemeralPrefixSource{},
-						Value:           v1alpha1.PtrToIPPrefix(v1alpha1.MustParseIPPrefix("10.0.0.0/24")),
+						Ephemeral: &networking.EphemeralPrefixSource{},
+						Value:     v1alpha1.PtrToIPPrefix(v1alpha1.MustParseIPPrefix("10.0.0.0/24")),
 					},
 				},
 			},

apis/networking/validation/aliasprefixrouting.go

@@ -17,9 +17,7 @@
 package validation
 
 import (
-	onmetalapivalidation "github.com/onmetal/onmetal-api/api/validation"
 	"github.com/onmetal/onmetal-api/apis/networking"
-	corev1 "k8s.io/api/core/v1"
 	apivalidation "k8s.io/apimachinery/pkg/api/validation"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -31,75 +29,23 @@ func ValidateAliasPrefixRouting(aliasPrefixRouting *networking.AliasPrefixRoutin
 
 	allErrs = append(allErrs, apivalidation.ValidateObjectMetaAccessor(aliasPrefixRouting, true, apivalidation.NameIsDNSLabel, field.NewPath("metadata"))...)
 	allErrs = append(allErrs, validateAliasPrefixRouting(aliasPrefixRouting)...)
-	allErrs = append(allErrs, validateAliasPrefixRoutingSubsets(aliasPrefixRouting, field.NewPath("subsets"))...)
 
 	return allErrs
 }
 
 func validateAliasPrefixRouting(aliasPrefixRouting *networking.AliasPrefixRouting) field.ErrorList {
 	var allErrs field.ErrorList
 
-	if aliasPrefixRouting.NetworkRef == (corev1.LocalObjectReference{}) {
-		allErrs = append(allErrs, field.Required(field.NewPath("networkRef"), "must specify a network ref"))
-	} else {
-		for _, msg := range apivalidation.NameIsDNSLabel(aliasPrefixRouting.NetworkRef.Name, false) {
-			allErrs = append(allErrs, field.Invalid(field.NewPath("networkRef").Child("name"), aliasPrefixRouting.NetworkRef.Name, msg))
-		}
-	}
-
-	return allErrs
-}
-
-func validateAliasPrefixRoutingSubsets(aliasPrefixRouting *networking.AliasPrefixRouting, fldPath *field.Path) field.ErrorList {
-	var allErrs field.ErrorList
-
-	seenPoolNames := sets.NewString()
-	for idx := range aliasPrefixRouting.Subsets {
-		subset := &aliasPrefixRouting.Subsets[idx]
-
-		allErrs = append(allErrs, validateAliasPrefixRoutingSubset(subset, fldPath.Index(idx))...)
-
-		if seenPoolNames.Has(subset.MachinePoolRef.Name) {
-			allErrs = append(allErrs, field.Duplicate(fldPath.Index(idx), subset))
+	seenNames := sets.NewString()
+	for idx := range aliasPrefixRouting.Destinations {
+		destination := &aliasPrefixRouting.Destinations[idx]
+		destinationPath := field.NewPath("destinations").Index(idx)
+		if seenNames.Has(destination.Name) {
+			allErrs = append(allErrs, field.Duplicate(destinationPath, destination))
 		} else {
-			seenPoolNames.Insert(subset.MachinePoolRef.Name)
-		}
-	}
-
-	return allErrs
-}
-
-func validateAliasPrefixRoutingSubset(subset *networking.AliasPrefixSubset, fldPath *field.Path) field.ErrorList {
-	var allErrs field.ErrorList
-
-	if subset.MachinePoolRef.Name == "" {
-		allErrs = append(allErrs, field.Required(fldPath.Child("machinePoolRef", "name"), "must specify machine pool ref name"))
-	} else {
-		for _, msg := range apivalidation.NameIsDNSLabel(subset.MachinePoolRef.Name, false) {
-			allErrs = append(allErrs, field.Invalid(fldPath.Child("machinePoolRef", "name"), subset.MachinePoolRef.Name, msg))
-		}
-	}
-
-	seenTargetNames := sets.NewString()
-	targetsPath := fldPath.Child("targets")
-	if len(subset.Targets) == 0 {
-		allErrs = append(allErrs, field.Required(targetsPath, "must specify at least 1 target"))
-	} else {
-		for i := range subset.Targets {
-			target := &subset.Targets[i]
-			targetPath := targetsPath.Index(i)
-			if target.Name == "" {
-				allErrs = append(allErrs, field.Required(targetPath.Child("name"), "must specify network interface ref name"))
-			} else {
-				for _, msg := range apivalidation.NameIsDNSLabel(target.Name, false) {
-					allErrs = append(allErrs, field.Invalid(targetPath.Child("name"), target.Name, msg))
-				}
-
-				if seenTargetNames.Has(target.Name) {
-					allErrs = append(allErrs, field.Duplicate(targetPath, target))
-				} else {
-					seenTargetNames.Insert(target.Name)
-				}
+			seenNames.Insert(destination.Name)
+			for _, msg := range apivalidation.NameIsDNSLabel(destination.Name, false) {
+				allErrs = append(allErrs, field.Invalid(destinationPath.Child("name"), destination.Name, msg))
 			}
 		}
 	}
@@ -122,7 +68,5 @@ func ValidateAliasPrefixRoutingUpdate(newAliasPrefixRouting, oldAliasPrefixRouti
 func validateAliasPrefixRoutingUpdate(new, old *networking.AliasPrefixRouting) field.ErrorList {
 	var allErrs field.ErrorList
 
-	allErrs = append(allErrs, onmetalapivalidation.ValidateImmutableField(new, old, field.NewPath("networkRef"))...)
-
 	return allErrs
 }