fix: move conversion webhooks to hub version API (v1alpha3) (#992)

Signed-off-by: odubajDT <[email protected]>
keptn · Mar 8, 2023 · b2bb268 · b2bb268
1 parent 419663a
commit b2bb268
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 34 deletions.
diff --git a/operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_webhook.go b/operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_webhook.go
diff --git a/...is/lifecycle/v1alpha2/keptnapp_webhook.go → ...is/lifecycle/v1alpha3/keptnapp_webhook.go b/...is/lifecycle/v1alpha2/keptnapp_webhook.go → ...is/lifecycle/v1alpha3/keptnapp_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1alpha3
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"

diff --git a/...cycle/v1alpha2/keptnappversion_webhook.go → ...cycle/v1alpha3/keptnappversion_webhook.go b/...cycle/v1alpha2/keptnappversion_webhook.go → ...cycle/v1alpha3/keptnappversion_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1alpha3
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"

diff --git a/operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_webhook.go b/operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_webhook.go
@@ -0,0 +1,11 @@
+package v1alpha3
+
+import (
+	ctrl "sigs.k8s.io/controller-runtime"
+)
+
+func (r *KeptnEvaluationProvider) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
+		Complete()
+}
diff --git a/...v1alpha2/keptnworkloadinstance_webhook.go → ...v1alpha3/keptnworkloadinstance_webhook.go b/...v1alpha2/keptnworkloadinstance_webhook.go → ...v1alpha3/keptnworkloadinstance_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1alpha3
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"

diff --git a/operator/main.go b/operator/main.go
@@ -268,19 +268,19 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&lifecyclev1alpha2.KeptnApp{}).SetupWebhookWithManager(mgr); err != nil {
+	if err = (&lifecyclev1alpha3.KeptnApp{}).SetupWebhookWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create webhook", "webhook", "KeptnApp")
 		os.Exit(1)
 	}
-	if err = (&lifecyclev1alpha2.KeptnEvaluationProvider{}).SetupWebhookWithManager(mgr); err != nil {
+	if err = (&lifecyclev1alpha3.KeptnEvaluationProvider{}).SetupWebhookWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create webhook", "webhook", "KeptnEvaluationProvider")
 		os.Exit(1)
 	}
-	if err = (&lifecyclev1alpha2.KeptnAppVersion{}).SetupWebhookWithManager(mgr); err != nil {
+	if err = (&lifecyclev1alpha3.KeptnAppVersion{}).SetupWebhookWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create webhook", "webhook", "KeptnAppVersion")
 		os.Exit(1)
 	}
-	if err = (&lifecyclev1alpha2.KeptnWorkloadInstance{}).SetupWebhookWithManager(mgr); err != nil {
+	if err = (&lifecyclev1alpha3.KeptnWorkloadInstance{}).SetupWebhookWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create webhook", "webhook", "KeptnWorkloadInstance")
 		os.Exit(1)
 	}