fix: external secrets, err output [ci skip]

redkubes · Mar 19, 2021 · 9b762ac · 9b762ac
1 parent a34abc3
commit 9b762ac
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/bin/common.sh b/bin/common.sh
@@ -136,6 +136,6 @@ function for_each_cluster() {
 function hf_templates() {
   local out_dir="$1"
   shift
-  [ -z "$LABEL_OPT" ] && hf -f helmfile.tpl/helmfile-init.yaml template --skip-deps --output-dir="$out_dir" >/dev/null 2>&1
-  hf $(echo ${LABEL_OPT:+"-l $LABEL_OPT"} | xargs) template --skip-deps --output-dir="$out_dir" >/dev/null 2>&1
+  [ -z "$LABEL_OPT" ] && hf -f helmfile.tpl/helmfile-init.yaml template --skip-deps --output-dir="$out_dir" >/dev/null
+  hf $(echo ${LABEL_OPT:+"-l $LABEL_OPT"} | xargs) template --skip-deps --output-dir="$out_dir" >/dev/null
 }
diff --git a/bin/gitea-push.sh b/bin/gitea-push.sh
@@ -6,7 +6,7 @@ set -eo pipefail
 prepare_crypt
 readonly values=$(hf_values)
 readonly gitea_enabled=$(echo "$values" | yq r - 'charts.gitea.enabled')
-[ "$gitea_enabled" != "true" ] && err "Gitea is disabled" && exit 0
+[ "$gitea_enabled" != "true" ] && echo "Gitea is disabled" && exit 0
 
 readonly cluster_domain=$(echo "$values" | yq r - 'cluster.domain')
 readonly gitea_url="gitea.$cluster_domain"
@@ -36,13 +36,13 @@ git fetch $remote_name master || true
 readonly commit_count=$(git rev-list --count --remotes=$remote_name)
 
 if [ "$commit_count" -eq "0" ]; then
-    git config user.name "Otomi"
-    git config user.email "otomi@$cluster_domain"
-    git add -A
+  git config user.name "Otomi"
+  git config user.email "otomi@$cluster_domain"
+  git add -A
 
-    git commit --no-verify -m "Initial commit of otomi-values"
-    git push -u $remote_name master
-    echo "Otomi-values has been pushed to gitea"
+  git commit --no-verify -m "Initial commit of otomi-values"
+  git push -u $remote_name master
+  echo "Otomi-values has been pushed to gitea"
 else
   err "There is already data in gitea, manual intervention necessary"
 fi
diff --git a/charts/team-ns/templates/knative-services.yaml b/charts/team-ns/templates/knative-services.yaml
@@ -1,7 +1,7 @@
 {{- $v := .Values }}
 {{- if (get $v "knative.enabled" | default true) }}
 {{- $ := . }}
-{{- $secrets := (include "itemsByName" ($v.secrets | default list) | fromYaml) }}
+{{- $secrets := (include "itemsByName" ($v.externalSecrets | default list) | fromYaml) }}
 {{- range $s := $v.services }}
 {{- if hasKey $s "ksvc" }}
 {{- $k := $s.ksvc }}
@@ -38,16 +38,18 @@ spec:
           {{- if or $k.env $k.secrets }}
           env:
             {{- with $k.env }}{{ . | toYaml | nindent 12 }}{{ end }}
-            {{- range $secret := ($k.secrets | default list) }} 
-              {{- $entries := ($secret.entries | default (index $secrets $secret.name)) }}
-              {{- range $entry := $entries }}
-            - name: {{ $entry | upper }}
+            {{- range $secretName := ($k.secrets | default list) }} 
+            {{- if hasKey $secrets $secretName -}}
+              {{- $secret := index $secrets $secretName  }}
+              {{- range $entry := $secret.entries }}
+            - name: {{ $entry }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ $secret.name }}
+                  name: {{ $secretName }}
                   key: {{ $entry }}
               {{- end }}
             {{- end }}
+            {{- end }}
           {{- end }}
           {{- with $k.envFrom }}
           envFrom: {{- . | toYaml | nindent 12 }}