From 434eb48631eb1fe717de23d60c94fb94987a6e7f Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 14 Mar 2023 22:37:14 +0000 Subject: [PATCH] fixing up longhorn --- bin/dryrun-app.sh | 21 +++++++++++++-------- bin/upgrade-app.sh | 19 +++++++++++++++++++ k8s/infra/longhorn/templates/iscsi.yaml | 2 +- k8s/infra/longhorn/templates/nfs.yaml | 2 +- k8s/infra/longhorn/values-dev.yaml | 2 +- k8s/infra/longhorn/values.yaml | 2 +- 6 files changed, 36 insertions(+), 12 deletions(-) create mode 100755 bin/upgrade-app.sh diff --git a/bin/dryrun-app.sh b/bin/dryrun-app.sh index 237c694..cf8144b 100755 --- a/bin/dryrun-app.sh +++ b/bin/dryrun-app.sh @@ -5,15 +5,20 @@ full_path=${1} deployment=${2:-dev} app=$(basename $full_path) location=$(dirname $full_path) -tmp_path=$(realpath ".tmp/$location/$deployment-$app.yaml") -echo "writing $location/$app to $tmp_path" - +tmp_path=".tmp/$location/$deployment-$app.yaml" +argocd_values_path=$(realpath k8s/argocd/values-$deployment.yaml) +echo "> writing $location/$app to $tmp_path" +echo "> using argo values of $argocd_values_path" +cat $argocd_values_path | yq mkdir -p $(dirname $tmp_path) -pushd $full_path -helm dependency update -helm template $app . --namespace $app \ +pushd $full_path &> /dev/null +helm dependency update &> /dev/null +popd &> /dev/null + +helm template $app $full_path --namespace $app \ --debug \ - --values values.yaml \ - --values values-$deployment.yaml \ + --values $argocd_values_path \ + --values $full_path/values.yaml \ + --values $full_path/values-$deployment.yaml \ > $tmp_path \ No newline at end of file diff --git a/bin/upgrade-app.sh b/bin/upgrade-app.sh new file mode 100755 index 0000000..b1eae58 --- /dev/null +++ b/bin/upgrade-app.sh @@ -0,0 +1,19 @@ +#!/bin/bash +set -e + +full_path=${1} +deployment=${2:-dev} +app=$(basename $full_path) +location=$(dirname $full_path) +tmp_path=$(realpath ".tmp/$location/$deployment-$app.yaml") +echo "writing $location/$app to $tmp_path" + +mkdir -p $(dirname $tmp_path) + +pushd $full_path +helm dependency update +helm upgrade $app . --namespace $app \ + --debug \ + --values values.yaml \ + --values values-$deployment.yaml \ + > $tmp_path \ No newline at end of file diff --git a/k8s/infra/longhorn/templates/iscsi.yaml b/k8s/infra/longhorn/templates/iscsi.yaml index 6027da2..71e9146 100644 --- a/k8s/infra/longhorn/templates/iscsi.yaml +++ b/k8s/infra/longhorn/templates/iscsi.yaml @@ -24,7 +24,7 @@ spec: - nsenter - --mount=/proc/1/ns/mnt - -- - - bash + - sh - -c - *cmd image: alpine:3.12 diff --git a/k8s/infra/longhorn/templates/nfs.yaml b/k8s/infra/longhorn/templates/nfs.yaml index c62d3bc..1c896ae 100644 --- a/k8s/infra/longhorn/templates/nfs.yaml +++ b/k8s/infra/longhorn/templates/nfs.yaml @@ -25,7 +25,7 @@ spec: - nsenter - --mount=/proc/1/ns/mnt - -- - - bash + - sh - -c - *cmd image: alpine:3.12 diff --git a/k8s/infra/longhorn/values-dev.yaml b/k8s/infra/longhorn/values-dev.yaml index 7085e92..490a0b7 100644 --- a/k8s/infra/longhorn/values-dev.yaml +++ b/k8s/infra/longhorn/values-dev.yaml @@ -1 +1 @@ -global: +global: {} diff --git a/k8s/infra/longhorn/values.yaml b/k8s/infra/longhorn/values.yaml index 7085e92..490a0b7 100644 --- a/k8s/infra/longhorn/values.yaml +++ b/k8s/infra/longhorn/values.yaml @@ -1 +1 @@ -global: +global: {}