diff --git a/bin/dryrun-app.sh b/bin/dryrun-app.sh index cf8144b..f8cbd00 100755 --- a/bin/dryrun-app.sh +++ b/bin/dryrun-app.sh @@ -6,7 +6,8 @@ deployment=${2:-dev} app=$(basename $full_path) location=$(dirname $full_path) tmp_path=".tmp/$location/$deployment-$app.yaml" -argocd_values_path=$(realpath k8s/argocd/values-$deployment.yaml) +argocd_values_path=$(realpath k8s/argocd/values.yaml) +argocd_values_deployment_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 @@ -19,6 +20,7 @@ popd &> /dev/null helm template $app $full_path --namespace $app \ --debug \ --values $argocd_values_path \ + --values $argocd_values_deployment_path \ --values $full_path/values.yaml \ --values $full_path/values-$deployment.yaml \ > $tmp_path \ No newline at end of file diff --git a/k8s/infra/ingresses/templates/reverse-proxy.yaml b/k8s/infra/ingresses/templates/reverse-proxy.yaml index ae92f11..d570e93 100644 --- a/k8s/infra/ingresses/templates/reverse-proxy.yaml +++ b/k8s/infra/ingresses/templates/reverse-proxy.yaml @@ -33,7 +33,7 @@ spec: secretName: "tls-{{$prefix}}.{{$.Values.global.domain}}" issuerRef: kind: Issuer - name: {{ .Values.global.tls.issuer }} + name: "{{ $.Values.global.tls.issuer }}" commonName: "{{$prefix}}.{{$.Values.global.domain}}" dnsNames: - "{{$prefix}}.{{$.Values.global.domain}}"