mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

update autogen annotation for pod controllers

Browse source
This commit is contained in:
Shuting Zhao 2019-12-26 10:09:49 -08:00
parent a8aa83573b
commit b5255893e3
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/webhooks/policymutation.go
View file

@ -16,8 +16,8 @@ import (
)
const (
podControllers = "DaemonSet,Deployment,Job,ReplicaSet,StatefulSet"
podControllersAnnotation = "policies.kyverno.io/podcontroller.list"
podControllers = "DaemonSet,Deployment,Job,StatefulSet"
podControllersAnnotation = "policies.kyverno.io/autogen-controllers"
)
func (ws *WebhookServer) handlePolicyMutation(request *v1beta1.AdmissionRequest) *v1beta1.AdmissionResponse {
@ -276,7 +276,7 @@ func generateRuleForControllers(rule kyverno.Rule, controllers string) kyvernoRu
return kyvernoRule{}
}
// defaultPodControllerAnnotation generates annotation "policies.kyverno.io/podcontroller.list=all"
// defaultPodControllerAnnotation generates annotation "policies.kyverno.io/autogen-controllers=all"
// ann passes in the annotation of the policy
func defaultPodControllerAnnotation(ann map[string]string) ([]byte, error) {
if ann == nil {
@ -304,7 +304,7 @@ func defaultPodControllerAnnotation(ann map[string]string) ([]byte, error) {
Op string `json:"op"`
Value interface{} `json:"value"`
}{
"/metadata/annotations/policies.kyverno.io~1podcontroller.list",
"/metadata/annotations/policies.kyverno.io~1autogen-controllers",
"add",
"all",
}

12
pkg/webhooks/policymutation_test.go
View file

@ -40,7 +40,7 @@ func TestGeneratePodControllerRule_NilAnnotation(t *testing.T) {
"metadata": {
"name": "add-safe-to-evict",
"annotations": {
"policies.kyverno.io/podcontroller.list": "all"
"policies.kyverno.io/autogen-controllers": "all"
}
}
}`)
@ -54,7 +54,7 @@ func TestGeneratePodControllerRule_PredefinedAnnotation(t *testing.T) {
"metadata": {
"name": "add-safe-to-evict",
"annotations": {
"policies.kyverno.io/podcontroller.list": "StatefulSet,Pod"
"policies.kyverno.io/autogen-controllers": "StatefulSet,Pod"
}
}
}`)
@ -92,7 +92,7 @@ func TestGeneratePodControllerRule_ExistOtherAnnotation(t *testing.T) {
"metadata": {
"name": "add-safe-to-evict",
"annotations": {
"policies.kyverno.io/podcontroller.list": "all",
"policies.kyverno.io/autogen-controllers": "all",
"test": "annotation"
}
}
@ -243,7 +243,7 @@ func TestGeneratePodControllerRule(t *testing.T) {
"name": "add-safe-to-evict",
"annotations": {
"a": "b",
"policies.kyverno.io/podcontroller.list": "all"
"policies.kyverno.io/autogen-controllers": "all"
}
},
"spec": {
@ -368,7 +368,6 @@ func TestGeneratePodControllerRule(t *testing.T) {
"DaemonSet",
"Deployment",
"Job",
"ReplicaSet",
"StatefulSet"
]
}
@ -402,7 +401,6 @@ func TestGeneratePodControllerRule(t *testing.T) {
"DaemonSet",
"Deployment",
"Job",
"ReplicaSet",
"StatefulSet"
]
}
@ -438,7 +436,6 @@ func TestGeneratePodControllerRule(t *testing.T) {
"DaemonSet",
"Deployment",
"Job",
"ReplicaSet",
"StatefulSet"
]
}
@ -483,7 +480,6 @@ func TestGeneratePodControllerRule(t *testing.T) {
"DaemonSet",
"Deployment",
"Job",
"ReplicaSet",
"StatefulSet"
]
}