Merge pull request #756 from netgroup-polito/qcfe/remove-tenant-v1alpha1

netgroup-polito · Feb 22, 2022 · d5434fb · d5434fb
2 parents 7b06dbe + 49f2a91
commit d5434fb
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 537 deletions.
diff --git a/operators/README.md b/operators/README.md
@@ -249,7 +249,7 @@ make run-tenant
 
 For a deeper definition go to
 
-- `Tenant` [GoLang code version](./api/v1alpha1/tenant_types.go)
+- `Tenant` [GoLang code version](./api/v1alpha2/tenant_types.go)
 - `Tenant` [YAML version](./deploy/crds/crownlabs.polito.it_tenants.yaml)
 - `Workspace` [GoLang code version](./api/v1alpha1/workspace_types.go)
 - `Workspace` [YAML version](./deploy/crds/crownlabs.polito.it_workspaces.yaml)

diff --git a/operators/api/v1alpha1/tenant_conversion.go b/operators/api/v1alpha1/tenant_conversion.go
diff --git a/operators/api/v1alpha1/tenant_types.go b/operators/api/v1alpha1/tenant_types.go
diff --git a/operators/api/v1alpha1/zz_generated.deepcopy.go b/operators/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/operators/api/v1alpha2/tenant_types.go b/operators/api/v1alpha2/tenant_types.go
@@ -162,9 +162,6 @@ func init() {
 	SchemeBuilder.Register(&Tenant{}, &TenantList{})
 }
 
-// Hub is to enable conversion webhook.
-func (*Tenant) Hub() {}
-
 // SetupWebhookWithManager setups the webhook with the given manager.
 func (r *Tenant) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).

diff --git a/operators/cmd/tenant-operator/main.go b/operators/cmd/tenant-operator/main.go
@@ -129,15 +129,6 @@ func main() {
 		os.Exit(1)
 	}
 	if *enableWH {
-		if err = (&clv1alpha1.Tenant{}).SetupWebhookWithManager(mgr); err != nil {
-			log.Error(err, "Unable to create conversion webhook", "webhook", "Tenant")
-			os.Exit(1)
-		}
-		if err = (&clv1alpha2.Tenant{}).SetupWebhookWithManager(mgr); err != nil {
-			log.Error(err, "Unable to create conversion webhook", "webhook", "Tenant")
-			os.Exit(1)
-		}
-
 		hookServer := mgr.GetWebhookServer()
 		webhookBypassGroupsList := strings.Split(webhookBypassGroups, ",")
 		hookServer.Register(ValidatingWebhookPath, tenantwh.MakeTenantValidator(mgr.GetClient(), webhookBypassGroupsList))