fix: webhooks and add missing conversions

PROJECT

@@ -17,6 +17,9 @@ resources:
   kind: Enterprise
   path: github.com/mercedes-benz/garm-operator/api/v1alpha1
   version: v1alpha1
+  webhooks:
+    conversion: true
+    webhookVersion: v1
 - api:
     crdVersion: v1
     namespaced: true
@@ -26,6 +29,11 @@ resources:
   kind: Pool
   path: github.com/mercedes-benz/garm-operator/api/v1alpha1
   version: v1alpha1
+  webhooks:
+    conversion: true
+    defaulting: true
+    validation: true
+    webhookVersion: v1
 - api:
     crdVersion: v1
     namespaced: true
@@ -35,6 +43,9 @@ resources:
   kind: Organization
   path: github.com/mercedes-benz/garm-operator/api/v1alpha1
   version: v1alpha1
+  webhooks:
+    conversion: true
+    webhookVersion: v1
 - api:
     crdVersion: v1
     namespaced: true
@@ -44,6 +55,7 @@ resources:
   path: github.com/mercedes-benz/garm-operator/api/v1alpha1
   version: v1alpha1
   webhooks:
+    conversion: true
     defaulting: true
     validation: true
     webhookVersion: v1
@@ -57,6 +69,7 @@ resources:
   path: github.com/mercedes-benz/garm-operator/api/v1alpha1
   version: v1alpha1
   webhooks:
+    conversion: true
     defaulting: true
     validation: true
     webhookVersion: v1
@@ -69,6 +82,9 @@ resources:
   kind: Runner
   path: github.com/mercedes-benz/garm-operator/api/v1alpha1
   version: v1alpha1
+  webhooks:
+    conversion: true
+    webhookVersion: v1
 - api:
     crdVersion: v1
     namespaced: true

Tiltfile

@@ -10,7 +10,7 @@ allow_k8s_contexts('kind-garm-operator')
 # as the plugin has already well written readiness checks we can use it to wait for
 deploy_cert_manager(
     kind_cluster_name='garm-operator', # just for security reasons ;-)
-    version='v1.12.0' # the version of cert-manager to deploy
+    version='v1.15.3' # the version of cert-manager to deploy
 )
 
 # mode could be either 'local' or 'debug'

api/v1alpha1/enterprise_conversion.go

