Fix #1446 :Failed to mutate policy #1767
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: vyankatesh <vyankatesh@neualto.com>
vyankyGH
force-pushed
the
bug/failed_to_mutate_policy
branch
from
d55803c
to
bf2d4a9
Compare
vyankyGH
changed the title
Signed-off-by: vyankatesh <vyankatesh@neualto.com>
vyankyGH
force-pushed
the
bug/failed_to_mutate_policy
branch
from
68eb4f9
to
9e2fa71
Compare
vyankyGH
force-pushed
the
bug/failed_to_mutate_policy
branch
from
4852da4
to
e534a2c
Compare
vyankyGH
force-pushed
the
bug/failed_to_mutate_policy
branch
from
3c9240a
to
27ff1b5
Compare
…kyGH/kyverno into bug/failed_to_mutate_policy Signed-off-by: vyankatesh <vyankatesh@neualto.com>
vyankyGH
force-pushed
the
bug/failed_to_mutate_policy
branch
from
27ff1b5
to
f58bb3a
Compare
realshuting
requested changes
Apr 7, 2021
pkg/policy/validate_controller.go
Outdated
| @@ -251,6 +274,14 @@ func (pc *PolicyController) addNsPolicy(obj interface{}) { | |||
| logger.Info("policy created", "uid", p.UID, "kind", "Policy", "name", p.Name, "namespaces", p.Namespace) | |||
|
|
|||
| pol := ConvertPolicyToClusterPolicy(p) | |||
| if pol.Spec.Background == nil || pol.Spec.ValidationFailureAction == "" || checkAutoGenRules(pol) { | |||
| pol.ObjectMeta.SetAnnotations(map[string]string{"kyverno.io/mutate-policy": strconv.Itoa(random.Intn(100))}) | |||
| pol.SetGroupVersionKind(schema.GroupVersionKind{Group: "kyverno.io", Version: "v1", Kind: "ClusterPolicy"}) | |||
pkg/policy/validate_controller.go
Outdated
| if pol.Spec.Background == nil || pol.Spec.ValidationFailureAction == "" || checkAutoGenRules(pol) { | ||
| pol.ObjectMeta.SetAnnotations(map[string]string{"kyverno.io/mutate-policy": strconv.Itoa(random.Intn(100))}) | ||
| pol.SetGroupVersionKind(schema.GroupVersionKind{Group: "kyverno.io", Version: "v1", Kind: "ClusterPolicy"}) | ||
| _, err := pc.client.UpdateResource("kyverno.io/v1", "ClusterPolicy", p.Namespace, pol, false) |
pkg/policy/validate_controller.go
Outdated
|
|
||
| if ncurP.Spec.Background == nil || ncurP.Spec.ValidationFailureAction == "" || checkAutoGenRules(ncurP) { | ||
| ncurP.ObjectMeta.SetAnnotations(map[string]string{"kyverno.io/mutate-policy": strconv.Itoa(random.Intn(100))}) | ||
| ncurP.SetGroupVersionKind(schema.GroupVersionKind{Group: "kyverno.io", Version: "v1", Kind: "ClusterPolicy"}) |
pkg/policy/validate_controller.go
Outdated
| if ncurP.Spec.Background == nil || ncurP.Spec.ValidationFailureAction == "" || checkAutoGenRules(ncurP) { | ||
| ncurP.ObjectMeta.SetAnnotations(map[string]string{"kyverno.io/mutate-policy": strconv.Itoa(random.Intn(100))}) | ||
| ncurP.SetGroupVersionKind(schema.GroupVersionKind{Group: "kyverno.io", Version: "v1", Kind: "ClusterPolicy"}) | ||
| _, err := pc.client.UpdateResource("kyverno.io/v1", "ClusterPolicy", ncurP.GetNamespace(), ncurP, false) |
realshuting
requested changes
Apr 7, 2021
pkg/policy/validate_controller.go
Outdated
| @@ -192,6 +197,15 @@ func (pc *PolicyController) addPolicy(obj interface{}) { | |||
|
|
|||
| logger.Info("policy created", "uid", p.UID, "kind", "ClusterPolicy", "name", p.Name) | |||
|
|
|||
| if p.Spec.Background == nil || p.Spec.ValidationFailureAction == "" || checkAutoGenRules(p) { | |||
| p.ObjectMeta.SetAnnotations(map[string]string{"kyverno.io/mutate-policy": strconv.Itoa(random.Intn(100))}) | |||
| p.SetGroupVersionKind(schema.GroupVersionKind{Group: "kyverno.io", Version: "v1", Kind: "Policy"}) | |||
There was a problem hiding this comment.
This should be ClusterPolicy.
pkg/policy/validate_controller.go
Outdated
| @@ -205,6 +219,15 @@ func (pc *PolicyController) updatePolicy(old, cur interface{}) { | |||
| oldP := old.(*kyverno.ClusterPolicy) | |||
| curP := cur.(*kyverno.ClusterPolicy) | |||
|
|
|||
| if curP.Spec.Background == nil || curP.Spec.ValidationFailureAction == "" || checkAutoGenRules(curP) { | |||
| curP.ObjectMeta.SetAnnotations(map[string]string{"kyverno.io/mutate-policy": strconv.Itoa(random.Intn(100))}) | |||
| curP.SetGroupVersionKind(schema.GroupVersionKind{Group: "kyverno.io", Version: "v1", Kind: "Policy"}) | |||
Signed-off-by: vyankatesh <vyankatesh@neualto.com>
vyankyGH
force-pushed
the
bug/failed_to_mutate_policy
branch
from
3785fe4
to
38f9f53
Compare
realshuting
approved these changes
Apr 7, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Vyankatesh vyankateshkd@gmail.com
Related issue
closes #1446
What type of PR is this
/kind bug
Proposed changes
Checklist