mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-29 10:55:05 +00:00
Code Activity

fix: kind wash in mutate policy helper (#3698)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>
This commit is contained in:
Charles-Edouard Brétéché 2022-04-27 16:08:31 +02:00 • committed by GitHub
parent 8b36441cd1
commit b689f1f15c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/kyverno/v1/policy_test.go
View file

@ -34,8 +34,8 @@ func Test_Policy_IsNamespaced(t *testing.T) {
Name: "this-is-a-way-too-long-policy-name-that-should-trigger-an-error-when-calling-the-policy-validation-method",
},
}
assert.Equal(t, namespaced.IsNamespaced(), false)
assert.Equal(t, notNamespaced.IsNamespaced(), false)
assert.Equal(t, namespaced.IsNamespaced(), true)
assert.Equal(t, notNamespaced.IsNamespaced(), true)
}
func Test_Policy_Autogen_All(t *testing.T) {

2
api/kyverno/v1/policy_types.go
View file

@ -84,7 +84,7 @@ func (p *Policy) GetSpec() *Spec {
// IsNamespaced indicates if the policy is namespace scoped
func (p *Policy) IsNamespaced() bool {
return false
return true
}
// IsReady indicates if the policy is ready to serve the admission request

20
cmd/cli/kubectl-kyverno/utils/common/common.go
View file

@ -189,13 +189,21 @@ func MutatePolicy(policy v1.PolicyInterface, logger logr.Logger) (v1.PolicyInter
if err != nil {
return nil, sanitizederror.NewWithError(fmt.Sprintf("failed to apply %s policy", policy.GetName()), err)
}
var p v1.ClusterPolicy
err = json.Unmarshal(modifiedPolicy, &p)
if err != nil {
return nil, sanitizederror.NewWithError(fmt.Sprintf("failed to unmarshal %s policy", policy.GetName()), err)
if policy.IsNamespaced() {
var p v1.Policy
err = json.Unmarshal(modifiedPolicy, &p)
if err != nil {
return nil, sanitizederror.NewWithError(fmt.Sprintf("failed to unmarshal %s policy", policy.GetName()), err)
}
return &p, nil
} else {
var p v1.ClusterPolicy
err = json.Unmarshal(modifiedPolicy, &p)
if err != nil {
return nil, sanitizederror.NewWithError(fmt.Sprintf("failed to unmarshal %s policy", policy.GetName()), err)
}
return &p, nil
}
return &p, nil
}
// IsInputFromPipe - check if input is passed using pipe