Merge pull request #422 from cloud-pi-native/develop

Develop
cloud-pi-native · Feb 4, 2025 · 493e919 · 493e919
2 parents 013bd1e + caf4b98
commit 493e919
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/roles/argocd/templates/values/00-main.j2 b/roles/argocd/templates/values/00-main.j2
@@ -59,6 +59,31 @@ configs:
         kinds:
         - TaskRun
         - PipelineRun
+      - apiGroups:
+        - wgpolicyk8s.io
+        - aquasecurity.github.io
+        clusters:
+        - '*'
+        kinds:
+        - '*'
+      - apiGroups:
+        - postgresql.cnpg.io
+        clusters:
+        - '*'
+        kinds:
+        - Backup
+      - apiGroups:
+        - reports.kyverno.io
+        clusters:
+        - '*'
+        kinds:
+        - EphemeralReport
+      - apiGroups:
+        - reports.kyverno.io/v1
+        clusters:
+        - '*'
+        kinds:
+        - EphemeralReport
 {% if dsc.global.environment == 'development' %}
     accounts.cpin-sa: apiKey
 {% endif %}

diff --git a/roles/harbor/templates/values/00-main.j2 b/roles/harbor/templates/values/00-main.j2
@@ -6,23 +6,9 @@ expose:
     hosts:
       core: {{ harbor_domain }}
       notary: {{ dsc.harbor.subDomain }}-notary{{ root_domain }}
-    notary:
-      annotations:
+    annotations:
 {% for key, val in dsc.ingress.annotations.items() %}
-        {{ key }}: {{ val }}
-{% endfor %}
-      labels:
-{% for key, val in dsc.ingress.labels.items() %}
-        {{ key }}: {{ val }}
-{% endfor %}
-    harbor:
-      annotations:
-{% for key, val in dsc.ingress.annotations.items() %}
-        {{ key }}: {{ val }}
-{% endfor %}
-      labels:
-{% for key, val in dsc.ingress.labels.items() %}
-        {{ key }}: {{ val }}
+      {{ key }}: {{ val }}
 {% endfor %}
 externalURL: https://{{ harbor_domain }}
 persistence: