diff --git a/bin/dryrun-app.sh b/bin/dryrun-app.sh index bc35dd0..5435b27 100755 --- a/bin/dryrun-app.sh +++ b/bin/dryrun-app.sh @@ -7,20 +7,22 @@ app=$(basename $full_path) location=$(dirname $full_path) tmp_path=".tmp/$location/$deployment-$app.yaml" +echo "Running for $app:$deployment" mkdir -p $(dirname $tmp_path) +echo " > updating dependencies..." pushd $full_path &> /dev/null -helm dependency update &> /dev/null +helm dependency update popd &> /dev/null if [ -f "$tmp_path" ]; then - echo "found existing file" - echo "renaming old file to "$tmp_path".old" + echo " > found existing file" + echo " > renaming old file to "$tmp_path".old" mv $tmp_path $tmp_path".old" fi -echo $extraArgs +echo " > running..." helm template $app $full_path --namespace $app \ --debug \ diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index d365286..e159db7 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -44,7 +44,7 @@ videohosting: apps: videohosting: values: |- - {{ .Values.videohosting | toYaml }} + {{ .Values.videohosting | toYaml }} nextcloud: values: |- nextcloud: @@ -58,31 +58,30 @@ apps: nextcloudData: storageClass: {{ .Values.global.nfs.storageClass }} existingClaim: {{ .Values.storage.nextcloudData.name }} - ingresses: + ingresses: values: |- - services: - - prefix: "argocd.core" - service: "argocd-server" - namespace: "argocd" - - prefix: "demo" - service: "dummy-app" - namespace: "apps-ingresses" - - prefix: "nextcloud" - service: "nextcloud" - namespace: "apps-nextcloud" - port: 8080 - middleware: "apps-nextcloud-nextcloud" - {{ range $name, $data := .Values.videohosting.linuxserverServices }} - - prefix: "{{ $name }}.vh" - service: {{ $name }} - namespace: "apps-videohosting" - port: {{ $data.tcp.web }} - middleware: "ingresses-chain-authelia" - {{ end }} - - prefix: "plex" - service: "plex" - namespace: "apps-videohosting" - port: 32400 + services: + - prefix: "argocd.core" + service: "argocd-server" + namespace: "argocd" + - prefix: "demo" + service: "dummy-app" + namespace: "apps-ingresses" + - prefix: "nextcloud" + service: "nextcloud" + namespace: "apps-nextcloud" + port: 8080 + middleware: "apps-nextcloud-nextcloud" + - prefix: "plex" + service: "plex" + namespace: "apps-videohosting" + port: 32400 + {{- range $k, $v := .Values.videohosting.linuxserverServices }} + - prefix: "{{ $k }}.vh" + service: "{{ $k }}" + namespace: "apps-videohosting" + port: {{ $v.ports.tcp.web }} + {{- end }} db-users: namespace: chart-database