fixed validator

Author: kosta709

cf-onprem

@@ -185,7 +185,16 @@ EOF
 
 cf_status=$(helm status $RELEASE 2>/dev/null | awk -F': ' '$1 == "STATUS" {print $2}')
 
-[ -z "${cf_status}" ] && SEEDJOBS="--set global.seedJobs=true" && CERTJOBS="--set global.certsJobs=true"
+if [[ -z "${cf_status}" ]]; then
+  SEEDJOBS="--set global.seedJobs=true"
+  CERTJOBS="--set global.certsJobs=true"
+  IN_INSTALLER="true" ${DIR}/run-validator.sh
+  if [[ $? != 0 ]]; then
+    echo "Validation failed"
+    exit 1
+  fi
+fi
+
 
 msg "Installing/Updating Codefresh..."
 helm upgrade ${RELEASE} codefresh-onprem-${CHANNEL}/codefresh \

run-validator.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-
+echo "Starting validator"
 DIR=$(dirname $0)
 RELEASE=cf-validator
 CHART=${DIR}/validator
@@ -15,16 +15,18 @@ fi
 
 source ${DIR}/scripts/helpers.sh
 
-approveContext
+if [[ -z "${IN_INSTALLER}" ]]; then
+  approveContext
 
-msg "Checking helm binary on your system"
-checkHelmInstalled "helm"
+  msg "Checking helm binary on your system"
+  checkHelmInstalled "helm"
 
-msg "Checking if tiller is installed on kubernetes cluster"
-checkTillerInstalled
+  msg "Checking if tiller is installed on kubernetes cluster"
+  checkTillerInstalled
 
-msg "Checking tiller status..."
-checkTillerStatus
+  msg "Checking tiller status..."
+  checkTillerStatus
+fi
 
 ## Get default storage class
 SC_DEFAULT_QUERY='{{ range .items }}'

validator/templates/storageclasses/pvcs.yaml

@@ -5,7 +5,7 @@
 
 {{/* Fill dict persistent services */}}
 {{- $persistentServices := dict -}}
-{{- $persistentServiceNames := list "mongodb" "postgresql" "consul" "redis" "rabbitmq" "registry" "cronus" -}}
+{{- $persistentServiceNames := list "mongodb" "postgresql" "consul" "redis" "rabbitmq" "registry" "cronus" "runner" "builder" -}}
 {{- range $persistentServiceNames -}}
 {{- if (index $.Values . ) -}}
 {{- $_ := set $persistentServices . (index $.Values .) -}}
@@ -104,12 +104,14 @@ spec:
 ---
 {{- end -}}
 
+{{- end -}}
+
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: test-pvc-dummy-cm
   labels:
     app: {{ $.Release.Name }}
 data:
-  dd: "11"
-{{- end -}}
+  dd: "11"

values.yaml.tpl

@@ -139,19 +139,17 @@ builder:
 ## Set time to run docker cleaner  
   dockerCleanerCron: 0 0 * * *
 ## Override builder PV initial size
-  varLibDockerVolume:
-    storageSize: 100Gi
-    storageClass:
+  storageSize: 100Gi
+  storageClass:
     #existingPvc: cf-builder-0
 
 runner:
   nodeSelector: {}
 ## Set time to run docker cleaner  
   dockerCleanerCron: 0 0 * * *
 ## Override runner PV initial size
-  varLibDockerVolume:
-    storageSize: 100Gi
-    storageClass:
+  storageSize: 100Gi
+  storageClass:
     #existingPvc: cf-runner-0