fix: cd issues, chart bump

Author: Maurice Faber

chart/otomi/Chart.yaml

@@ -4,7 +4,7 @@ description: A Helm chart for installing otomi in Kubernetes
 home: https://otomi.io/
 icon: https://otomi.io/img/otomi-logo.svg
 type: application
-version: '0.2.0-rc1'
+version: '0.2.1'
 appVersion: 'APP_VERSION_PLACEHOLDER'
 keywords:
   - otomi

chart/otomi/templates/job.yaml

@@ -61,3 +61,5 @@ spec:
         - name: otomi-values
           emptyDir: {}
       restartPolicy: Never
+      # Don't restart as it recreates passwords every time!
+      backoffLimit: 1

charts/gitea/templates/gitea/init.yaml

@@ -58,7 +58,7 @@ stringData:
     || \
     ( \
       export GITEA_AUTH_ID=$(gitea admin auth list | grep {{ .Values.gitea.oauth.name | quote }} | awk -F " "  "{print \$1}"); \
-      gitea admin auth update-oauth --id ${GITEA_AUTH_ID} \
+      gitea admin auth update-oauth --id "${GITEA_AUTH_ID}" \
       {{- include "gitea.oauth_settings" . | nindent 6 }} \
     ) \
     {{- end }}

helmfile.d/snippets/domains.gotmpl

@@ -26,9 +26,8 @@
     {{- end }}
   {{- end }}
 {{- end }}
-{{- $proxyDomain := print "proxy." $v.cluster.domainSuffix }}
 {{- $authDomain := print "auth." $v.cluster.domainSuffix }}
-{{- $domains = concat $domains (list (dict "domain" $proxyDomain "hasCert" false "certArn" "" "certName" "") (dict "domain" $authDomain "hasCert" false "certArn" "" "certName" "")) }}
+{{- $domains = concat $domains (list (dict "domain" $authDomain "hasCert" false "certArn" "" "certName" "")) }}
 domains:
   {{- range $domInfo := $domains }}
   - {{- $domInfo | toYaml | nindent 4 }}

src/cmd/apply.ts

@@ -2,7 +2,7 @@ import { mkdirSync, rmdirSync, writeFileSync } from 'fs'
 import { Argv, CommandModule } from 'yargs'
 import { $, cd, nothrow } from 'zx'
 import { env } from '../common/envalid'
-import { hf, hfStream } from '../common/hf'
+import { hf, hfStream, hfValues } from '../common/hf'
 import { cleanupHandler, prepareEnvironment } from '../common/setup'
 import {
   getFilename,
@@ -43,6 +43,12 @@ const commitOnFirstRun = async () => {
   cd(env.ENV_DIR)
 
   const healthUrl = (await $`git config --get remote.origin.url`).stdout.trim()
+  const isCertStaging = (await hfValues()).charts?.['cert-manager']?.stage === 'staging'
+  if (isCertStaging) {
+    process.env.GIT_SSL_NO_VERIFY = 'true'
+    process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
+  }
+
   await waitTillAvailable(healthUrl)
 
   if ((await nothrow($`git ls-remote`)).stdout.trim().length !== 0) return

src/cmd/commit.ts

@@ -19,7 +19,6 @@ interface Arguments extends HelmArgs, DroneArgs {}
 export const preCommit = async (): Promise<void> => {
   const pcDebug = terminal('Pre Commit')
   pcDebug.info('Check for cluster diffs')
-  cd(env.ENV_DIR)
   const settingsDiff = (await nothrow($`git diff env/settings.yaml`)).stdout.trim()
   const secretDiff = (await nothrow($`git diff env/secrets.settings.yaml`)).stdout.trim()
   cd(rootDir)
@@ -50,13 +49,9 @@ export const gitPush = async (branch: string): Promise<boolean> => {
 
 export const commit = async (): Promise<void> => {
   await validateValues()
-
   debug.info('Preparing values')
-
-  cd(env.ENV_DIR)
-
   const values = await hfValues()
-
+  cd(env.ENV_DIR)
   preCommit()
   await encrypt()
   debug.info('Committing values')
@@ -69,7 +64,9 @@ export const commit = async (): Promise<void> => {
     debug.log('Something went wrong trying to commit. Did you make any changes?')
   }
 
-  if (!env.CI) await pull()
+  // if (!env.CI) await pull()
+  // previous command returned to rootDir, so go back to env:
+  cd(env.ENV_DIR)
   let branch: string
   if (values.charts?.gitea?.enabled === false) {
     branch = values.charts!['otomi-api']!.git!.branch ?? 'main'

src/common/utils.ts

@@ -240,6 +240,7 @@ export const waitTillAvailable = async (dom: string, subsequentExists = 3): Prom
   const domain = dom.startsWith('http') ? dom : `https://${dom}`
   const waitDebug = terminal('waitTillAvailable')
   let count = 0
+  const timeout = 10
   // Need to wait for 3 subsequent exists, since DNS doesn't always propagate equally
   do {
     waitDebug.debug(`Waiting for ${domain} ...`)
@@ -257,9 +258,9 @@ export const waitTillAvailable = async (dom: string, subsequentExists = 3): Prom
       waitDebug.error(error.message)
     }
     // eslint-disable-next-line no-await-in-loop
-    await sleep(250)
+    await sleep(timeout * 1000)
   } while (count < subsequentExists)
-  waitDebug.debug(`Waiting for ${domain} succeeded`)
+  waitDebug.debug(`Waiting ${timeout} secs for ${domain} to become available`)
 }
 
 export const flattenObject = (obj: Record<string, any>, path = ''): { [key: string]: string } => {

values-schema.yaml

@@ -248,7 +248,6 @@ definitions:
         type: string
     required:
       - domainSuffix
-      - k8sContext
       - k8sVersion
       - name
       - owner