chore: delete valiedate webhook and default webhook for emqx

PROJECT

@@ -126,8 +126,6 @@ resources:
   version: v2beta1
   webhooks:
     conversion: true
-    defaulting: true
-    validation: true
     webhookVersion: v1
 - api:
     crdVersion: v1

apis/apps/v2beta1/webhook_suite_test.go

@@ -99,9 +99,6 @@ var _ = BeforeSuite(func() {
 	})
 	Expect(err).NotTo(HaveOccurred())
 
-	err = (&EMQX{}).SetupWebhookWithManager(mgr)
-	Expect(err).NotTo(HaveOccurred())
-
 	err = (&Rebalance{}).SetupWebhookWithManager(mgr)
 	Expect(err).NotTo(HaveOccurred())
 

config/webhook/manifests.yaml

@@ -5,27 +5,6 @@ metadata:
   creationTimestamp: null
   name: mutating-webhook-configuration
 webhooks:
-- admissionReviewVersions:
-  - v1
-  - v1beta1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /mutate-apps-emqx-io-v2beta1-emqx
-  failurePolicy: Fail
-  name: mutating.apps.emqx.io
-  rules:
-  - apiGroups:
-    - apps.emqx.io
-    apiVersions:
-    - v2beta1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - emqxes
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1
@@ -96,27 +75,6 @@ metadata:
   creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
-- admissionReviewVersions:
-  - v1
-  - v1beta1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /validate-apps-emqx-io-v2beta1-emqx
-  failurePolicy: Fail
-  name: validator.apps.emqx.io
-  rules:
-  - apiGroups:
-    - apps.emqx.io
-    apiVersions:
-    - v2beta1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - emqxes
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1

controllers/apps/v2beta1/add_emqx_core_test.go

@@ -25,8 +25,6 @@ func TestGenerateStatefulSet(t *testing.T) {
 		},
 	}
 	instance.Spec.CoreTemplate.Spec.Replicas = pointer.Int32(3)
-	instance.Default()
-	assert.Nil(t, instance.ValidateCreate())
 
 	t.Run("check metadata", func(t *testing.T) {
 		emqx := instance.DeepCopy()

controllers/apps/v2beta1/add_emqx_repl_suite_test.go

@@ -56,7 +56,6 @@ var _ = Describe("Check add repl controller", Ordered, Label("repl"), func() {
 				},
 			},
 		}
-		instance.Default()
 	})
 
 	It("create namespace", func() {

controllers/apps/v2beta1/suite_test.go

@@ -79,7 +79,6 @@ var _ = BeforeSuite(func() {
 	timeout = time.Second * 5
 	interval = time.Millisecond * 500
 	ctx = context.TODO()
-	emqx.Default()
 
 	Expect(os.Setenv("USE_EXISTING_CLUSTER", "false")).To(Succeed())
 

deploy/charts/emqx-operator/templates/webhook-mutating-configuration.yaml

@@ -6,27 +6,6 @@ metadata:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert
   name: {{ include "emqx-operator.fullname" . }}-mutating-webhook-configuration
 webhooks:
-- admissionReviewVersions:
-  - v1
-  - v1beta1
-  clientConfig:
-    service:
-      name: {{ include "emqx-operator.fullname" . }}-webhook-service
-      namespace: {{ .Release.Namespace }}
-      path: /mutate-apps-emqx-io-v2beta1-emqx
-  failurePolicy: Fail
-  name: mutating.apps.emqx.io
-  rules:
-  - apiGroups:
-    - apps.emqx.io
-    apiVersions:
-    - v2beta1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - emqxes
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1

deploy/charts/emqx-operator/templates/webhook-validating-configuration.yaml

@@ -6,27 +6,6 @@ metadata:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert
   name: {{ include "emqx-operator.fullname" . }}-validating-webhook-configuration
 webhooks:
-- admissionReviewVersions:
-  - v1
-  - v1beta1
-  clientConfig:
-    service:
-      name: {{ include "emqx-operator.fullname" . }}-webhook-service
-      namespace: {{ .Release.Namespace }}
-      path: /validate-apps-emqx-io-v2beta1-emqx
-  failurePolicy: Fail
-  name: validator.apps.emqx.io
-  rules:
-  - apiGroups:
-    - apps.emqx.io
-    apiVersions:
-    - v2beta1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - emqxes
-  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1

e2e/v2beta1/e2e_rebalance_test.go

@@ -47,7 +47,6 @@ var _ = Describe("EMQX 5 Rebalance Test", Label("rebalance"), func() {
 	BeforeEach(func() {
 		instance = genEMQX().DeepCopy()
 		instance.Spec.Image = "emqx/emqx-enterprise:5.1"
-		instance.Default()
 	})
 
 	Context("EMQX is not found", func() {
@@ -135,8 +134,6 @@ var _ = Describe("EMQX 5 Rebalance Test", Label("rebalance"), func() {
 				// create EMQX CR
 				instance.Spec.ReplicantTemplate = nil
 				instance.Spec.CoreTemplate.Spec.Replicas = pointer.Int32Ptr(2)
-				instance.Default()
-				Expect(instance.ValidateCreate()).Should(Succeed())
 				Expect(k8sClient.Create(context.TODO(), instance)).Should(Succeed())
 
 				// check EMQX CR if created successfully
@@ -209,8 +206,6 @@ var _ = Describe("EMQX 5 Rebalance Test", Label("rebalance"), func() {
 				// create EMQX CR
 				instance.Spec.ReplicantTemplate = nil
 				instance.Spec.CoreTemplate.Spec.Replicas = pointer.Int32Ptr(2)
-				instance.Default()
-				Expect(instance.ValidateCreate()).Should(Succeed())
 				Expect(k8sClient.Create(context.TODO(), instance)).Should(Succeed())
 
 				// check EMQX CR if created successfully

e2e/v2beta1/e2e_test.go

@@ -42,8 +42,6 @@ var _ = Describe("E2E Test", Label("base"), Ordered, func() {
 		JustBeforeEach(func() {
 			instance.Spec.ReplicantTemplate = nil
 			instance.Spec.CoreTemplate.Spec.Replicas = pointer.Int32Ptr(2)
-			instance.Default()
-			Expect(instance.ValidateCreate()).Should(Succeed())
 		})
 
 		It("should create namespace and EMQX CR", func() {
@@ -286,7 +284,6 @@ var _ = Describe("E2E Test", Label("base"), Ordered, func() {
 					Replicas: pointer.Int32Ptr(2),
 				},
 			}
-			instance.Default()
 			Expect(k8sClient.Update(context.TODO(), instance)).Should(Succeed())
 		})
 

e2e/v2beta1/suite_test.go

@@ -178,6 +178,5 @@ func genEMQX() *appsv2beta1.EMQX {
 			},
 		},
 	}
-	emqx.Default()
 	return emqx
 }

main.go

@@ -150,11 +150,6 @@ func main() {
 			os.Exit(1)
 		}
 
-		if err = (&appsv2beta1.EMQX{}).SetupWebhookWithManager(mgr); err != nil {
-			setupLog.Error(err, "unable to create webhook", "webhook", "EMQX")
-			os.Exit(1)
-		}
-
 		if err = (&appsv2beta1.Rebalance{}).SetupWebhookWithManager(mgr); err != nil {
 			setupLog.Error(err, "unable to create webhook", "webhook", "Rebalance")
 			os.Exit(1)