🐛 fix webhook pluralization

Signed-off-by: Alexander Eldeib <[email protected]>

Author: alexeldeib

api/v1alpha3/azurecluster_validation.go

@@ -74,7 +74,7 @@ func validateNetworkSpec(networkSpec NetworkSpec, fldPath *field.Path) field.Err
 
 // validateResourceGroup validates a ResourceGroup
 func validateResourceGroup(resourceGroup string, fldPath *field.Path) *field.Error {
-	if success, _ := regexp.Match(resourceGroupRegex, []byte(resourceGroup)); !success {
+	if success, _ := regexp.MatchString(resourceGroupRegex, resourceGroup); !success {
 		return field.Invalid(fldPath, resourceGroup,
 			fmt.Sprintf("resourceGroup doesn't match regex %s", resourceGroupRegex))
 	}

api/v1alpha3/azurecluster_webhook.go

@@ -32,7 +32,7 @@ func (c *AzureCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update;delete,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha3-azurecluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=azurecluster,versions=v1alpha3,name=validation.azurecluster.infrastructure.cluster.x-k8s.io,sideEffects=None
+// +kubebuilder:webhook:verbs=create;update;delete,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha3-azurecluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=azureclusters,versions=v1alpha3,name=validation.azurecluster.infrastructure.cluster.x-k8s.io,sideEffects=None
 
 var _ webhook.Validator = &AzureCluster{}
 

api/v1alpha3/azuremachine_webhook.go

@@ -35,7 +35,7 @@ func (m *AzureMachine) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha3-azuremachine,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=azuremachine,versions=v1alpha3,name=validation.azuremachine.infrastructure.cluster.x-k8s.io,sideEffects=None
+// +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1alpha3-azuremachine,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=azuremachines,versions=v1alpha3,name=validation.azuremachine.infrastructure.cluster.x-k8s.io,sideEffects=None
 
 var _ webhook.Validator = &AzureMachine{}
 

config/webhook/manifests.yaml

@@ -53,7 +53,7 @@ webhooks:
     - UPDATE
     - DELETE
     resources:
-    - azurecluster
+    - azureclusters
   sideEffects: None
 - clientConfig:
     caBundle: Cg==
@@ -73,7 +73,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - azuremachine
+    - azuremachines
   sideEffects: None
 - clientConfig:
     caBundle: Cg==

config/webhook/webhookcainjection_patch.yaml

@@ -2,12 +2,12 @@
 # This patch add annotation to admission webhook config and
 # the variables $(CERTIFICATE_NAMESPACE) and $(CERTIFICATE_NAME) will be substituted by kustomize.
 # uncomment the following lines to enable mutating and validating webhook
-#apiVersion: admissionregistration.k8s.io/v1beta1
-#kind: MutatingWebhookConfiguration
-#metadata:
-#  name: mutating-webhook-configuration
-#  annotations:
-#    cert-manager.k8s.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
+apiVersion: admissionregistration.k8s.io/v1beta1
+kind: MutatingWebhookConfiguration
+metadata:
+ name: mutating-webhook-configuration
+ annotations:
+   cert-manager.k8s.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
 ---
 apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration

test/e2e/azure_suite_test.go

@@ -128,6 +128,7 @@ var _ = BeforeSuite(func() {
 	framework.InstallComponents(ctx, mgmt, capi, cabpk, kcp, infra)
 	framework.WaitForPodsReadyInNamespace(ctx, mgmt, "capi-system")
 	framework.WaitForPodsReadyInNamespace(ctx, mgmt, "capz-system")
+	framework.WaitForPodsReadyInNamespace(ctx, mgmt, "capi-webhook-system")
 
 	// go func() {
 	// 	defer GinkgoRecover()