@@ -4,8 +4,19 @@ import (
 	"github.com/mercedes-benz/garm-operator/api/v1beta1"
 	v1 "k8s.io/api/core/v1"
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
+var _ conversion.Convertible = &Enterprise{}
+
+func (e *Enterprise) ConvertTo(dstRaw conversion.Hub) error {
+	return Convert_v1alpha1_Enterprise_To_v1beta1_Enterprise(e, dstRaw.(*v1beta1.Enterprise), nil)
+}
+
+func (e *Enterprise) ConvertFrom(dstRaw conversion.Hub) error {
+	return Convert_v1beta1_Enterprise_To_v1alpha1_Enterprise(dstRaw.(*v1beta1.Enterprise), e, nil)
+}
+
 func Convert_v1alpha1_EnterpriseSpec_To_v1beta1_EnterpriseSpec(in *EnterpriseSpec, out *v1beta1.EnterpriseSpec, s apiconversion.Scope) error {
 	out.CredentialsRef = v1.TypedLocalObjectReference{
 		Name:     in.CredentialsName,

api/v1alpha1/enterprise_types.go

@@ -3,9 +3,8 @@
 package v1alpha1
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"github.com/mercedes-benz/garm-operator/pkg/conditions"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // EnterpriseSpec defines the desired state of Enterprise

api/v1alpha1/enterprise_webhook.go

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+
+package v1alpha1
+
+import (
+	ctrl "sigs.k8s.io/controller-runtime"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+)
+
+// log is for logging in this package.
+var enterpriselog = logf.Log.WithName("enterprise-resource")
+
+func (r *Enterprise) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
+		Complete()
+}

api/v1alpha1/image_conversion.go

@@ -0,0 +1,16 @@
+package v1alpha1
+
+import (
+	"github.com/mercedes-benz/garm-operator/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+)
+
+var _ conversion.Convertible = &Image{}
+
+func (i *Image) ConvertTo(dstRaw conversion.Hub) error {
+	return Convert_v1alpha1_Image_To_v1beta1_Image(i, dstRaw.(*v1beta1.Image), nil)
+}
+
+func (i *Image) ConvertFrom(dstRaw conversion.Hub) error {
+	return Convert_v1beta1_Image_To_v1alpha1_Image(dstRaw.(*v1beta1.Image), i, nil)
+}

api/v1alpha1/organization_conversion.go

@@ -4,8 +4,17 @@ import (
 	v1beta1 "github.com/mercedes-benz/garm-operator/api/v1beta1"
 	v1 "k8s.io/api/core/v1"
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
+func (o *Organization) ConvertTo(dstRaw conversion.Hub) error {
+	return Convert_v1alpha1_Organization_To_v1beta1_Organization(o, dstRaw.(*v1beta1.Organization), nil)
+}
+
+func (o *Organization) ConvertFrom(dstRaw conversion.Hub) error {
+	return Convert_v1beta1_Organization_To_v1alpha1_Organization(dstRaw.(*v1beta1.Organization), o, nil)
+}
+
 func Convert_v1alpha1_OrganizationSpec_To_v1beta1_OrganizationSpec(in *OrganizationSpec, out *v1beta1.OrganizationSpec, s apiconversion.Scope) error {
 	out.CredentialsRef = v1.TypedLocalObjectReference{
 		Name:     in.CredentialsName,

api/v1alpha1/organization_webhook.go

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+
+package v1alpha1
+
+import (
+	ctrl "sigs.k8s.io/controller-runtime"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+)
+
+// log is for logging in this package.
+var organizationlog = logf.Log.WithName("organization-resource")
+
+func (r *Organization) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
+		Complete()
+}

api/v1alpha1/pool_conversion.go

@@ -0,0 +1,16 @@
+package v1alpha1
+
+import (
+	"github.com/mercedes-benz/garm-operator/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+)
+
+var _ conversion.Convertible = &Pool{}
+
+func (p *Pool) ConvertTo(dstRaw conversion.Hub) error {
+	return Convert_v1alpha1_Pool_To_v1beta1_Pool(p, dstRaw.(*v1beta1.Pool), nil)
+}
+
+func (p *Pool) ConvertFrom(dstRaw conversion.Hub) error {
+	return Convert_v1beta1_Pool_To_v1alpha1_Pool(dstRaw.(*v1beta1.Pool), p, nil)
+}

api/v1alpha1/pool_webhook.go

@@ -3,7 +3,6 @@
 package v1alpha1
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"reflect"
@@ -39,7 +38,6 @@ var _ webhook.Validator = &Pool{}
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (p *Pool) ValidateCreate() (admission.Warnings, error) {
 	poollog.Info("validate create", "name", p.Name)
-	ctx := context.TODO()
 
 	if err := p.validateExtraSpec(); err != nil {
 		return nil, apierrors.NewInvalid(schema.GroupKind{Group: GroupVersion.Group, Kind: "Pool"},
@@ -48,23 +46,6 @@ func (p *Pool) ValidateCreate() (admission.Warnings, error) {
 		)
 	}
 
-	poolImage, err := p.GetImageCR(ctx, c)
-	if err != nil {
-		poollog.Error(err, "cannot fetch Image", "error", err)
-		return nil, nil
-	}
-
-	duplicate, duplicateName, err := p.CheckDuplicate(ctx, c, poolImage)
-	if err != nil {
-		poollog.Error(err, "error checking for duplicate", "error", err)
-		return nil, nil
-	}
-
-	if duplicate {
-		err := fmt.Sprintf("pool with same image, flavor, provider and github scope already exists: %s", duplicateName)
-		return nil, apierrors.NewBadRequest(err)
-	}
-
 	return nil, nil
 }
 

api/v1alpha1/repository_conversion.go

@@ -4,8 +4,19 @@ import (
 	"github.com/mercedes-benz/garm-operator/api/v1beta1"
 	v1 "k8s.io/api/core/v1"
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
+var _ conversion.Convertible = &Repository{}
+
+func (r *Repository) ConvertTo(dstRaw conversion.Hub) error {
+	return Convert_v1alpha1_Repository_To_v1beta1_Repository(r, dstRaw.(*v1beta1.Repository), nil)
+}
+
+func (r *Repository) ConvertFrom(dstRaw conversion.Hub) error {
+	return Convert_v1beta1_Repository_To_v1alpha1_Repository(dstRaw.(*v1beta1.Repository), r, nil)
+}
+
 func Convert_v1alpha1_RepositorySpec_To_v1beta1_RepositorySpec(in *RepositorySpec, out *v1beta1.RepositorySpec, s apiconversion.Scope) error {
 	out.CredentialsRef = v1.TypedLocalObjectReference{
 		Name:     in.CredentialsName,

api/v1alpha1/runner_conversion.go

@@ -0,0 +1,16 @@
+package v1alpha1
+
+import (
+	"github.com/mercedes-benz/garm-operator/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+)
+
+var _ conversion.Convertible = &Runner{}
+
+func (r *Runner) ConvertTo(dstRaw conversion.Hub) error {
+	return Convert_v1alpha1_Runner_To_v1beta1_Runner(r, dstRaw.(*v1beta1.Runner), nil)
+}
+
+func (r *Runner) ConvertFrom(dstRaw conversion.Hub) error {
+	return Convert_v1beta1_Runner_To_v1alpha1_Runner(dstRaw.(*v1beta1.Runner), r, nil)
+}

api/v1alpha1/runner_webhook.go

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+
+package v1alpha1
+
+import (
+	ctrl "sigs.k8s.io/controller-runtime"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+)
+
+// log is for logging in this package.
+var runnerlog = logf.Log.WithName("runner-resource")
+
+func (r *Runner) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
+		Complete()
+}

cmd/main.go

@@ -5,14 +5,13 @@ package main
 import (
 	"context"
 	"fmt"
-	"log"
-
 	"gopkg.in/yaml.v2"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/klog/v2/textlogger"
+	"log"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -153,18 +152,6 @@ func run() error {
 		return fmt.Errorf("unable to create controller Pool: %w", err)
 	}
 
-	if err = (&garmoperatorv1alpha1.Pool{}).SetupWebhookWithManager(mgr); err != nil {
-		return fmt.Errorf("unable to create webhook Pool: %w", err)
-	}
-
-	if err = (&garmoperatorv1alpha1.Image{}).SetupWebhookWithManager(mgr); err != nil {
-		return fmt.Errorf("unable to create webhook Image: %w", err)
-	}
-
-	if err = (&garmoperatorv1alpha1.Repository{}).SetupWebhookWithManager(mgr); err != nil {
-		return fmt.Errorf("unable to create webhook Repository: %w", err)
-	}
-
 	if err = (&garmcontroller.OrganizationReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
@@ -234,6 +221,43 @@ func run() error {
 	}).SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("unable to create controller GitHubCredentials: %w", err)
 	}
+
+	// webhooks
+	if err = (&garmoperatorv1alpha1.Enterprise{}).SetupWebhookWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to create webhook Enterprise: %w", err)
+	}
+
+	if err = (&garmoperatorv1alpha1.Organization{}).SetupWebhookWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to create webhook Organization: %w", err)
+	}
+
+	if err = (&garmoperatorv1alpha1.Pool{}).SetupWebhookWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to create webhook Pool: %w", err)
+	}
+
+	if err = (&garmoperatorv1beta1.Pool{}).SetupWebhookWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to create webhook Pool: %w", err)
+	}
+
+	if err = (&garmoperatorv1alpha1.Image{}).SetupWebhookWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to create webhook Image: %w", err)
+	}
+
+	if err = (&garmoperatorv1beta1.Image{}).SetupWebhookWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to create webhook Image: %w", err)
+	}
+
+	if err = (&garmoperatorv1alpha1.Repository{}).SetupWebhookWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to create webhook Repository: %w", err)
+	}
+
+	if err = (&garmoperatorv1beta1.Repository{}).SetupWebhookWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to create webhook Repository: %w", err)
+	}
+
+	if err = (&garmoperatorv1alpha1.Runner{}).SetupWebhookWithManager(mgr); err != nil {
+		return fmt.Errorf("unable to create webhook Runner: %w", err)
+	}
 	//+kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {