Merge pull request #168 from projectsyn/fix/postsync-hook-rbac

Remove `hook=PostSync` annotation from hook RBAC
projectsyn · Jun 27, 2024 · 1b120ec · 1b120ec
2 parents d4648a1 + 756ac9e
commit 1b120ec
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 33 deletions.
diff --git a/component/hooks.jsonnet b/component/hooks.jsonnet
@@ -10,9 +10,6 @@ local name = 'argocd-hooks';
 local role = kube.Role(name) {
   metadata+: {
     namespace: params.namespace,
-    annotations+: {
-      'argocd.argoproj.io/hook': 'PostSync',
-    },
   },
   rules: [
     {
@@ -31,18 +28,12 @@ local role = kube.Role(name) {
 local serviceAccount = kube.ServiceAccount(name) {
   metadata+: {
     namespace: params.namespace,
-    annotations+: {
-      'argocd.argoproj.io/hook': 'PostSync',
-    },
   },
 };
 
 local roleBinding = kube.RoleBinding(name) {
   metadata+: {
     namespace: params.namespace,
-    annotations+: {
-      'argocd.argoproj.io/hook': 'PostSync',
-    },
   },
   subjects_: [ serviceAccount ],
   roleRef_: role,

diff --git a/tests/golden/defaults/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/defaults/argocd/argocd/25_hooks/hooks.yaml
@@ -1,8 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks
@@ -31,8 +30,7 @@ rules:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks
@@ -41,8 +39,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks

diff --git a/tests/golden/openshift/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/openshift/argocd/argocd/25_hooks/hooks.yaml
@@ -1,8 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks
@@ -31,8 +30,7 @@ rules:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks
@@ -41,8 +39,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks

diff --git a/tests/golden/params/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/params/argocd/argocd/25_hooks/hooks.yaml
@@ -1,8 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks
@@ -31,8 +30,7 @@ rules:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks
@@ -41,8 +39,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks

diff --git a/tests/golden/prometheus/argocd/argocd/25_hooks/hooks.yaml b/tests/golden/prometheus/argocd/argocd/25_hooks/hooks.yaml
@@ -1,8 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks
@@ -31,8 +30,7 @@ rules:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks
@@ -41,8 +39,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  annotations:
-    argocd.argoproj.io/hook: PostSync
+  annotations: {}
   labels:
     name: argocd-hooks
   name: argocd-hooks