fix: core image tag reading from otomi.version (#479)

* fix: core image tag reading from otomi.version
* fix: removed alerts from the required list
* fix: ci tests

Author: mojtabaimani

bin/ci-tests.sh

@@ -7,13 +7,18 @@ set -e
 . bin/common.sh
 
 testEnv=$PWD/tests/fixtures
+source $testEnv/env/.env
 echo "Validating $testEnv values"
 
 ln -s $testEnv env
 bats -T bin/tests
 opa test policies -v
 bin/validate-values.sh
 hf lint
+
+export AZURE_CLIENT_ID='AZURE_CLIENT_ID'
+export AZURE_CLIENT_SECRET='AZURE_CLIENT_SECRET'
+
 bin/validate-templates.sh
 # bin/check-policies.sh
 unlink env

binzx/otomi

@@ -21,6 +21,7 @@ readonly calling_args
 if [ -n "$TESTING" ]; then
   CI=1
   ENV_DIR="$PWD/tests/fixtures"
+  source "$ENV_DIR/env/.env"
   NOPULL=1
 elif [ -z "$ENV_DIR" ]; then
   ENV_DIR=$PWD
@@ -173,7 +174,6 @@ vars=(
   GCLOUD_SERVICE_KEY
   K8S_CONTEXT
   KUBE_VERSION_OVERRIDE
-  NOPULL
   OTOMI_DRY_RUN
   OTOMI_IN_TERMINAL
   OTOMI_PASSWORD

chart/otomi/templates/job.yaml

@@ -17,10 +17,8 @@ spec:
         runAsGroup: 999
       initContainers:
         - name: bootstrap-values
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
-          {{- with .Values.image.pullPolicy }}
-          imagePullPolicy: {{ . }}
-          {{- end }}
+          image: otomi/core:{{ .Values.otomi.version | default .Chart.AppVersion }}
+          imagePullPolicy: {{ ternary "IfNotPresent" "Always" (regexMatch "^v\\d" .Values.otomi.version) }}  
           resources:
             requests:
               memory: 200Mi
@@ -40,7 +38,7 @@ spec:
             - name: CI
               value: '1'
             - name: OTOMI_VERSION
-              value: {{ .Values.image.tag | default .Chart.AppVersion }}
+              value: {{ .Values.otomi.version  | default .Chart.AppVersion }}
             - name: ENV_DIR
               value: /home/app/stack/env
             - name: OTOMI_VALUES_INPUT
@@ -54,10 +52,8 @@ spec:
             - name: values-secret
               mountPath: /secret
         - name: map-values
-          image: {{ .Values.tasksImage.repository }}:{{ .Values.tasksImage.tag | default "latest" }}
-          {{- with .Values.image.pullPolicy }}
-          imagePullPolicy: {{ . }}
-          {{- end }}
+          image: otomi/tasks:latest
+          imagePullPolicy: {{ ternary "IfNotPresent" "Always" (regexMatch "^v\\d" .Values.otomi.version) }} 
           resources:
             requests:
               memory: 200Mi
@@ -84,10 +80,8 @@ spec:
             - name: values-secret
               mountPath: /secret
         - name: push-values
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
-          {{- with .Values.image.pullPolicy }}
-          imagePullPolicy: {{ . }}
-          {{- end }}
+          image: otomi/core:{{ .Values.otomi.version | default .Chart.AppVersion }}
+          imagePullPolicy: {{ ternary "IfNotPresent" "Always" (regexMatch "^v\\d" .Values.otomi.version) }} 
           resources:
             requests:
               memory: 200Mi
@@ -120,10 +114,8 @@ spec:
               mountPath: /secret
       containers:
         - name: otomi-install
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
-          {{- with .Values.image.pullPolicy }}
-          imagePullPolicy: {{ . }}
-          {{- end }}
+          image: otomi/core:{{ .Values.otomi.version | default .Chart.AppVersion }}
+          imagePullPolicy: {{ ternary "IfNotPresent" "Always" (regexMatch "^v\\d" .Values.otomi.version) }} 
           resources:
             limits:
               memory: 2Gi

chart/otomi/values.yaml

@@ -1,9 +1,3 @@
-image:
-  repository: otomi/core
-  # tag: master # defaults to .Chart.AppVersion
-tasksImage:
-  repository: otomi/tasks
-  # tag: master # defaults to "latest"
 cluster:
   apiName: ''
   apiServer: ''
@@ -12,8 +6,8 @@ cluster:
   name: 'dev'
   provider: ''
   region: ''
-kms:
-  sops:
+# kms:
+#   sops:
     # provider can be one of aws|azure|google|vault
     # provider: ''
     # aws:

helmfile.d/helmfile-30.admin.yaml

@@ -7,7 +7,7 @@ bases:
 
 releases:
   - name: drone
-    installed: {{ $c | get "drone.enabled" false }}
+    installed: {{ ternary ($c | get "drone.enabled" "false") (ne ($v.otomi | get "pullSecret" "") "") (hasKey ($c | get "drone" dict) "enabled") }}
     namespace: team-admin
     labels:
       pkg: drone

helmfile.d/helmfile-50.services.yaml

@@ -19,7 +19,7 @@ releases:
     namespace: shared
     <<: *default
   - name: kubeapps
-    installed: {{ $c | get "kubeapps.enabled" true }}
+    installed: {{ ternary ($c | get "kubeapps.enabled" "false") (ne ($v.otomi | get "pullSecret" "") "") (hasKey ($c | get "kubeapps" dict) "enabled") }}
     namespace: kubeapps
     <<: *default
   - name: gitea

helmfile.d/helmfile-70.shared.yaml

@@ -8,7 +8,7 @@ bases:
 
 releases:
   - name: harbor
-    installed: {{ $c | get "harbor.enabled" false }}
+    installed: {{ ternary ($c | get "harbor.enabled" "false") (ne ($v.otomi | get "pullSecret" "") "") (hasKey ($c | get "harbor" dict) "enabled") }}
     namespace: harbor
     labels:
       pkg: harbor
@@ -28,7 +28,7 @@ releases:
       pkg: oauth2-proxy
     <<: *raw
   - name: otomi-api
-    installed: {{ and (ne ($v.otomi | get "pullSecret" "") "") (ne ($v.otomi | get "mode" "ee") "ce") }}
+    installed: {{ ne ($v.otomi | get "pullSecret" "") "" }}
     namespace: otomi
     labels:
       stage: post

tests/fixtures/env/.env

@@ -1 +1,3 @@
 export K8S_CONTEXT="minikube"
+export AZURE_CLIENT_ID='AZURE_CLIENT_ID'
+export AZURE_CLIENT_SECRET='AZURE_CLIENT_SECRET'

values-schema.yaml

@@ -2375,7 +2375,6 @@ properties:
           ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$:
             $ref: '#/definitions/team'
 required:
-  - alerts
   - cluster
   - oidc
   - otomi