Add machinepool machine support (#304)

* Add support for machinepool machines and CAPI 1.5 support

Dockerfile

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

Makefile

@@ -378,7 +378,7 @@ $(KUSTOMIZE): ## Download kustomize locally if necessary.
 	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/kustomize/kustomize/v4 $(KUSTOMIZE_BIN) v4.5.2
 
 $(GINKGO): ## Build ginkgo.
-	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) github.com/onsi/ginkgo/v2/ginkgo $(GINKGO_BIN) v2.9.2
+	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) github.com/onsi/ginkgo/v2/ginkgo $(GINKGO_BIN) v2.11.0
 
 $(GOLANGCI_LINT): ## Build golanci-lint.
 	GOBIN=$(BIN_DIR)/ $(GO_INSTALL) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN) v1.44.0

api/v1beta2/ocicluster_webhook.go

@@ -29,6 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 var clusterlogger = ctrl.Log.WithName("ocicluster-resource")
@@ -58,36 +59,36 @@ func (c *OCICluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (c *OCICluster) ValidateCreate() error {
+func (c *OCICluster) ValidateCreate() (admission.Warnings, error) {
 	clusterlogger.Info("validate update cluster", "name", c.Name)
 
 	var allErrs field.ErrorList
 
 	allErrs = append(allErrs, c.validate(nil)...)
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	return apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (c *OCICluster) ValidateDelete() error {
+func (c *OCICluster) ValidateDelete() (admission.Warnings, error) {
 	clusterlogger.Info("validate delete cluster", "name", c.Name)
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (c *OCICluster) ValidateUpdate(old runtime.Object) error {
+func (c *OCICluster) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	clusterlogger.Info("validate update cluster", "name", c.Name)
 
 	var allErrs field.ErrorList
 
 	oldCluster, ok := old.(*OCICluster)
 	if !ok {
-		return apierrors.NewBadRequest(fmt.Sprintf("expected an OCICluster but got a %T", old))
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("expected an OCICluster but got a %T", old))
 	}
 
 	if c.Spec.Region != oldCluster.Spec.Region {
@@ -105,10 +106,10 @@ func (c *OCICluster) ValidateUpdate(old runtime.Object) error {
 	allErrs = append(allErrs, c.validate(oldCluster)...)
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	return apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
 }
 
 func (c *OCICluster) validate(old *OCICluster) field.ErrorList {

api/v1beta2/ocicluster_webhook_test.go

@@ -439,11 +439,12 @@ func TestOCICluster_ValidateCreate(t *testing.T) {
 			g := gomega.NewWithT(t)
 
 			if test.expectErr {
-				err := test.c.ValidateCreate()
+				_, err := test.c.ValidateCreate()
 				g.Expect(err).NotTo(gomega.Succeed())
 				g.Expect(strings.Contains(err.Error(), test.errorMgsShouldContain)).To(gomega.BeTrue())
 			} else {
-				g.Expect(test.c.ValidateCreate()).To(gomega.Succeed())
+				_, err := test.c.ValidateCreate()
+				g.Expect(err).To(gomega.Succeed())
 			}
 		})
 	}
@@ -562,11 +563,12 @@ func TestOCICluster_ValidateUpdate(t *testing.T) {
 			g := gomega.NewWithT(t)
 
 			if test.expectErr {
-				err := test.c.ValidateUpdate(test.old)
+				_, err := test.c.ValidateUpdate(test.old)
 				g.Expect(err).NotTo(gomega.Succeed())
 				g.Expect(strings.Contains(err.Error(), test.errorMgsShouldContain)).To(gomega.BeTrue())
 			} else {
-				g.Expect(test.c.ValidateUpdate(test.old)).To(gomega.Succeed())
+				_, err := test.c.ValidateUpdate(test.old)
+				g.Expect(err).To(gomega.Succeed())
 			}
 		})
 	}

api/v1beta2/ocimachinetemplate_webhook.go

@@ -24,6 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 var (
@@ -39,40 +40,40 @@ func (m *OCIMachineTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (m *OCIMachineTemplate) ValidateCreate() error {
+func (m *OCIMachineTemplate) ValidateCreate() (admission.Warnings, error) {
 	clusterlogger.Info("validate create machinetemplate", "name", m.Name)
 
 	var allErrs field.ErrorList
 
 	allErrs = append(allErrs, m.validate()...)
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	return apierrors.NewInvalid(m.GroupVersionKind().GroupKind(), m.Name, allErrs)
+	return nil, apierrors.NewInvalid(m.GroupVersionKind().GroupKind(), m.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (m *OCIMachineTemplate) ValidateDelete() error {
+func (m *OCIMachineTemplate) ValidateDelete() (admission.Warnings, error) {
 	clusterlogger.Info("validate delete machinetemplate", "name", m.Name)
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (m *OCIMachineTemplate) ValidateUpdate(old runtime.Object) error {
+func (m *OCIMachineTemplate) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	clusterlogger.Info("validate update machinetemplate", "name", m.Name)
 
 	var allErrs field.ErrorList
 
 	allErrs = append(allErrs, m.validate()...)
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	return apierrors.NewInvalid(m.GroupVersionKind().GroupKind(), m.Name, allErrs)
+	return nil, apierrors.NewInvalid(m.GroupVersionKind().GroupKind(), m.Name, allErrs)
 }
 
 func (m *OCIMachineTemplate) validate() field.ErrorList {

api/v1beta2/ocimachinetemplate_webhook_test.go

@@ -99,11 +99,12 @@ func TestOCIMachineTemplate_ValidateCreate(t *testing.T) {
 			g := gomega.NewWithT(t)
 
 			if test.expectErr {
-				err := test.inputTemplate.ValidateCreate()
+				_, err := test.inputTemplate.ValidateCreate()
 				g.Expect(err).NotTo(gomega.Succeed())
 				g.Expect(strings.Contains(err.Error(), test.errorField)).To(gomega.BeTrue())
 			} else {
-				g.Expect(test.inputTemplate.ValidateCreate()).To(gomega.Succeed())
+				_, err := test.inputTemplate.ValidateCreate()
+				g.Expect(err).To(gomega.Succeed())
 			}
 		})
 	}
@@ -115,11 +116,12 @@ func TestOCIMachineTemplate_ValidateUpdate(t *testing.T) {
 			g := gomega.NewWithT(t)
 
 			if test.expectErr {
-				err := test.inputTemplate.ValidateUpdate(nil)
+				_, err := test.inputTemplate.ValidateUpdate(nil)
 				g.Expect(err).NotTo(gomega.Succeed())
 				g.Expect(strings.Contains(err.Error(), test.errorField)).To(gomega.BeTrue())
 			} else {
-				g.Expect(test.inputTemplate.ValidateUpdate(nil)).To(gomega.Succeed())
+				_, err := test.inputTemplate.ValidateUpdate(nil)
+				g.Expect(err).To(gomega.Succeed())
 			}
 		})
 	}

api/v1beta2/ocimanagedcluster_webhook.go

@@ -27,6 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 var managedclusterlogger = ctrl.Log.WithName("ocimanagedcluster-resource")
@@ -114,36 +115,36 @@ func (c *OCIManagedCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (c *OCIManagedCluster) ValidateCreate() error {
+func (c *OCIManagedCluster) ValidateCreate() (admission.Warnings, error) {
 	managedclusterlogger.Info("validate create cluster", "name", c.Name)
 
 	var allErrs field.ErrorList
 
 	allErrs = append(allErrs, c.validate(nil)...)
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	return apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (c *OCIManagedCluster) ValidateDelete() error {
+func (c *OCIManagedCluster) ValidateDelete() (admission.Warnings, error) {
 	managedclusterlogger.Info("validate delete cluster", "name", c.Name)
 
-	return nil
+	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (c *OCIManagedCluster) ValidateUpdate(old runtime.Object) error {
+func (c *OCIManagedCluster) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	managedclusterlogger.Info("validate update cluster", "name", c.Name)
 
 	var allErrs field.ErrorList
 
 	oldCluster, ok := old.(*OCIManagedCluster)
 	if !ok {
-		return apierrors.NewBadRequest(fmt.Sprintf("expected an OCIManagedCluster but got a %T", old))
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("expected an OCIManagedCluster but got a %T", old))
 	}
 
 	if c.Spec.Region != oldCluster.Spec.Region {
@@ -161,10 +162,10 @@ func (c *OCIManagedCluster) ValidateUpdate(old runtime.Object) error {
 	allErrs = append(allErrs, c.validate(oldCluster)...)
 
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
 
-	return apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
 }
 
 func (c *OCIManagedCluster) validate(old *OCIManagedCluster) field.ErrorList {

api/v1beta2/ocimanagedcluster_webhook_test.go

@@ -464,11 +464,12 @@ func TestOCIManagedCluster_ValidateCreate(t *testing.T) {
 			g := gomega.NewWithT(t)
 
 			if test.expectErr {
-				err := test.c.ValidateCreate()
+				_, err := test.c.ValidateCreate()
 				g.Expect(err).NotTo(gomega.Succeed())
 				g.Expect(strings.Contains(err.Error(), test.errorMgsShouldContain)).To(gomega.BeTrue())
 			} else {
-				g.Expect(test.c.ValidateCreate()).To(gomega.Succeed())
+				_, err := test.c.ValidateCreate()
+				g.Expect(err).To(gomega.Succeed())
 			}
 		})
 	}
@@ -587,11 +588,12 @@ func TestOCIManagedCluster_ValidateUpdate(t *testing.T) {
 			g := gomega.NewWithT(t)
 
 			if test.expectErr {
-				err := test.c.ValidateUpdate(test.old)
+				_, err := test.c.ValidateUpdate(test.old)
 				g.Expect(err).NotTo(gomega.Succeed())
 				g.Expect(strings.Contains(err.Error(), test.errorMgsShouldContain)).To(gomega.BeTrue())
 			} else {
-				g.Expect(test.c.ValidateUpdate(test.old)).To(gomega.Succeed())
+				_, err := test.c.ValidateUpdate(test.old)
+				g.Expect(err).To(gomega.Succeed())
 			}
 		})
 	}

api/v1beta2/ocimanagedcontrolplane_webhook.go

@@ -22,6 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 var managedcplanelogger = ctrl.Log.WithName("ocimanagedcontrolplane-resource")
@@ -50,21 +51,21 @@ func (c *OCIManagedControlPlane) SetupWebhookWithManager(mgr ctrl.Manager) error
 		Complete()
 }
 
-func (c *OCIManagedControlPlane) ValidateCreate() error {
+func (c *OCIManagedControlPlane) ValidateCreate() (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	if len(c.Name) > 31 {
 		allErrs = append(allErrs, field.Invalid(field.NewPath("Name"), c.Name, "Name cannot be more than 31 characters"))
 	}
 	if len(allErrs) == 0 {
-		return nil
+		return nil, nil
 	}
-	return apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(c.GroupVersionKind().GroupKind(), c.Name, allErrs)
 }
 
-func (c *OCIManagedControlPlane) ValidateUpdate(old runtime.Object) error {
-	return nil
+func (c *OCIManagedControlPlane) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+	return nil, nil
 }
 
-func (c *OCIManagedControlPlane) ValidateDelete() error {
-	return nil
+func (c *OCIManagedControlPlane) ValidateDelete() (admission.Warnings, error) {
+	return nil, nil
 }

api/v1beta2/ocimanagedcontrolplane_webhook_test.go

@@ -85,11 +85,12 @@ func TestOCIManagedControlPlane_ValidateCreate(t *testing.T) {
 			g := gomega.NewWithT(t)
 
 			if test.expectErr {
-				err := test.c.ValidateCreate()
+				_, err := test.c.ValidateCreate()
 				g.Expect(err).NotTo(gomega.Succeed())
 				g.Expect(strings.Contains(err.Error(), test.errorMgsShouldContain)).To(gomega.BeTrue())
 			} else {
-				g.Expect(test.c.ValidateCreate()).To(gomega.Succeed())
+				_, err := test.c.ValidateCreate()
+				g.Expect(err).To(gomega.Succeed())
 			}
 		})
 	}