chore: added theme to schema, demo files, silenced output

linode · Nov 14, 2020 · 90827a9 · 90827a9
1 parent 56b0945
commit 90827a9
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/.demo/env/charts/keycloak.yaml b/.demo/env/charts/keycloak.yaml
@@ -1,6 +1,7 @@
 charts:
     keycloak:
         enabled: true
+        theme: otomi
         realm: master
         idp:
             alias: redkubes-azure
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ node_modules/
 !package*.json
 !.cspell.json
 *.DS_Store
+.values/values-schema.yaml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -24,7 +24,8 @@
     "CONTRIBUTING": "markdown"
   },
   "yaml.schemas": {
-    "http://json-schema.org/draft/2019-09/schema#": "values-schema.yaml"
+    "http://json-schema.org/draft/2019-09/schema#": "values-schema.yaml",
+    ".values/values-schema.yaml": ".demo/env/*.yaml"
   },
   "shellformat.flag": "-i 2 -ci"
 }
diff --git a/bin/bootstrap.sh b/bin/bootstrap.sh
@@ -13,6 +13,8 @@ function generate_loose_schema() {
   local targetPath="$ENV_DIR/.vscode/values-schema.yaml"
   local sourcePath="$PWD/values-schema.yaml"
   yq d $sourcePath '**.required.' | yq d - 'properties.toolsVersion' | yq d - 'properties.cluster' >$targetPath
+  # also put a copy in the .values folder for local hinting of .demo/env/*.yaml files:
+  [ "$PWD" != "/home/app/stack" ] && cp $targetPath .values/
   echo "Stored JSON schema at: $targetPath"
 }
 

diff --git a/bin/common.sh b/bin/common.sh
@@ -3,7 +3,8 @@ ENV_DIR=${ENV_DIR:-./env}
 
 readonly otomiSettings="$ENV_DIR/env/settings.yaml"
 readonly clustersFile="$ENV_DIR/env/clusters.yaml"
-readonly helmfileOutputHide="(skipping|basePath=|Decrypting)"
+readonly helmfileOutputHide="(^\W+$|skipping|basePath=|Decrypting)"
+readonly helmfileOutputHideTpl="(^[\W^-]+$|skipping|basePath=|Decrypting)"
 readonly replacePathsPattern="s@../env@${ENV_DIR}@g"
 
 get_k8s_version() {

diff --git a/bin/otomi b/bin/otomi
@@ -316,7 +316,7 @@ function execute() {
       check_kube_context=0
       validate_cluster_env
       set -o pipefail
-      drun helmfile -e $CLOUD-$CLUSTER --quiet $@ template --skip-deps | grep -Ev $helmfileOutputHide
+      drun helmfile -e $CLOUD-$CLUSTER --quiet $@ template --skip-deps | grep -Ev $helmfileOutputHideTpl
       ;;
     rotate-keys)
       check_sops_file

diff --git a/values-schema.yaml b/values-schema.yaml
@@ -901,7 +901,7 @@ properties:
             type: string
           theme:
             type: string
-            enum: [default]
+            enum: [default, otomi]
       loki:
         type: object
         additionalProperties: false

diff --git a/values/jobs/keycloak.gotmpl b/values/jobs/keycloak.gotmpl
@@ -20,14 +20,15 @@ tasks:
     enabled: true
     init:
       image:
-        repository: curlimages/curl
+        repository: badouralix/curl-http2
       script: |
         {{ if $skipVerify }}export INSECURE='--insecure'{{ end }}
-        printf "Waiting until keycloak is accessible."
-        until $(curl "$INSECURE" --output /dev/null --silent --head --fail https://keycloak.{{ $v.cluster.domain }}); do 
+        echo "Waiting until keycloak is accessible at https://keycloak.{{ $v.cluster.domain }}"
+        until $(curl $INSECURE --output /dev/null --silent --head --fail -I https://keycloak.{{ $v.cluster.domain }}); do 
           printf '.'
           sleep 5
         done
+        echo READY!
     image:
       repository: {{ $c | get "jobs.keycloak.image.repository" "otomi/tasks" }}
       tag: {{ $c | get "jobs.keycloak.image.tag" "v0.2.1" }}