Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: policy group plural name #890

Merged
merged 3 commits into from
Sep 23, 2024
Merged

fix: policy group plural name #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79a5a49
fix: group resource plural name in webhook manifests
fabriziosestito Sep 23, 2024
7b2eadb
fix: group resource plural name in webhook rbac generation
fabriziosestito Sep 23, 2024
755dd7b
chore: fix policy group plural variable naming
fabriziosestito Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/policies/v1/admissionpolicygroup_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}

Expand All @@ -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{}

Expand Down
4 changes: 2 additions & 2 deletions api/policies/v1/clusteradmissionpolicygroup_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}

Expand All @@ -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{}

Expand Down
8 changes: 4 additions & 4 deletions config/webhook/manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ webhooks:
- CREATE
- UPDATE
resources:
- admissionpoliciesgroup
- admissionpolicygroups
sideEffects: None
- admissionReviewVersions:
- v1
Expand Down Expand Up @@ -86,7 +86,7 @@ webhooks:
- CREATE
- UPDATE
resources:
- clusteradmissionpoliciesgroup
- clusteradmissionpolicygroups
sideEffects: None
- admissionReviewVersions:
- v1
Expand Down Expand Up @@ -155,7 +155,7 @@ webhooks:
- CREATE
- UPDATE
resources:
- admissionpoliciesgroup
- admissionpolicygroups
sideEffects: None
- admissionReviewVersions:
- v1
Expand Down Expand Up @@ -197,7 +197,7 @@ webhooks:
- CREATE
- UPDATE
resources:
- clusteradmissionpoliciesgroup
- clusteradmissionpolicygroups
sideEffects: None
- admissionReviewVersions:
- v1
Expand Down
16 changes: 8 additions & 8 deletions internal/controller/policyserver_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
Expand Down
Loading