Add node pool recycling options

oracle · Jun 22, 2023 · c5ab55b · c5ab55b
1 parent ed6d14c
commit c5ab55b
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 152 deletions.
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedmachinepools.yaml
@@ -77,28 +77,6 @@ spec:
                 description: NodeMetadata defines a list of key/value pairs to add
                   to each underlying OCI instance in the node pool on launch.
                 type: object
-              nodePoolCyclingDetails:
-                description: NodePoolCyclingDetails defines the node pool recycling
-                  options.
-                properties:
-                  isNodeCyclingEnabled:
-                    description: IsNodeCyclingEnabled refers if nodes in the nodepool
-                      will be cycled to have new changes.
-                    type: boolean
-                  maximumSurge:
-                    description: MaximumSurge refers to the maximum additional new
-                      compute instances that would be temporarily created and added
-                      to nodepool during the cycling nodepool process. OKE supports
-                      both integer and percentage input. Defaults to 1, Ranges from
-                      0 to Nodepool size or 0% to 100%
-                    type: string
-                  maximumUnavailable:
-                    description: Maximum active nodes that would be terminated from
-                      nodepool during the cycling nodepool process. OKE supports both
-                      integer and percentage input. Defaults to 0, Ranges from 0 to
-                      Nodepool size or 0% to 100%
-                    type: string
-                type: object
               nodePoolNodeConfig:
                 description: NodePoolNodeConfig defines the configuration of nodes
                   in the node pool.

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedmachinepooltemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ocimanagedmachinepooltemplates.yaml
@@ -90,28 +90,6 @@ spec:
                           to add to each underlying OCI instance in the node pool
                           on launch.
                         type: object
-                      nodePoolCyclingDetails:
-                        description: NodePoolCyclingDetails defines the node pool
-                          recycling options.
-                        properties:
-                          isNodeCyclingEnabled:
-                            description: IsNodeCyclingEnabled refers if nodes in the
-                              nodepool will be cycled to have new changes.
-                            type: boolean
-                          maximumSurge:
-                            description: MaximumSurge refers to the maximum additional
-                              new compute instances that would be temporarily created
-                              and added to nodepool during the cycling nodepool process.
-                              OKE supports both integer and percentage input. Defaults
-                              to 1, Ranges from 0 to Nodepool size or 0% to 100%
-                            type: string
-                          maximumUnavailable:
-                            description: Maximum active nodes that would be terminated
-                              from nodepool during the cycling nodepool process. OKE
-                              supports both integer and percentage input. Defaults
-                              to 0, Ranges from 0 to Nodepool size or 0% to 100%
-                            type: string
-                        type: object
                       nodePoolNodeConfig:
                         description: NodePoolNodeConfig defines the configuration
                           of nodes in the node pool.

diff --git a/exp/api/v1beta1/conversion.go b/exp/api/v1beta1/conversion.go
@@ -51,3 +51,7 @@ func Convert_v1beta2_NetworkDetails_To_v1beta1_NetworkDetails(in *infrastructure
 func Convert_v1beta2_OCIManagedControlPlaneSpec_To_v1beta1_OCIManagedControlPlaneSpec(in *v1beta2.OCIManagedControlPlaneSpec, out *OCIManagedControlPlaneSpec, s conversion.Scope) error {
 	return autoConvert_v1beta2_OCIManagedControlPlaneSpec_To_v1beta1_OCIManagedControlPlaneSpec(in, out, s)
 }
+
+func Convert_v1beta2_OCIManagedMachinePoolSpec_To_v1beta1_OCIManagedMachinePoolSpec(in *v1beta2.OCIManagedMachinePoolSpec, out *OCIManagedMachinePoolSpec, s conversion.Scope) error {
+	return autoConvert_v1beta2_OCIManagedMachinePoolSpec_To_v1beta1_OCIManagedMachinePoolSpec(in, out, s)
+}
diff --git a/exp/api/v1beta1/ocimanagedmachinepool_conversion.go b/exp/api/v1beta1/ocimanagedmachinepool_conversion.go
@@ -34,6 +34,7 @@ func (src *OCIManagedMachinePool) ConvertTo(dstRaw conversion.Hub) error {
 	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
 		return err
 	}
+	dst.Spec.NodePoolCyclingDetails = restored.Spec.NodePoolCyclingDetails
 
 	return nil
 }

diff --git a/exp/api/v1beta1/ocimanagedmachinepool_types.go b/exp/api/v1beta1/ocimanagedmachinepool_types.go
@@ -59,10 +59,6 @@ type OCIManagedMachinePoolSpec struct {
 	// +optional
 	InitialNodeLabels []KeyValue `json:"initialNodeLabels,omitempty"`
 
-	// NodePoolCyclingDetails defines the node pool recycling options.
-	// +optional
-	NodePoolCyclingDetails *NodePoolCyclingDetails `json:"nodePoolCyclingDetails,omitempty"`
-
 	// ProviderIDList are the identification IDs of machine instances provided by the provider.
 	// This field must match the provider IDs as seen on the node objects corresponding to a machine pool's machine instances.
 	// +optional
@@ -195,25 +191,6 @@ type KeyValue struct {
 	Value *string `json:"value,omitempty"`
 }
 
-// NodePoolCyclingDetails defines the node pool recycling options
-type NodePoolCyclingDetails struct {
-
-	// IsNodeCyclingEnabled refers if nodes in the nodepool will be cycled to have new changes.
-	// +optional
-	IsNodeCyclingEnabled *bool `json:"isNodeCyclingEnabled,omitempty"`
-
-	// MaximumSurge refers to the maximum additional new compute instances that would be temporarily created and
-	// added to nodepool during the cycling nodepool process. OKE supports both integer and percentage input.
-	// Defaults to 1, Ranges from 0 to Nodepool size or 0% to 100%
-	// +optional
-	MaximumSurge *string `json:"maximumSurge,omitempty"`
-
-	// Maximum active nodes that would be terminated from nodepool during the cycling nodepool process.
-	// OKE supports both integer and percentage input. Defaults to 0, Ranges from 0 to Nodepool size or 0% to 100%
-	// +optional
-	MaximumUnavailable *string `json:"maximumUnavailable,omitempty"`
-}
-
 // OCIManagedMachinePoolStatus defines the observed state of OCIManagedMachinePool
 type OCIManagedMachinePoolStatus struct {
 	// +optional

diff --git a/exp/api/v1beta1/zz_generated.conversion.go b/exp/api/v1beta1/zz_generated.conversion.go
diff --git a/exp/api/v1beta1/zz_generated.deepcopy.go b/exp/api/v1beta1/zz_generated.deepcopy.go