Merge pull request #35 from GDATASoftwareAG/cleanup-after-configurabl…

…e-lans cleanup after configurable lans
GDATASoftwareAG · Nov 13, 2023 · 9f2af9e · 9f2af9e
2 parents 4b5e1f1 + 713a5d8
commit 9f2af9e
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 112 deletions.
diff --git a/api/v1alpha1/ionoscloudcluster_types.go b/api/v1alpha1/ionoscloudcluster_types.go
@@ -75,10 +75,6 @@ func (r Location) String() string {
 
 // IONOSCloudClusterSpec defines the desired state of IONOSCloudCluster
 // +kubebuilder:validation:XValidation:rule="!has(oldSelf.dataCenterID) || has(self.dataCenterID)", message="DataCenterID is required once set"
-// +kubebuilder:validation:XValidation:rule="!has(oldSelf.loadBalancerID) || has(self.loadBalancerID)", message="LoadBalancerID is required once set"
-// +kubebuilder:validation:XValidation:rule="!has(oldSelf.publicLanID) || has(self.publicLanID)", message="PublicLanID is required once set"
-// +kubebuilder:validation:XValidation:rule="!has(oldSelf.internetLanID) || has(self.internetLanID)", message="InternetLanID is required once set"
-// +kubebuilder:validation:XValidation:rule="!has(oldSelf.privateLanID) || has(self.privateLanID)", message="PrivateLanID is required once set"
 type IONOSCloudClusterSpec struct {
 
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Location is immutable"
@@ -95,14 +91,6 @@ type IONOSCloudClusterSpec struct {
 
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="DataCenterID is immutable"
 	DataCenterID string `json:"dataCenterID,omitempty"`
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="LoadBalancerID is immutable"
-	LoadBalancerID string `json:"loadBalancerID,omitempty"`
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="PublicLanID is immutable"
-	PublicLanID *int32 `json:"publicLanID,omitempty"`
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="InternetLanID is immutable"
-	InternetLanID *int32 `json:"internetLanID,omitempty"`
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="PrivateLanID is immutable"
-	PrivateLanID *int32 `json:"privateLanID,omitempty"`
 }
 
 // IONOSCloudClusterStatus defines the observed state of IONOSCloudCluster

diff --git a/api/v1alpha1/ionoscloudmachine_types.go b/api/v1alpha1/ionoscloudmachine_types.go
@@ -32,7 +32,6 @@ const (
 
 // IONOSCloudMachineSpec defines the desired state of IONOSCloudMachine
 // +kubebuilder:validation:XValidation:rule="!has(oldSelf.providerID) || has(self.providerID)", message="ProviderID is required once set"
-// +kubebuilder:validation:XValidation:rule="!has(oldSelf.ip) || has(self.ip)", message="IP is required once set"
 type IONOSCloudMachineSpec struct {
 	// The name of the  resource.
 	Name *string `json:"name,omitempty"`
@@ -56,8 +55,6 @@ type IONOSCloudMachineSpec struct {
 	Ram        *int32          `json:"ram"`
 	BootVolume IONOSVolumeSpec `json:"bootVolume"`
 
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="IP is immutable"
-	IP *string `json:"ip,omitempty"`
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="ProviderID is immutable"
 	ProviderID string         `json:"providerID,omitempty"`
 	Nics       []IONOSNicSpec `json:"nics,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudclusters.yaml
@@ -56,12 +56,6 @@ spec:
               identityName:
                 minLength: 1
                 type: string
-              internetLanID:
-                format: int32
-                type: integer
-                x-kubernetes-validations:
-                - message: InternetLanID is immutable
-                  rule: self == oldSelf
               lans:
                 items:
                   properties:
@@ -102,11 +96,6 @@ spec:
                 - listenerLanRef
                 - targetLanRef
                 type: object
-              loadBalancerID:
-                type: string
-                x-kubernetes-validations:
-                - message: LoadBalancerID is immutable
-                  rule: self == oldSelf
               location:
                 enum:
                 - es/vlt
@@ -120,18 +109,6 @@ spec:
                 x-kubernetes-validations:
                 - message: Location is immutable
                   rule: self == oldSelf
-              privateLanID:
-                format: int32
-                type: integer
-                x-kubernetes-validations:
-                - message: PrivateLanID is immutable
-                  rule: self == oldSelf
-              publicLanID:
-                format: int32
-                type: integer
-                x-kubernetes-validations:
-                - message: PublicLanID is immutable
-                  rule: self == oldSelf
             required:
             - identityName
             - lans
@@ -141,14 +118,6 @@ spec:
             x-kubernetes-validations:
             - message: DataCenterID is required once set
               rule: '!has(oldSelf.dataCenterID) || has(self.dataCenterID)'
-            - message: LoadBalancerID is required once set
-              rule: '!has(oldSelf.loadBalancerID) || has(self.loadBalancerID)'
-            - message: PublicLanID is required once set
-              rule: '!has(oldSelf.publicLanID) || has(self.publicLanID)'
-            - message: InternetLanID is required once set
-              rule: '!has(oldSelf.internetLanID) || has(self.internetLanID)'
-            - message: PrivateLanID is required once set
-              rule: '!has(oldSelf.privateLanID) || has(self.privateLanID)'
           status:
             description: IONOSCloudClusterStatus defines the observed state of IONOSCloudCluster
             properties:

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudclustertemplates.yaml
@@ -65,12 +65,6 @@ spec:
                       identityName:
                         minLength: 1
                         type: string
-                      internetLanID:
-                        format: int32
-                        type: integer
-                        x-kubernetes-validations:
-                        - message: InternetLanID is immutable
-                          rule: self == oldSelf
                       lans:
                         items:
                           properties:
@@ -111,11 +105,6 @@ spec:
                         - listenerLanRef
                         - targetLanRef
                         type: object
-                      loadBalancerID:
-                        type: string
-                        x-kubernetes-validations:
-                        - message: LoadBalancerID is immutable
-                          rule: self == oldSelf
                       location:
                         enum:
                         - es/vlt
@@ -129,18 +118,6 @@ spec:
                         x-kubernetes-validations:
                         - message: Location is immutable
                           rule: self == oldSelf
-                      privateLanID:
-                        format: int32
-                        type: integer
-                        x-kubernetes-validations:
-                        - message: PrivateLanID is immutable
-                          rule: self == oldSelf
-                      publicLanID:
-                        format: int32
-                        type: integer
-                        x-kubernetes-validations:
-                        - message: PublicLanID is immutable
-                          rule: self == oldSelf
                     required:
                     - identityName
                     - lans
@@ -150,14 +127,6 @@ spec:
                     x-kubernetes-validations:
                     - message: DataCenterID is required once set
                       rule: '!has(oldSelf.dataCenterID) || has(self.dataCenterID)'
-                    - message: LoadBalancerID is required once set
-                      rule: '!has(oldSelf.loadBalancerID) || has(self.loadBalancerID)'
-                    - message: PublicLanID is required once set
-                      rule: '!has(oldSelf.publicLanID) || has(self.publicLanID)'
-                    - message: InternetLanID is required once set
-                      rule: '!has(oldSelf.internetLanID) || has(self.internetLanID)'
-                    - message: PrivateLanID is required once set
-                      rule: '!has(oldSelf.privateLanID) || has(self.privateLanID)'
                 required:
                 - spec
                 type: object

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachines.yaml
@@ -96,11 +96,6 @@ spec:
                 x-kubernetes-validations:
                 - message: CpuFamily is immutable
                   rule: self == oldSelf
-              ip:
-                type: string
-                x-kubernetes-validations:
-                - message: IP is immutable
-                  rule: self == oldSelf
               name:
                 description: The name of the  resource.
                 type: string
@@ -144,8 +139,6 @@ spec:
             x-kubernetes-validations:
             - message: ProviderID is required once set
               rule: '!has(oldSelf.providerID) || has(self.providerID)'
-            - message: IP is required once set
-              rule: '!has(oldSelf.ip) || has(self.ip)'
           status:
             description: IONOSCloudMachineStatus defines the observed state of IONOSCloudMachine
             properties:

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudmachinetemplates.yaml
@@ -107,11 +107,6 @@ spec:
                         x-kubernetes-validations:
                         - message: CpuFamily is immutable
                           rule: self == oldSelf
-                      ip:
-                        type: string
-                        x-kubernetes-validations:
-                        - message: IP is immutable
-                          rule: self == oldSelf
                       name:
                         description: The name of the  resource.
                         type: string
@@ -155,8 +150,6 @@ spec:
                     x-kubernetes-validations:
                     - message: ProviderID is required once set
                       rule: '!has(oldSelf.providerID) || has(self.providerID)'
-                    - message: IP is required once set
-                      rule: '!has(oldSelf.ip) || has(self.ip)'
                 required:
                 - spec
                 type: object

diff --git a/internal/controller/ionoscloudmachine_controller_test.go b/internal/controller/ionoscloudmachine_controller_test.go
@@ -159,7 +159,6 @@ var _ = Describe("IONOSCloudMachine controller", func() {
 				BootVolume: v1alpha1.IONOSVolumeSpec{
 					Size: "2048",
 				},
-				IP:         nil,
 				ProviderID: "",
 				Nics: []v1alpha1.IONOSNicSpec{
 					{