From 508bd40576b84356e742abba73cc06ea867288ab Mon Sep 17 00:00:00 2001 From: Marc Barry <4965634+marc-barry@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:29:13 -0400 Subject: [PATCH 1/2] Update Qtap to v0.2.7 and support extra environment variables. --- charts/qpoint-tap/Chart.yaml | 4 ++-- .../templates/{deployment.yaml => daemonset.yaml} | 6 ++++++ charts/qpoint-tap/values.yaml | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) rename charts/qpoint-tap/templates/{deployment.yaml => daemonset.yaml} (95%) diff --git a/charts/qpoint-tap/Chart.yaml b/charts/qpoint-tap/Chart.yaml index 40918b5..2d931ac 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.5 +version: 0.0.6 # 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.2.6" +appVersion: "v0.2.7" diff --git a/charts/qpoint-tap/templates/deployment.yaml b/charts/qpoint-tap/templates/daemonset.yaml similarity index 95% rename from charts/qpoint-tap/templates/deployment.yaml rename to charts/qpoint-tap/templates/daemonset.yaml index 346edf6..fb13747 100644 --- a/charts/qpoint-tap/templates/deployment.yaml +++ b/charts/qpoint-tap/templates/daemonset.yaml @@ -59,6 +59,12 @@ spec: value: "{{ .Values.logEncoding }}" - name: TINI_SUBREAPER value: "1" + {{- if .Values.extraEnv }} + {{- range .Values.extraEnv }} + - name: {{ .name }} + value: {{ .value | quote }} + {{- end }} + {{- end }} ports: - name: status containerPort: {{ .Values.status.port }} diff --git a/charts/qpoint-tap/values.yaml b/charts/qpoint-tap/values.yaml index 364be4b..88e8aea 100644 --- a/charts/qpoint-tap/values.yaml +++ b/charts/qpoint-tap/values.yaml @@ -111,3 +111,8 @@ config: "" # jwt_hmac_key: "qwertyuiopasdfghjklzxcvbnm123456" # default_domain_action: ALLOW # endpoints: [] + +# Additional environment variables for the DaemonSet +extraEnv: + - name: BPF_TRACE + value: "mod:openssl,mod:protocol,exe.contains:curl" From 8a2468612a42ba58be22a8cf95e0e9776f49d437 Mon Sep 17 00:00:00 2001 From: Marc Barry <4965634+marc-barry@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:31:16 -0400 Subject: [PATCH 2/2] Comment out example environment variable. --- charts/qpoint-tap/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/qpoint-tap/values.yaml b/charts/qpoint-tap/values.yaml index 88e8aea..c9bb7fe 100644 --- a/charts/qpoint-tap/values.yaml +++ b/charts/qpoint-tap/values.yaml @@ -113,6 +113,6 @@ config: "" # endpoints: [] # Additional environment variables for the DaemonSet -extraEnv: - - name: BPF_TRACE - value: "mod:openssl,mod:protocol,exe.contains:curl" +# extraEnv: +# - name: BPF_TRACE +# value: "mod:openssl,mod:protocol,exe.contains:curl"