Merge pull request #890 from fabriziosestito/fix/policy-group-plural-…

…name fix: policy group plural name
kubewarden · Sep 23, 2024 · 10976c9 · 10976c9
2 parents 728d169 + 755dd7b
commit 10976c9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/api/policies/v1/admissionpolicygroup_webhook.go b/api/policies/v1/admissionpolicygroup_webhook.go
@@ -43,7 +43,7 @@ func (r *AdmissionPolicyGroup) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return nil
 }
 
-//+kubebuilder:webhook:path=/mutate-policies-kubewarden-io-v1-admissionpolicygroup,mutating=true,failurePolicy=fail,sideEffects=None,groups=policies.kubewarden.io,resources=admissionpoliciesgroup,verbs=create;update,versions=v1,name=madmissionpolicygroup.kb.io,admissionReviewVersions={v1,v1beta1}
+//+kubebuilder:webhook:path=/mutate-policies-kubewarden-io-v1-admissionpolicygroup,mutating=true,failurePolicy=fail,sideEffects=None,groups=policies.kubewarden.io,resources=admissionpolicygroups,verbs=create;update,versions=v1,name=madmissionpolicygroup.kb.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Defaulter = &AdmissionPolicyGroup{}
 
@@ -59,7 +59,7 @@ func (r *AdmissionPolicyGroup) Default() {
 	}
 }
 
-//+kubebuilder:webhook:path=/validate-policies-kubewarden-io-v1-admissionpolicygroup,mutating=false,failurePolicy=fail,sideEffects=None,groups=policies.kubewarden.io,resources=admissionpoliciesgroup,verbs=create;update,versions=v1,name=vadmissionpolicygroup.kb.io,admissionReviewVersions={v1,v1beta1}
+//+kubebuilder:webhook:path=/validate-policies-kubewarden-io-v1-admissionpolicygroup,mutating=false,failurePolicy=fail,sideEffects=None,groups=policies.kubewarden.io,resources=admissionpolicygroups,verbs=create;update,versions=v1,name=vadmissionpolicygroup.kb.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Validator = &AdmissionPolicyGroup{}
 

diff --git a/api/policies/v1/clusteradmissionpolicygroup_webhook.go b/api/policies/v1/clusteradmissionpolicygroup_webhook.go
@@ -45,7 +45,7 @@ func (r *ClusterAdmissionPolicyGroup) SetupWebhookWithManager(mgr ctrl.Manager)
 	return nil
 }
 
-//+kubebuilder:webhook:path=/mutate-policies-kubewarden-io-v1-clusteradmissionpolicygroup,mutating=true,failurePolicy=fail,sideEffects=None,groups=policies.kubewarden.io,resources=clusteradmissionpoliciesgroup,verbs=create;update,versions=v1,name=mclusteradmissionpolicygroup.kb.io,admissionReviewVersions={v1,v1beta1}
+//+kubebuilder:webhook:path=/mutate-policies-kubewarden-io-v1-clusteradmissionpolicygroup,mutating=true,failurePolicy=fail,sideEffects=None,groups=policies.kubewarden.io,resources=clusteradmissionpolicygroups,verbs=create;update,versions=v1,name=mclusteradmissionpolicygroup.kb.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Defaulter = &ClusterAdmissionPolicyGroup{}
 
@@ -60,7 +60,7 @@ func (r *ClusterAdmissionPolicyGroup) Default() {
 	}
 }
 
-//+kubebuilder:webhook:path=/validate-policies-kubewarden-io-v1-clusteradmissionpolicygroup,mutating=false,failurePolicy=fail,sideEffects=None,groups=policies.kubewarden.io,resources=clusteradmissionpoliciesgroup,verbs=create;update,versions=v1,name=vclusteradmissionpolicygroup.kb.io,admissionReviewVersions={v1,v1beta1}
+//+kubebuilder:webhook:path=/validate-policies-kubewarden-io-v1-clusteradmissionpolicygroup,mutating=false,failurePolicy=fail,sideEffects=None,groups=policies.kubewarden.io,resources=clusteradmissionpolicygroups,verbs=create;update,versions=v1,name=vclusteradmissionpolicygroup.kb.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Validator = &ClusterAdmissionPolicyGroup{}
 

diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -44,7 +44,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - admissionpoliciesgroup
+    - admissionpolicygroups
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -86,7 +86,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - clusteradmissionpoliciesgroup
+    - clusteradmissionpolicygroups
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -155,7 +155,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - admissionpoliciesgroup
+    - admissionpolicygroups
   sideEffects: None
 - admissionReviewVersions:
   - v1
@@ -197,7 +197,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - clusteradmissionpoliciesgroup
+    - clusteradmissionpolicygroups
   sideEffects: None
 - admissionReviewVersions:
   - v1

diff --git a/internal/controller/policyserver_controller.go b/internal/controller/policyserver_controller.go
@@ -303,17 +303,17 @@ func (r *PolicyServerReconciler) getPolicies(ctx context.Context, policyServer *
 		return nil, err
 	}
 
-	var admissionPoliciesGroup policiesv1.AdmissionPolicyGroupList
-	err = r.Client.List(ctx, &admissionPoliciesGroup, client.MatchingFields{constants.PolicyServerIndexKey: policyServer.Name})
+	var admissionPolicyGroupList policiesv1.AdmissionPolicyGroupList
+	err = r.Client.List(ctx, &admissionPolicyGroupList, client.MatchingFields{constants.PolicyServerIndexKey: policyServer.Name})
 	if err != nil && apierrors.IsNotFound(err) {
-		err = fmt.Errorf("failed obtaining AdmissionPoliciesGroups: %w", err)
+		err = fmt.Errorf("failed obtaining AdmissionPolicyGroups: %w", err)
 		return nil, err
 	}
 
-	var clusterAdmissionPoliciesGroup policiesv1.ClusterAdmissionPolicyGroupList
-	err = r.Client.List(ctx, &clusterAdmissionPoliciesGroup, client.MatchingFields{constants.PolicyServerIndexKey: policyServer.Name})
+	var clusterAdmissionPolicyGroupList policiesv1.ClusterAdmissionPolicyGroupList
+	err = r.Client.List(ctx, &clusterAdmissionPolicyGroupList, client.MatchingFields{constants.PolicyServerIndexKey: policyServer.Name})
 	if err != nil && apierrors.IsNotFound(err) {
-		err = fmt.Errorf("failed obtaining ClusterAdmissionPoliciesGroup: %w", err)
+		err = fmt.Errorf("failed obtaining ClusterAdmissionPolicyGroups: %w", err)
 		return nil, err
 	}
 
@@ -324,10 +324,10 @@ func (r *PolicyServerReconciler) getPolicies(ctx context.Context, policyServer *
 	for _, admissionPolicy := range admissionPolicies.Items {
 		policies = append(policies, admissionPolicy.DeepCopy())
 	}
-	for _, admissionPolicyGroup := range admissionPoliciesGroup.Items {
+	for _, admissionPolicyGroup := range admissionPolicyGroupList.Items {
 		policies = append(policies, admissionPolicyGroup.DeepCopy())
 	}
-	for _, clusterAdmissionPolicyGroup := range clusterAdmissionPoliciesGroup.Items {
+	for _, clusterAdmissionPolicyGroup := range clusterAdmissionPolicyGroupList.Items {
 		policies = append(policies, clusterAdmissionPolicyGroup.DeepCopy())
 	}
 	return policies, nil