Make sure everything is working and are named v1alpha2

Author: huxcrux

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.16 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

README.md

@@ -12,13 +12,15 @@ kustomize build config/default | kubectl apply -f -
 ## Sample nodegroup manifest
 
 ```yml
-apiVersion: k8s.elx.cloud/v1alpha1
+apiVersion: k8s.elx.cloud/v1alpha2
 kind: NodeGroup
 metadata:
   name: nodegroup-sample
 spec:
-  members:
+  members: 
     - node1 # Kubernetes node name
+  nodeGroupNames: 
+    - node0 # Kubernetes nodegroup name, used for clusters with dynamic node naming
   labels:
     name: value
   taints:

api/v1alpha2/groupversion_info.go

@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the k8s v1alpha1 API group
+// Package v1alpha2 contains API Schema definitions for the k8s v1alpha1 API group
 // +kubebuilder:object:generate=true
 // +groupName=k8s.elx.cloud
-package v1alpha1
+package v1alpha2
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "k8s.elx.cloud", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "k8s.elx.cloud", Version: "v1alpha2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

api/v1alpha2/nodegroup_types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1alpha2
 
 import (
 	corev1 "k8s.io/api/core/v1"

api/v1alpha2/zz_generated.deepcopy.go

@@ -14,7 +14,7 @@ spec:
     singular: nodegroup
   scope: Cluster
   versions:
-  - name: v1alpha1
+  - name: v1alpha2
     schema:
       openAPIV3Schema:
         description: NodeGroup is the Schema for the nodegroups API

config/crd/bases/k8s.elx.cloud_nodegroups.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.elx.cloud/v1alpha1
+apiVersion: k8s.elx.cloud/v1alpha2
 kind: NodeGroup
 metadata:
   name: nodegroup-sample

config/samples/k8s_v1alpha1_nodegroup.yaml

@@ -32,7 +32,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	k8sv1alpha1 "github.com/elastx/elx-nodegroup-controller/api/v1alpha2"
+	k8sv1alpha2 "github.com/elastx/elx-nodegroup-controller/api/v1alpha2"
 )
 
 const (
@@ -139,7 +139,7 @@ func reconcileNodeTaints(node *corev1.Node, taints []corev1.Taint) bool {
 
 func (r *NodeGroupReconciler) findNodeGroupsForMember(_ context.Context, node client.Object) []reconcile.Request {
 	log := log.FromContext(context.Background())
-	nodeGroups := &k8sv1alpha1.NodeGroupList{}
+	nodeGroups := &k8sv1alpha2.NodeGroupList{}
 	listOpts := &client.ListOptions{
 		FieldSelector: fields.OneTermEqualSelector(membersField, node.GetName()),
 	}
@@ -164,7 +164,7 @@ func (r *NodeGroupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	log := log.FromContext(ctx)
 
 	log.V(1).Info("reconciling node group", "nodeGroup", req.NamespacedName)
-	var nodeGroup k8sv1alpha1.NodeGroup
+	var nodeGroup k8sv1alpha2.NodeGroup
 	if err := r.Get(ctx, req.NamespacedName, &nodeGroup); err != nil {
 		if apierrors.IsNotFound(err) {
 			return ctrl.Result{}, nil
@@ -255,8 +255,8 @@ func (r *NodeGroupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 }
 
 func (r *NodeGroupReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	if err := mgr.GetFieldIndexer().IndexField(context.Background(), &k8sv1alpha1.NodeGroup{}, membersField, func(rawObj client.Object) []string {
-		nodeGroup := rawObj.(*k8sv1alpha1.NodeGroup)
+	if err := mgr.GetFieldIndexer().IndexField(context.Background(), &k8sv1alpha2.NodeGroup{}, membersField, func(rawObj client.Object) []string {
+		nodeGroup := rawObj.(*k8sv1alpha2.NodeGroup)
 		if nodeGroup.Spec.Members == nil {
 			return nil
 		}
@@ -265,7 +265,7 @@ func (r *NodeGroupReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		return err
 	}
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&k8sv1alpha1.NodeGroup{}).
+		For(&k8sv1alpha2.NodeGroup{}).
 		Watches(&corev1.Node{},
 			handler.EnqueueRequestsFromMapFunc(r.findNodeGroupsForMember)).
 		Complete(r)

controllers/nodegroup_controller.go

@@ -50,12 +50,12 @@ var _ = Describe("NodeGroup controller", func() {
 			Value:  "tainted",
 			Effect: "NoSchedule",
 		}
-		nodeGroups = []v1alpha1.NodeGroup{
+		nodeGroups = []v1alpha2.NodeGroup{
 			{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "nodegroup1",
 				},
-				Spec: v1alpha1.NodeGroupSpec{
+				Spec: v1alpha2.NodeGroupSpec{
 					Members: []string{"node1"},
 					Labels: map[string]string{
 						"nodegroup1": "value1",
@@ -66,7 +66,7 @@ var _ = Describe("NodeGroup controller", func() {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "nodegroup2",
 				},
-				Spec: v1alpha1.NodeGroupSpec{
+				Spec: v1alpha2.NodeGroupSpec{
 					Members: []string{"node2"},
 					Labels: map[string]string{
 						"nodegroup2": "value2",
@@ -91,7 +91,7 @@ var _ = Describe("NodeGroup controller", func() {
 		}
 		for _, nodeGroup := range nodeGroups {
 			Expect(k8sClient.Create(context.Background(), &nodeGroup)).Should(Succeed())
-			ng := &v1alpha1.NodeGroup{}
+			ng := &v1alpha2.NodeGroup{}
 			Eventually(func() bool {
 				err := k8sClient.Get(context.Background(), types.NamespacedName{Name: nodeGroup.Name}, ng)
 				if err != nil {
@@ -113,7 +113,7 @@ var _ = Describe("NodeGroup controller", func() {
 
 	Context("NodeGroups", func() {
 		It("should add a finalizer to NodeGroups", func() {
-			ng := &v1alpha1.NodeGroup{}
+			ng := &v1alpha2.NodeGroup{}
 			for _, nodeGroup := range nodeGroups {
 				Expect(k8sClient.Get(context.Background(), types.NamespacedName{Name: nodeGroup.Name}, ng)).Should(Succeed())
 				Expect(ng.Finalizers).Should(HaveLen(1))
@@ -180,7 +180,7 @@ var _ = Describe("NodeGroup controller", func() {
 				}
 				return n.GetLabels()["nodegroup2"] == "value2"
 			})
-			ng := &v1alpha1.NodeGroup{}
+			ng := &v1alpha2.NodeGroup{}
 			Expect(k8sClient.Get(context.Background(), types.NamespacedName{Name: "nodegroup2"}, ng)).To(Succeed())
 			Expect(k8sClient.Delete(context.Background(), ng)).To(Succeed())
 			Eventually(func() bool {

controllers/nodegroup_controller_test.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"path/filepath"
 	"testing"
+
 	//+kubebuilder:scaffold:imports
 
 	"k8s.io/client-go/kubernetes/scheme"
@@ -33,7 +34,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	k8sv1alpha1 "github.com/elastx/elx-nodegroup-controller/api/v1alpha2"
+	k8sv1alpha2 "github.com/elastx/elx-nodegroup-controller/api/v1alpha2"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -64,7 +65,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(cfg).NotTo(BeNil())
 
-	err = k8sv1alpha1.AddToScheme(scheme.Scheme)
+	err = k8sv1alpha2.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	//+kubebuilder:scaffold:scheme