From 63081b6cebeae6e6dfaa929151c9e634ff58a3c8 Mon Sep 17 00:00:00 2001 From: Marc Barry <4965634+marc-barry@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:30:52 -0400 Subject: [PATCH 1/2] Support extra environment variables from secrets and move to Qpoint v0.4.7. --- charts/qpoint-tap/Chart.yaml | 4 ++-- charts/qpoint-tap/templates/daemonset.yaml | 5 +++++ charts/qpoint-tap/values.yaml | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/charts/qpoint-tap/Chart.yaml b/charts/qpoint-tap/Chart.yaml index 9f0eacf..bc99057 100644 --- a/charts/qpoint-tap/Chart.yaml +++ b/charts/qpoint-tap/Chart.yaml @@ -8,10 +8,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.9 +version: 0.0.10 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v0.4.5" +appVersion: "v0.4.7" diff --git a/charts/qpoint-tap/templates/daemonset.yaml b/charts/qpoint-tap/templates/daemonset.yaml index dacc6bb..74e8ec7 100644 --- a/charts/qpoint-tap/templates/daemonset.yaml +++ b/charts/qpoint-tap/templates/daemonset.yaml @@ -68,7 +68,12 @@ spec: {{- if .Values.extraEnv }} {{- range .Values.extraEnv }} - name: {{ .name }} + {{- if .value }} value: {{ .value | quote }} + {{- else if .valueFrom }} + valueFrom: + {{- toYaml .valueFrom | nindent 16 }} + {{- end }} {{- end }} {{- end }} ports: diff --git a/charts/qpoint-tap/values.yaml b/charts/qpoint-tap/values.yaml index f9112d9..72f25a6 100644 --- a/charts/qpoint-tap/values.yaml +++ b/charts/qpoint-tap/values.yaml @@ -116,3 +116,10 @@ config: "" # extraEnv: # - name: BPF_TRACE # value: "mod:openssl,mod:protocol,exe.contains:curl" +# - name: SOME_ENV_VAR +# valueFrom: +# secretKeyRef: +# name: some-secret +# key: some-key + # - name: TLS_PROBES + # value: "openssl" From 56aa798d756e079692a9c0c6a7451c9545605c15 Mon Sep 17 00:00:00 2001 From: Marc Barry <4965634+marc-barry@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:35:12 -0400 Subject: [PATCH 2/2] Fix comment string --- charts/qpoint-tap/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/qpoint-tap/values.yaml b/charts/qpoint-tap/values.yaml index 72f25a6..b3c4731 100644 --- a/charts/qpoint-tap/values.yaml +++ b/charts/qpoint-tap/values.yaml @@ -116,10 +116,10 @@ config: "" # extraEnv: # - name: BPF_TRACE # value: "mod:openssl,mod:protocol,exe.contains:curl" -# - name: SOME_ENV_VAR -# valueFrom: -# secretKeyRef: +# - name: SOME_ENV_VAR +# valueFrom: +# secretKeyRef: # name: some-secret # key: some-key - # - name: TLS_PROBES - # value: "openssl" +# - name: TLS_PROBES +# value: "openssl"