diff --git a/charts/nr-ebpf-agent/Chart.yaml b/charts/nr-ebpf-agent/Chart.yaml index 176e8c4e8..9ecf3496d 100644 --- a/charts/nr-ebpf-agent/Chart.yaml +++ b/charts/nr-ebpf-agent/Chart.yaml @@ -13,7 +13,8 @@ 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.1.16 +version: 0.1.17 + dependencies: - name: common-library version: 1.3.1 diff --git a/charts/nr-ebpf-agent/templates/_tls.tpl b/charts/nr-ebpf-agent/templates/_tls.tpl index 3c2fb4dba..624d23b12 100644 --- a/charts/nr-ebpf-agent/templates/_tls.tpl +++ b/charts/nr-ebpf-agent/templates/_tls.tpl @@ -8,13 +8,12 @@ a cert is loaded from an existing secret or is provided via `.Values` {{- $clientCert := "" }} {{- $clientKey := "" }} {{- if .Values.tls.autoGenerateCert.enabled }} -{{/*TODO Enable this section once the helm Chart repo supports the lookup function*/}} -{{/* {{- $prevSecret := (lookup "v1" "Secret" "" (include "nr-ebpf-agent-certificates.certificateSecret.name" . )) }}*/}} -{{/* {{- if and (not .Values.tls.autoGenerateCert.recreate) $prevSecret }}*/}} -{{/* {{- $clientCert = index $prevSecret "data" "tls.crt" }}*/}} -{{/* {{- $clientKey = index $prevSecret "data" "tls.key" }}*/}} -{{/* {{- $caCert = index $prevSecret "data" "ca.crt" }}*/}} -{{/* {{- else }}*/}} + {{- $prevSecret := (lookup "v1" "Secret" "" (include "nr-ebpf-agent-certificates.certificateSecret.name" . )) }} + {{- if and (not .Values.tls.autoGenerateCert.recreate) $prevSecret }} + {{- $clientCert = index $prevSecret "data" "tls.crt" }} + {{- $clientKey = index $prevSecret "data" "tls.key" }} + {{- $caCert = index $prevSecret "data" "ca.crt" }} + {{- else }} {{- $certValidity := int .Values.tls.autoGenerateCert.certPeriodDays | default 365 }} {{- $ca := genCA "nr-ebpf-agent-certificates-ca" $certValidity }} {{- $domain1 := printf "%s.%s.svc" (include "nr-ebpf-agent.service.name" .) $.Release.Namespace }} @@ -26,7 +25,7 @@ a cert is loaded from an existing secret or is provided via `.Values` {{- $clientCert = b64enc $cert.Cert }} {{- $clientKey = b64enc $cert.Key }} {{- $caCert = b64enc $ca.Cert }} -{{/* {{- end }}*/}} + {{- end }} {{- else }} {{- $clientCert = .Files.Get .Values.tls.certFile | b64enc }} {{- $clientKey = .Files.Get .Values.tls.keyFile | b64enc }}