From ae350e895b6c657163d7cbbf8da4c0768cbc69fd Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 6 Mar 2024 12:21:54 -0500 Subject: [PATCH] Updated script + argocdUrl --- bin/dryrun-argo.sh | 2 ++ k8s/argocd/templates/app-self.yaml | 1 + k8s/argocd/values-dev.yaml | 3 +++ k8s/argocd/values-prod.yaml | 3 +++ k8s/argocd/values.yaml | 2 ++ shell.nix | 0 6 files changed, 11 insertions(+) create mode 100644 k8s/argocd/values-dev.yaml create mode 100644 k8s/argocd/values-prod.yaml create mode 100644 shell.nix diff --git a/bin/dryrun-argo.sh b/bin/dryrun-argo.sh index 2be7e18..cb5aa23 100755 --- a/bin/dryrun-argo.sh +++ b/bin/dryrun-argo.sh @@ -21,6 +21,7 @@ if [ -f "$tmp_path" ]; then echo " -> Renaming old file to "$tmp_path".old.${num_files}" mv $tmp_path $tmp_path".old.${num_files}" else + rm $tmp_path".old"* echo " -> Renaming old file to "$tmp_path".old" mv $tmp_path $tmp_path".old" fi @@ -29,6 +30,7 @@ helm template $app $full_path --namespace $app \ --debug \ --create-namespace \ --values k8s/argocd/values.yaml \ + --values k8s/argocd/values-${deployment}.yaml \ --set selfapp.deployment="${deployment}" \ --set selfapp.enabled="true" \ --set selfapp.sshkey="$(cat ~/.ssh/id_rsa)" \ diff --git a/k8s/argocd/templates/app-self.yaml b/k8s/argocd/templates/app-self.yaml index d7d50f9..4b0b6cc 100644 --- a/k8s/argocd/templates/app-self.yaml +++ b/k8s/argocd/templates/app-self.yaml @@ -30,6 +30,7 @@ spec: helm: valueFiles: - values.yaml + - values-{{ .Values.selfapp.deployment }}.yaml parameters: - name: "selfapp.deployment" value: {{ .Values.selfapp.deployment | quote }} diff --git a/k8s/argocd/values-dev.yaml b/k8s/argocd/values-dev.yaml new file mode 100644 index 0000000..80d1576 --- /dev/null +++ b/k8s/argocd/values-dev.yaml @@ -0,0 +1,3 @@ +argo-cd: + notifications: + argocdUrl: "https://argocd.home.local" diff --git a/k8s/argocd/values-prod.yaml b/k8s/argocd/values-prod.yaml new file mode 100644 index 0000000..3ad2aaf --- /dev/null +++ b/k8s/argocd/values-prod.yaml @@ -0,0 +1,3 @@ +argo-cd: + notifications: + argocdUrl: "https://argocd.core.home.sosnovsky.ca" diff --git a/k8s/argocd/values.yaml b/k8s/argocd/values.yaml index 3c9af46..bc17633 100644 --- a/k8s/argocd/values.yaml +++ b/k8s/argocd/values.yaml @@ -1,4 +1,6 @@ argo-cd: + notifications: + argocdUrl: "" configs: cm: exec.enabled: true diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..e69de29