Remove the extra whitespace around the supplied (or ommitted) exclude…

… regexes Signed-off-by: Richard Wall <richard.wall@venafi.com>
jetstack · Nov 15, 2024 · f0c0643 · f0c0643
1 parent 1a567ef
commit f0c0643
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/deploy/charts/venafi-kubernetes-agent/templates/configmap.yaml b/deploy/charts/venafi-kubernetes-agent/templates/configmap.yaml
@@ -13,10 +13,14 @@ data:
     cluster_description: {{ .Values.config.clusterDescription | quote }}
     server: {{ .Values.config.server | quote }}
     period: {{ .Values.config.period | quote }}
+    {{- with .Values.config.excludeAnnotationKeysRegex }}
     exclude-annotation-keys-regex:
-      {{ .Values.config.excludeAnnotationKeysRegex | toYaml | nindent 6 }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    {{- with .Values.config.excludeLabelKeysRegex }}
     exclude-label-keys-regex:
-      {{ .Values.config.excludeLabelKeysRegex | toYaml | nindent 6 }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
     venafi-cloud:
       uploader_id: "no"
       upload_path: "/v1/tlspk/upload/clusterdata"

diff --git a/hack/e2e/values.venafi-kubernetes-agent.yaml b/hack/e2e/values.venafi-kubernetes-agent.yaml
@@ -2,6 +2,7 @@ config:
   clusterName: venafi-kubernetes-agent-e2e
   clusterDescription: |
       A kind cluster used for testing the venafi-kubernetes-agent.
+  excludeAnnotationKeysRegex: ['^kapp\.k14s\.io/original.*']
 
 authentication:
   venafiConnection: