agent: remove agent ns and add env var handling (#2)

* agent: remove agent ns and add env var handling

* agent: bump version

Author: benben

charts/agent/Chart.yaml

@@ -15,7 +15,7 @@ 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.1
+version: 0.2.0
 
 # 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

charts/agent/README.md

@@ -18,7 +18,7 @@ If you had already added this repo earlier, run `helm repo update` to retrieve t
 
 To install the agent chart:
 
-    helm upgrade --install my-agent checkly/agent --set agent.apiKeySecret.apiKey=pl_...
+    helm upgrade --install my-agent checkly/agent --set apiKeySecret.apiKey=pl_...
 
 To uninstall the chart:
 
@@ -28,22 +28,20 @@ See [https://github.com/checkly/helm-charts](https://github.com/checkly/helm-cha
 
 ## Alternative ways to set the agent API Key
 
-Instead of setting `agent.apiKeySecret.apiKey` you can also choose an existing secret with the following options
+Instead of setting `apiKeySecret.apiKey` you can also choose an existing secret with the following options
 
 ```
-agent:
-  apiKeySecret:
-    create: false
-    name: <NAME_OF_EXISTING_SECRET>
+apiKeySecret:
+  create: false
+  name: <NAME_OF_EXISTING_SECRET>
 ```
 
 or create the secret with `extraManifests`
 
 ```
-agent:
-  apiKeySecret:
-    create: false
-    name: checkly-agent-secret
+apiKeySecret:
+  create: false
+  name: checkly-agent-secret
 
 extraManifests:
   - apiVersion: external-secrets.io/v1beta1

charts/agent/templates/deployment.yaml

@@ -31,7 +31,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       shareProcessNamespace: false
-      terminationGracePeriodSeconds: {{ .Values.agent.terminationGracePeriodSeconds | default 300 }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds | default 300 }}
       containers:
         - name: {{ .Chart.Name }}
           {{- with .Values.securityContext }}
@@ -41,14 +41,18 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+            {{- range $key, $value := .Values.env }}
+            - name: "{{ tpl $key $ }}"
+              value: "{{ tpl (print $value) $ }}"
+            {{- end }}
             - name: "API_KEY"
               valueFrom:
                 secretKeyRef:
                   key: apiKey
-                  {{- if .Values.agent.apiKeySecret.create }}
+                  {{- if .Values.apiKeySecret.create }}
                   name: {{ .Release.Name }}-auth
-                  {{- else if and .Values.agent.apiKeySecret.name (not .Values.agent.apiKeySecret.create) }}
-                  name: {{ .Values.agent.apiKeySecret.name }}
+                  {{- else if and .Values.apiKeySecret.name (not .Values.apiKeySecret.create) }}
+                  name: {{ .Values.apiKeySecret.name }}
                   {{- end }}
           {{- with .Values.livenessProbe }}
           livenessProbe:

charts/agent/templates/secret.yaml

@@ -1,9 +1,9 @@
-{{- if .Values.agent.apiKeySecret.create }}
+{{- if .Values.apiKeySecret.create }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}-auth
   namespace: {{ .Release.Namespace }}
 data:
-  apiKey: {{ .Values.agent.apiKeySecret.apiKey | b64enc }}
+  apiKey: {{ .Values.apiKeySecret.apiKey | b64enc }}
 {{- end}}

charts/agent/values.yaml

@@ -17,22 +17,29 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-agent:
-  # -- Configures secret for agent API Key
-  #
-  # -- If you already have a secret with the Key, set `create` to
-  # -- false and set the `name`` value to the name of your secret.
-  #
-  # -- If you don't have a secret, set `create` to true
-  # -- and set the `apiKey`` value to your Key.
-  #
-  # -- You can also create a secret yourself via extraManifests[].
-  # -- Set `create` to false and set `name` to the name of
-  # -- your secret defined in your extraManifests.
-  apiKeySecret:
-    create: true
-    apiKey: ""
-  terminationGracePeriodSeconds: # default 300
+# Configures secret for agent API Key
+#
+# If you already have a secret with the Key, set `create` to
+# false and set the `name`` value to the name of your secret.
+#
+# If you don't have a secret, set `create` to true
+# and set the `apiKey`` value to your Key.
+#
+# You can also create a secret yourself via extraManifests[].
+# Set `create` to false and set `name` to the name of
+# your secret defined in your extraManifests.
+apiKeySecret:
+  create: true
+  apiKey: ""
+
+terminationGracePeriodSeconds: # default 300
+
+# Extra environment variables to be passed to agent pods
+#
+# env:
+#   MY_ENV_VAR: myvalue
+#   ANOTHER_VAR: anothervalue
+env: {}
 
 # This is for setting Kubernetes Annotations to a Pod.
 # For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/