Add (optional) environment variables to deployment (#109)

Add optional environment variables `NASA_API_KEY` and `GIPHY_API_KEY` to access the nasa.gov and giphy APIs with private credentials
mathew-fleisch · Jan 10, 2023 · c9858e3 · c9858e3
1 parent 87ce6ad
commit c9858e3
Show file tree

Hide file tree

Showing 11 changed files with 1,679 additions and 282 deletions.
diff --git a/.github/workflows/example-bashbot-github-action-gate.yaml b/.github/workflows/example-bashbot-github-action-gate.yaml
@@ -21,7 +21,7 @@ jobs:
         uses: asdf-vm/actions/install@v1
         with:
           tool_versions: |
-            bashbot 2.0.1
+            bashbot 2.0.2
             yq 4.30.6
       -
         name: Run Bashbot as debugging gate to job

diff --git a/.github/workflows/example-bashbot-github-action.yaml b/.github/workflows/example-bashbot-github-action.yaml
@@ -17,7 +17,7 @@ jobs:
         uses: asdf-vm/actions/install@v1
         with:
           tool_versions: |
-            bashbot 2.0.1
+            bashbot 2.0.2
             yq 4.30.6
       -
         name: Send Slack Message With Bashbot Binary

diff --git a/.github/workflows/example-notify-slack.yaml b/.github/workflows/example-notify-slack.yaml
@@ -16,7 +16,7 @@ jobs:
         name: Install Bashbot via asdf
         uses: asdf-vm/actions/install@v1
         with:
-          tool_versions: bashbot 2.0.1
+          tool_versions: bashbot 2.0.2
       -
         name: Send Slack Message With Bashbot Binary
         env:

diff --git a/README.md b/README.md
diff --git a/charts/bashbot/Chart.yaml b/charts/bashbot/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: bashbot
 description: Bashbot is a slack ChatOps tool for Infrastructure and DevOps teams.
 type: application
-version: v2.0.1
-appVersion: v2.0.1
+version: v2.0.2
+appVersion: v2.0.2
diff --git a/charts/bashbot/templates/configmap.yaml b/charts/bashbot/templates/configmap.yaml
@@ -5,8 +5,8 @@ metadata:
   namespace: {{ .Values.namespace }}
 data:
   {{- if index .Values "config.yaml" }}
-  config.yaml: |
-{{ index .Values "config.yaml" | indent 3 }}
   .tool-versions: |
 {{ index .Values ".tool-versions" | indent 3 }}
+  config.yaml: |
+{{ index .Values "config.yaml" | indent 3 }}
   {{- end }}
diff --git a/charts/bashbot/templates/deployment.yaml b/charts/bashbot/templates/deployment.yaml
@@ -52,6 +52,18 @@ spec:
                   name: {{ .Values.botname }}-env
                   key: AIRQUALITY_API_KEY
                   optional: true
+            - name: NASA_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.botname }}-env
+                  key: NASA_API_KEY
+                  optional: true
+            - name: GIPHY_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.botname }}-env
+                  key: GIPHY_API_KEY
+                  optional: true
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.pullPolicy }}
           name: {{ .Values.botname }}