agent: add trust feature flag

Author: mawandm

charts/agent/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: cloud-agent
 description: A Helm chart for Ametnes Platform Agent
 type: application
-version: 0.3.4
+version: 0.3.6
 appVersion: 0.3.4563
 dependencies:
 - name: memcached

charts/agent/README.md

@@ -36,6 +36,7 @@ Create the Secret from Helm values (one or more CAs):
 agent:
   tls:
     trust:
+      enabled: true
       additionalCAs:
         - crt: |
             -----BEGIN CERTIFICATE-----
@@ -51,6 +52,7 @@ Or use an existing Secret (all keys in that Secret are appended to the bundle):
 agent:
   tls:
     trust:
+      enabled: true
       additionalCAs: []
       secret:
         create: false

charts/agent/templates/agent-deploy.yaml

@@ -4,6 +4,7 @@
 {{- with .Values.agent }}
 {{- $tls := default dict .tls -}}
 {{- $trust := default dict $tls.trust -}}
+{{- $trustEnabled := default false $trust.enabled -}}
 {{- $additionalCAs := default list $trust.additionalCAs -}}
 {{- $hasInlineCerts := false -}}
 {{- range $additionalCAs }}
@@ -14,7 +15,7 @@
 {{- $secretCfg := default dict $trust.secret -}}
 {{- $shouldCreate := default true $secretCfg.create -}}
 {{- $useExistingSecret := and $secretCfg (not $shouldCreate) $secretCfg.name -}}
-{{- $TlsTrustActive := or (and $hasInlineCerts $shouldCreate) $useExistingSecret -}}
+{{- $TlsTrustActive := and $trustEnabled (or (and $hasInlineCerts $shouldCreate) $useExistingSecret) -}}
 {{- $TlsSecretName := "" -}}
 {{- if $TlsTrustActive }}
   {{- if and $hasInlineCerts $shouldCreate }}

charts/agent/templates/agent-secret.yaml

@@ -3,6 +3,7 @@
 {{- with .Values.agent }}
 {{- $tls := default dict .tls -}}
 {{- $trust := default dict $tls.trust -}}
+{{- $trustEnabled := default false $trust.enabled -}}
 {{- $additionalCAs := default list $trust.additionalCAs -}}
 {{- $hasInlineCerts := false -}}
 {{- range $additionalCAs }}
@@ -12,7 +13,7 @@
 {{- end }}
 {{- $secretCfg := default dict $trust.secret -}}
 {{- $shouldCreate := default true $secretCfg.create -}}
-{{- if and $hasInlineCerts $shouldCreate }}
+{{- if and $trustEnabled $hasInlineCerts $shouldCreate }}
 apiVersion: v1
 kind: Secret
 metadata:

charts/agent/values.yaml

@@ -24,6 +24,7 @@ agent:
   extraVolumeMounts: []
   tls:
     trust:
+      enabled: false
       # PEM CAs to append to the system bundle (e.g. TLS interception roots). Chart creates a Secret when secret.create is true.
       additionalCAs: []
       # Example (single CA):