update TestClusterValidation

Signed-off-by: hejianpeng <hejianpeng2@huawei.com>

hack/update-crdgen.sh

@@ -17,4 +17,5 @@ do
 done
 
 echo "running kustomize to generate the final CRD"
-kubectl kustomize manifests/charts/ -o "${CRD_PATH}"/infrastructure.cluster.x-k8s.io_customclusters.yaml
+kubectl kustomize manifests/charts/base -o "${CRD_PATH}"/infrastructure.cluster.x-k8s.io_customclusters.yaml
+kubectl kustomize manifests/charts/cluster-operator -o "${WEBHOOK_PATH}"/manifests.yaml

manifests/charts/base/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - templates/infrastructure.cluster.x-k8s.io_customclusters.yaml
+commonLabels:
+  cluster.x-k8s.io/v1beta1: v1alpha1

manifests/charts/cluster-operator/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - templates/manifests.yaml
+namePrefix: cluster-operator-

manifests/charts/base/templates/manifests.yaml → manifests/charts/cluster-operator/templates/manifests.yaml

@@ -1,9 +1,8 @@
----
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   creationTimestamp: null
-  name: mutating-webhook-configuration
+  name: cluster-operator-cluster-operatormutating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
   - v1alpha1
@@ -31,7 +30,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   creationTimestamp: null
-  name: validating-webhook-configuration
+  name: cluster-operator-cluster-operatorvalidating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
   - v1alpha1

pkg/webhooks/cluster_webhook.go

@@ -91,7 +91,7 @@ func validateInfra(in *v1.Cluster) field.ErrorList {
 		allErrs = append(allErrs, field.Required(field.NewPath("spec", "infraType"), "must be set"))
 	}
 
-	if in.Spec.Region == "" {
+	if in.Spec.InfraType == v1.AWSClusterInfraType && in.Spec.Region == "" {
 		allErrs = append(allErrs, field.Required(field.NewPath("spec", "region"), "must be set"))
 	}
 

pkg/webhooks/cluster_webhook_test.go

@@ -63,6 +63,34 @@ func TestClusterDefault(t *testing.T) {
 	g.Expect(c.Spec.Network.ServiceCIDRs).To(Equal(v1.CIDRBlocks{defaultServiceCIDR}))
 }
 
+func TestClusterValidation(t *testing.T) {
+	// read configuration from examples directory
+	r := path.Join("../../manifests/examples", "infra")
+	caseNames := make([]string, 0)
+	err := filepath.WalkDir(r, func(path string, d fs.DirEntry, err error) error {
+		if d.IsDir() {
+			return nil
+		}
+
+		caseNames = append(caseNames, path)
+
+		return nil
+	})
+	assert.NoError(t, err)
+
+	wh := &ClusterWebhook{}
+	for _, tt := range caseNames {
+		t.Run(tt, func(t *testing.T) {
+			g := NewWithT(t)
+			c, err := readCluster(tt)
+			g.Expect(err).NotTo(HaveOccurred())
+
+			err = wh.validate(c)
+			g.Expect(err).NotTo(HaveOccurred())
+		})
+	}
+}
+
 func TestInvalidClusterValidation(t *testing.T) {
 	r := path.Join("testdata", "cluster")
 	caseNames := make([]string, 0)

pkg/webhooks/testdata/cluster/aws-miss-region.yaml

@@ -0,0 +1,25 @@
+apiVersion: cluster.kurator.dev/v1alpha1
+kind: Cluster
+metadata:
+  name: quickstart
+  namespace: default
+spec:
+  infraType: aws
+  credential:
+    secretRef: quickstart
+  version: v1.23.0
+  network:
+    vpc:
+      cidrBlock: 10.10.0.0/16
+    podCIDRs:
+      - 192.168.0.0/16
+    serviceCIDRs:
+      - 10.96.0.0/12
+    cni:
+      type: calico
+  master:
+    replicas: 1
+    instanceType: t3.large
+  workers:
+    - replicas: 1
+      instanceType: t3.large