Add universal NetworkSelector API

Signed-off-by: Jaime Caamaño Ruiz <[email protected]>

Author: jcaamano

go-controller/hack/update-codegen.sh

@@ -27,7 +27,18 @@ if [[ "${builddir}" == /tmp/* ]]; then #paranoia
     rm -rf "${builddir}"
 fi
 
+# deepcopy for types
+deepcopy-gen \
+  --go-header-file hack/boilerplate.go.txt \
+  --output-file zz_generated.deepcopy.go \
+  --bounding-dirs github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/types \
+  github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/types
+
 for crd in ${crds}; do
+
+  # for types we already generated deepcopy above which is all we need
+  [ "$crd" = "types" ] && continue
+  
   echo "Generating deepcopy funcs for $crd"
   deepcopy-gen \
     --go-header-file hack/boilerplate.go.txt \

go-controller/pkg/crd/types/doc.go

@@ -0,0 +1,3 @@
+// Package types contains shared types accrorss API Schema definitions
+// +k8s:deepcopy-gen=package
+package types

go-controller/pkg/crd/types/networkselector.go

@@ -0,0 +1,116 @@
+package types
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// NetworkSelectors selects multiple sets of networks.
+// +kubebuilder:validation:MinItems=1
+// +kubebuilder:validation:MaxItems=5
+// +patchMergeKey=networkSelectionType
+// +patchStrategy=merge
+// +listType=map
+// +listMapKey=networkSelectionType
+type NetworkSelectors []NetworkSelector
+
+// NetworkSelector selects a set of networks.
+// +kubebuilder:validation:XValidation:rule="!has(self.networkSelectionType) ? true : has(self.clusterUserDefinedNetworkSelector) ? self.networkSelectionType == 'ClusterUserDefinedNetworks' : self.networkSelectionType != 'ClusterUserDefinedNetworks'",message="Inconsistent selector: both networkSelectionType ClusterUserDefinedNetworks and clusterUserDefinedNetworkSelector have to be set or neither"
+// +kubebuilder:validation:XValidation:rule="!has(self.networkSelectionType) ? true : has(self.primaryUserDefinedNetworkSelector) ? self.networkSelectionType == 'PrimaryUserDefinedNetworks' : self.networkSelectionType != 'PrimaryUserDefinedNetworks'",message="Inconsistent selector: both networkSelectionType PrimaryUserDefinedNetworks and primaryUserDefinedNetworkSelector have to be set or neither"
+// +kubebuilder:validation:XValidation:rule="!has(self.networkSelectionType) ? true : has(self.secondaryUserDefinedNetworkSelector) ? self.networkSelectionType == 'SecondaryUserDefinedNetworks' : self.networkSelectionType != 'SecondaryUserDefinedNetworks'",message="Inconsistent selector: both networkSelectionType SecondaryUserDefinedNetworks and secondaryUserDefinedNetworkSelector have to be set or neither"
+// +kubebuilder:validation:XValidation:rule="!has(self.networkSelectionType) ? true : has(self.networkAttachmentDefinitionSelector) ? self.networkSelectionType == 'NetworkAttachmentDefinitions' : self.networkSelectionType != 'NetworkAttachmentDefinitions'",message="Inconsistent selector: both networkSelectionType NetworkAttachmentDefinitions and networkAttachmentDefinitionSelector have to be set or neither"
+type NetworkSelector struct {
+	// networkSelectionType determines the type of networks selected.
+	// +unionDiscriminator
+	// +kubebuilder:validation:Required
+	NetworkSelectionType NetworkSelectionType `json:"networkSelectionType"`
+
+	// clusterUserDefinedNetworkSelector selects ClusterUserDefinedNetworks when
+	// NetworkSelectionType is 'ClusterUserDefinedNetworks'.
+	// +kubebuilder:validation:Optional
+	ClusterUserDefinedNetworkSelector *ClusterUserDefinedNetworkSelector `json:"clusterUserDefinedNetworkSelector,omitempty"`
+
+	// primaryUserDefinedNetworkSelector selects primary UserDefinedNetworks when
+	// NetworkSelectionType is 'PrimaryUserDefinedNetworks'.
+	// +kubebuilder:validation:Optional
+	PrimaryUserDefinedNetworkSelector *PrimaryUserDefinedNetworkSelector `json:"primaryUserDefinedNetworkSelector,omitempty"`
+
+	// secondaryUserDefinedNetworkSelector selects secondary UserDefinedNetworks
+	// when NetworkSelectionType is 'SecondaryUserDefinedNetworks'.
+	// +kubebuilder:validation:Optional
+	SecondaryUserDefinedNetworkSelector *SecondaryUserDefinedNetworkSelector `json:"secondaryUserDefinedNetworkSelector,omitempty"`
+
+	// networkAttachmentDefinitionSelector selects networks defined in the
+	// selected NetworkAttachmentDefinitions when NetworkSelectionType is
+	// 'SecondaryUserDefinedNetworks'.
+	// +kubebuilder:validation:Optional
+	NetworkAttachmentDefinitionSelector *NetworkAttachmentDefinitionSelector `json:"networkAttachmentDefinitionSelector,omitempty"`
+}
+
+// NetworkSelectionType determines the type of networks selected.
+// +kubebuilder:validation:Enum=DefaultNetwork;ClusterUserDefinedNetworks;PrimaryUserDefinedNetworks;SecondaryUserDefinedNetworks;NetworkAttachmentDefinitions
+type NetworkSelectionType string
+
+const (
+	// DefaultNetwork determines that the default pod network is selected.
+	DefaultNetwork NetworkSelectionType = "DefaultNetwork"
+
+	// ClusterUserDefinedNetworks determines that ClusterUserDefinedNetworks are selected.
+	ClusterUserDefinedNetworks NetworkSelectionType = "ClusterUserDefinedNetworks"
+
+	// PrimaryUserDefinedNetworks determines that primary UserDefinedNetworks are selected.
+	PrimaryUserDefinedNetworks NetworkSelectionType = "PrimaryUserDefinedNetworks"
+
+	// SecondaryUserDefinedNetworks determines that secondary UserDefinedNetworks are selected.
+	SecondaryUserDefinedNetworks NetworkSelectionType = "SecondaryUserDefinedNetworks"
+
+	// NetworkAttachmentDefinitions determines that networks defined in NetworkAttachmentDefinitions are selected.
+	NetworkAttachmentDefinitions NetworkSelectionType = "NetworkAttachmentDefinitions"
+)
+
+// ClusterUserDefinedNetworkSelector selects ClusterUserDefinedNetworks.
+type ClusterUserDefinedNetworkSelector struct {
+	// networkSelector selects ClusterUserDefinedNetworks by label. A null
+	// selector will mot match anything, while an empty ({}) selector will match
+	// all.
+	// +kubebuilder:validation:Required
+	NetworkSelector metav1.LabelSelector `json:"networkSelector"`
+}
+
+// PrimaryUserDefinedNetworkSelector selects primary UserDefinedNetworks.
+type PrimaryUserDefinedNetworkSelector struct {
+	// namespaceSelector select the primary UserDefinedNetworks that are servind
+	// the selected namespaces. This field follows standard label selector
+	// semantics.
+	// +kubebuilder:validation:Required
+	NamespaceSelector metav1.LabelSelector `json:"namespaceSelector"`
+}
+
+// SecondaryUserDefinedNetworkSelector selects secondary UserDefinedNetworks.
+type SecondaryUserDefinedNetworkSelector struct {
+	// namespaceSelector selects namespaces where the secondary
+	// UserDefinedNetworks are defined. This field follows standard label
+	// selector semantics.
+	// +kubebuilder:validation:Required
+	NamespaceSelector metav1.LabelSelector `json:"namespaceSelector"`
+
+	// networkSelector selects secondary UserDefinedNetworks within the selected
+	// namespaces by label. This field follows standard label selector
+	// semantics.
+	// +kubebuilder:validation:Required
+	NetworkSelector metav1.LabelSelector `json:"networkSelector"`
+}
+
+// NetworkAttachmentDefinitionSelector selects networks defined in the selected NetworkAttachmentDefinitions.
+type NetworkAttachmentDefinitionSelector struct {
+	// namespaceSelector selects namespaces where the
+	// NetworkAttachmentDefinitions are defined. This field follows standard
+	// label selector semantics.
+	// +kubebuilder:validation:Required
+	NamespaceSelector metav1.LabelSelector `json:"namespaceSelector"`
+
+	// networkSelector selects NetworkAttachmentDefinitions within the selected
+	// namespaces by label. This field follows standard label selector
+	// semantics.
+	// +kubebuilder:validation:Required
+	NetworkSelector metav1.LabelSelector `json:"networkSelector"`
+}