Add validationOptions to nodegroup spec as well

deploy/crds/atlassian.com_nodegroups_crd.yaml

@@ -311,6 +311,19 @@ spec:
                 description: SkipPreTerminationChecks is an optional flag to skip
                   pre-termination checks during cycling
                 type: boolean
+              validationOptions:
+                description: ValidationOptions stores the settings to use for validating
+                  state of nodegroups in kube and the cloud provider for cycling the
+                  nodes.
+                properties:
+                  skipMissingNamedNodes:
+                    description: SkipMissingNodeNames is a boolean which determines
+                      whether named nodes selected in a CNR must exist and be valid
+                      nodes before cycling can begin. If set to true named nodes which
+                      don't exist will be ignored rather than transitioning the CNR
+                      to the failed phase.
+                    type: boolean
+                type: object
             required:
             - cycleSettings
             - nodeGroupName

docs/automation/README.md

@@ -34,6 +34,8 @@ spec:
   cycleSettings:
     method: Drain
     concurrency: 1
+  validationOptions:
+    skipMissingNamedNodes: true
   healthChecks:
   - endpoint: http://{{ .NodeIP }}:8080/ready
     regexMatch: Ready

docs/cycling/README.md

@@ -106,6 +106,11 @@ spec:
     - "node-name-A"
     - "node-name-B"
 
+  # Optional section - collection of validation options to define stricter or more lenient validation during cycling.
+  validationOptions:
+    # Optional field - Skip node names defined in the CNR that do not match any existing nodes in the Kubernetes API.
+    skipMissingNamedNodes: true|false
+
   cycleNodeSettings:
       # Method can be "Wait" or "Drain", defaults to "Drain" if not provided
       # "Wait" will wait for pods on the node to complete, while "Drain" will forcefully drain them off the node

pkg/apis/atlassian/v1/common_types.go

@@ -104,3 +104,12 @@ type TLSConfig struct {
 	// sent as part of the request to the upstream host for mTLS.
 	Key string `json:"key,omitempty"`
 }
+
+// ValidationOptions stores the settings to use for validating state of nodegroups
+// in kube and the cloud provider for cycling the nodes.
+type ValidationOptions struct {
+	// SkipMissingNodeNames is a boolean which determines whether named nodes selected in a CNR must
+	// exist and be valid nodes before cycling can begin. If set to true named nodes which don't exist
+	// will be ignored rather than transitioning the CNR to the failed phase.
+	SkipMissingNamedNodes bool `json:"skipMissingNamedNodes,omitempty"`
+}

pkg/apis/atlassian/v1/cyclenoderequest_types.go

@@ -111,15 +111,6 @@ type CycleNodeRequestNode struct {
 	PrivateIP string `json:"privateIp,omitempty"`
 }
 
-// ValidationOptions stores the settings to use for validating state of nodegroups
-// in kube and the cloud provider for cycling the nodes.
-type ValidationOptions struct {
-	// SkipMissingNodeNames is a boolean which determines whether named nodes selected in a CNR must
-	// exist and be valid nodes before cycling can begin. If set to true named nodes which don't exist
-	// will be ignored rather than transitioning the CNR to the failed phase.
-	SkipMissingNamedNodes bool `json:"skipMissingNamedNodes,omitempty"`
-}
-
 // HealthCheckStatus groups all health checks status information for a node
 type HealthCheckStatus struct {
 	// Ready keeps track of the first timestamp at which the node status was reported as "ready"

pkg/apis/atlassian/v1/nodegroup_types.go

@@ -19,6 +19,10 @@ type NodeGroupSpec struct {
 	// CycleSettings stores the settings to use for cycling the nodes.
 	CycleSettings CycleSettings `json:"cycleSettings"`
 
+	// ValidationOptions stores the settings to use for validating state of nodegroups
+	// in kube and the cloud provider for cycling the nodes.
+	ValidationOptions ValidationOptions `json:"validationOptions,omitempty"`
+
 	// Healthchecks stores the settings to configure instance custom health checks
 	HealthChecks []HealthCheck `json:"healthChecks,omitempty"`
 

pkg/generation/cnr.go

@@ -3,9 +3,10 @@ package generation
 import (
 	"context"
 	"fmt"
-	"github.com/atlassian-labs/cyclops/pkg/controller/cyclenoderequest"
 	"strings"
 
+	"github.com/atlassian-labs/cyclops/pkg/controller/cyclenoderequest"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/validation"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -73,8 +74,9 @@ func GiveReason(cnr *atlassianv1.CycleNodeRequest, reason string) {
 	}
 	cnr.Annotations[cnrReasonAnnotationKey] = reason
 }
+
 // SetAPIVersion adds apiVersion annotation to the cnr
-func SetAPIVersion(cnr *atlassianv1.CycleNodeRequest, clientVersion string){
+func SetAPIVersion(cnr *atlassianv1.CycleNodeRequest, clientVersion string) {
 	if cnr.Annotations == nil {
 		cnr.Annotations = map[string]string{}
 	}
@@ -110,6 +112,7 @@ func GenerateCNR(nodeGroup atlassianv1.NodeGroup, nodes []string, name, namespac
 			PreTerminationChecks:     nodeGroup.Spec.PreTerminationChecks,
 			SkipInitialHealthChecks:  nodeGroup.Spec.SkipInitialHealthChecks,
 			SkipPreTerminationChecks: nodeGroup.Spec.SkipPreTerminationChecks,
+			ValidationOptions:        nodeGroup.Spec.ValidationOptions,
 		},
 	}
 }