From c8e981743f3d2eb4040867e7d3529139f72316d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 28 Mar 2023 07:27:59 +0200 Subject: [PATCH 1/2] Add release name and some other metadata --- templates/configmap.yaml | 11 +++++++++++ tests/expected.yaml | 19 +++++++++++++++++++ tests/mapserver-expected.yaml | 0 values.yaml | 3 +++ 4 files changed, 33 insertions(+) create mode 100644 templates/configmap.yaml delete mode 100644 tests/mapserver-expected.yaml diff --git a/templates/configmap.yaml b/templates/configmap.yaml new file mode 100644 index 0000000..48e21fa --- /dev/null +++ b/templates/configmap.yaml @@ -0,0 +1,11 @@ +{{- if .Values.metadata }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "common.fullname" ( dict "root" $ "service" $.Values ) }} + {{- include "common.metadata" ( dict "root" $ "service" $.Values ) | nindent 2 }} +data: + CHART_NAME: {{ .Chart.Name }} + RELEASE_NAME: {{ .Release.Name }} + RELEASE_NAMESPACE: {{ .Release.Namespace }} +{{- end }} diff --git a/tests/expected.yaml b/tests/expected.yaml index 8392b77..8eafa57 100644 --- a/tests/expected.yaml +++ b/tests/expected.yaml @@ -36,3 +36,22 @@ data: test: dG90bw== test2: dG90bzI= test3: "UW1GemFXTWdKU0Z6S0R4dWFXdytLVHAwYjNSdg==" +--- +# Source: secrets/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: custom-secrets + labels: + helm.sh/chart: secrets + app.kubernetes.io/version: "1.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: secrets + app.kubernetes.io/instance: custom + app.kubernetes.io/component: main + annotations: + testAnnotation: annotation value +data: + CHART_NAME: secrets + RELEASE_NAME: custom + RELEASE_NAMESPACE: default diff --git a/tests/mapserver-expected.yaml b/tests/mapserver-expected.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/values.yaml b/values.yaml index b06a0d4..516c4b6 100644 --- a/values.yaml +++ b/values.yaml @@ -14,3 +14,6 @@ secrets: {} # type: basicAuth # username: value # password: value + +# Generate a ConfigMap with CHART_NAME, RELEASE_NAME, RELEASE_NAMESPACE +metadata: true From 7738b138a287529dedf098583f5803c8c55650ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 28 Mar 2023 07:35:37 +0200 Subject: [PATCH 2/2] Cannot import dependency --- .pre-commit-config.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dfff3a3..dc8854d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,6 @@ ci: skip: - copyright - helm-lock - - helmlint - ripsecrets repos: @@ -70,7 +69,3 @@ repos: rev: v0.1.5 hooks: - id: ripsecrets - - repo: https://github.com/gruntwork-io/pre-commit - rev: v0.1.21 - hooks: - - id: helmlint