chore: same status annotation name for data and policies

Signed-off-by: Ievgenii Shepeliuk <[email protected]>
open-policy-agent · Jun 15, 2022 · eb518c1 · eb518c1
1 parent af4f65e
commit eb518c1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/pkg/configmap/configmap.go b/pkg/configmap/configmap.go
@@ -32,7 +32,10 @@ import (
 
 const (
 	statusAnnotationKey = "openpolicyagent.org/kube-mgmt-status"
+<<<<<<< HEAD
 	retriesAnnotationKey = "openpolicyagent.org/kube-mgmt-retries"
+=======
+>>>>>>> c80123be (chore: same status annotation name for data and policies)
 
 	// Special namespace in Kubernetes federation that holds scheduling policies.
 	// commented because staticcheck: 'const kubeFederationSchedulingPolicy is unused (U1000)'
@@ -271,18 +274,13 @@ func (s *Sync) syncRemove(cm *v1.ConfigMap, isPolicy bool) {
 
 func (s *Sync) setAnnotations(cm *v1.ConfigMap, st status, retries int) {
 	bs, err := json.Marshal(st)
-
-	statusAnnotationKey := policyStatusAnnotationKey
-	if !isPolicy {
-		statusAnnotationKey = dataStatusAnnotationKey
-	}
 	if err != nil {
 		logrus.Errorf("Failed to serialize %v for %v/%v: %v", statusAnnotationKey, cm.Namespace, cm.Name, err)
 		return
 	}
 	annotation := string(bs)
 	if cm.Annotations != nil {
-		if existing, ok := cm.Annotations[policyStatusAnnotationKey]; ok {
+		if existing, ok := cm.Annotations[statusAnnotationKey]; ok {
 			if existing == annotation {
 				// If the annotation did not change, do not write it.
 				// (issue https://github.com/open-policy-agent/kube-mgmt/issues/90)

diff --git a/test/e2e/default/test.sh b/test/e2e/default/test.sh
@@ -14,3 +14,9 @@ ${OPA}/data/example/include/allow | jq -e '.result==true'
 
 ${OPA}/data/default | jq -e '.result|keys==["data-include"]'
 ${OPA}/data/default/data-include | jq -e '.result["include.json"].inKey=="inValue"'
+
+kubectl get cm -l openpolicyagent.org/policy=rego -ojson | \
+  jq -e '.items[].metadata.annotations["openpolicyagent.org/kube-mgmt-status"]|fromjson|.status=="ok"'
+
+kubectl get cm -l openpolicyagent.org/data=opa -ojson | \
+  jq -e '.items[].metadata.annotations["openpolicyagent.org/kube-mgmt-status"]|fromjson|.status=="ok"'
diff --git a/test/e2e/fixture-labels.yaml b/test/e2e/fixture-labels.yaml
@@ -10,7 +10,7 @@ data:
   include.rego: |
     package example.include
     allow := true
---- 
+---
 kind: ConfigMap
 metadata:
   name: policy-exclude
@@ -33,7 +33,7 @@ apiVersion: v1
 data:
   include.json: |
     {"inKey": "inValue"}
---- 
+---
 kind: ConfigMap
 metadata:
   name: data-exclude

diff --git a/test/e2e/fixture.yaml b/test/e2e/fixture.yaml
@@ -10,7 +10,7 @@ data:
   include.rego: |
     package example.include
     allow := true
---- 
+---
 kind: ConfigMap
 metadata:
   name: policy-exclude
@@ -33,7 +33,7 @@ apiVersion: v1
 data:
   include.json: |
     {"inKey": "inValue"}
---- 
+---
 kind: ConfigMap
 metadata:
   name: data-exclude

diff --git a/test/e2e/labels/test.sh b/test/e2e/labels/test.sh
@@ -13,3 +13,9 @@ ${OPA}/data/example/include/allow | jq -e '.result==true'
 
 ${OPA}/data/default | jq -e '.result|keys==["data-include"]'
 ${OPA}/data/default/data-include | jq -e '.result["include.json"].inKey=="inValue"'
+
+kubectl get cm -l qweqwe/policy=111 -ojson | \
+  jq -e '.items[].metadata.annotations["openpolicyagent.org/kube-mgmt-status"]|fromjson|.status=="ok"'
+
+kubectl get cm -l asdasd/data=222 -ojson | \
+  jq -e '.items[].metadata.annotations["openpolicyagent.org/kube-mgmt-status"]|fromjson|.status=="ok"'