Merge pull request #69 from camptocamp/test-annotations

Add annotations
camptocamp · Nov 24, 2022 · 8091e58 · 8091e58
2 parents eab8127 + fef86ef
commit 8091e58
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-HELM != helm
+HELM ?= helm
 
 gen-expected:
 	${HELM} template --namespace=default --values=tests/values.yaml custom . > tests/expected.yaml || \

diff --git a/templates/dockerhub-secret.yaml b/templates/dockerhub-secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "common.fullname" ( dict "root" . "service" .Values ) }}-dockerregistry
-  labels: {{ include "common.labels" ( dict "root" . "service" .Values ) | nindent 4 }}
+  {{- include "common.metadata" ( dict "root" . "service" .Values ) | nindent 2 }}
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ include "secrets.dockerregistry" . | b64enc }}

diff --git a/templates/secret.yaml b/templates/secret.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "common.fullname" ( dict "root" $ "service" $.Values ) }}
-  labels: {{ include "common.labels" ( dict "root" $ "service" $.Values ) | nindent 4 }}
+  {{- include "common.metadata" ( dict "root" $ "service" $.Values ) | nindent 2 }}
 type: generic
 data:
 {{- range $key, $value := . }}

diff --git a/tests/expected.yaml b/tests/expected.yaml
@@ -11,6 +11,8 @@ metadata:
     app.kubernetes.io/name: secrets
     app.kubernetes.io/instance: custom
     app.kubernetes.io/component: main
+  annotations:
+    testAnnotation: annotation value
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: ewogICJhdXRocyI6IHsKICAgICJkb2NrZXIuaW8iOiB7CiAgICAgICJhdXRoIjogIll6SmpaMmx6WW05ME9qRXlNelE9IiwKICAgICAgInVzZXJuYW1lIjogImMyY2dpc2JvdCIsCiAgICAgICJwYXNzd29yZCI6ICIxMjM0IiwKICAgICAgImVtYWlsIjogImRvY2tlci1odWJAY2FtcHRvY2FtcC5jb20iCiAgICB9LAogICAgImdoY3IuaW8iOiB7CiAgICAgICJhdXRoIjogIll6SmpMV0p2ZEMxbmFYTXRZMms2TVRJek5BPT0iLAogICAgICAidXNlcm5hbWUiOiAiYzJjLWJvdC1naXMtY2kiLAogICAgICAicGFzc3dvcmQiOiAiMTIzNCIsCiAgICAgICJlbWFpbCI6ICJnZW9zcGF0aWFsLWJvdEBjYW1wdG9jYW1wLmNvbSIKICAgIH0sCiAgICAiaHR0cHM6Ly9pbmRleC5kb2NrZXIuaW8vdjEvIjogewogICAgICAiYXV0aCI6ICJZekpqWjJselltOTBPakV5TXpRPSIsCiAgICAgICJ1c2VybmFtZSI6ICJjMmNnaXNib3QiLAogICAgICAicGFzc3dvcmQiOiAiMTIzNCIsCiAgICAgICJlbWFpbCI6ICJkb2NrZXItaHViQGNhbXB0b2NhbXAuY29tIgogICAgfSwKICAgICJleGFtcGxlLmNvbSI6IHsiYXV0aCI6ICJibTl3WlRwdWIzQmwifQogIH0KfQ==
@@ -27,6 +29,8 @@ metadata:
     app.kubernetes.io/name: secrets
     app.kubernetes.io/instance: custom
     app.kubernetes.io/component: main
+  annotations:
+    testAnnotation: annotation value
 type: generic
 data:
   test: dG90bw==

diff --git a/tests/values.yaml b/tests/values.yaml
@@ -1,3 +1,6 @@
+annotations:
+  testAnnotation: annotation value
+
 dockerregistry:
   https://index.docker.io/v1/:
     email: docker-hub@camptocamp.com