uses CEL instead of webhook validation

nutanix-cloud-native · Dec 10, 2024 · 61dc326 · 61dc326
1 parent 4651c5b
commit 61dc326
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 124 deletions.
diff --git a/api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml b/api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml
@@ -668,6 +668,9 @@ spec:
                     - controlPlaneEndpoint
                     - prismCentralEndpoint
                   type: object
+                  x-kubernetes-validations:
+                    - message: Prism Central URL must not match the control plane endpoint IP
+                      rule: isURL(self.prismCentralEndpoint.url) && (url(self.prismCentralEndpoint.url).getHostname() != self.controlPlaneEndpoint.host)
                 proxy:
                   description: HTTPProxy required for providing proxy configuration.
                   properties:

diff --git a/api/v1alpha1/nutanix_clusterconfig_types.go b/api/v1alpha1/nutanix_clusterconfig_types.go
@@ -14,6 +14,7 @@ const (
 )
 
 // NutanixSpec defines the desired state of NutanixCluster.
+// +kubebuilder:validation:XValidation:rule="isURL(self.prismCentralEndpoint.url) && (url(self.prismCentralEndpoint.url).getHostname() != self.controlPlaneEndpoint.host)", message="Prism Central URL must not match the control plane endpoint IP"
 type NutanixSpec struct {
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// host can be either DNS name or ip address

diff --git a/pkg/webhook/cluster/nutanix_validator.go b/pkg/webhook/cluster/nutanix_validator.go
diff --git a/pkg/webhook/cluster/validator.go b/pkg/webhook/cluster/validator.go
@@ -11,6 +11,5 @@ import (
 func NewValidator(client ctrlclient.Client, decoder admission.Decoder) admission.Handler {
 	return admission.MultiValidatingHandler(
 		NewClusterUUIDLabeler(client, decoder).Validator(),
-		NewNutanixValidator(client, decoder).Validator(),
 	)
 }