fix(heqet)

bin/00_bootstrap_argocd.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 echo "Installing ArgoCD..."
-kubectl apply -n argocd -f manifests/argocd.yaml
+helm repo add argo https://argoproj.github.io/argo-helm
+
+kubectl create ns argocd
+helm install argo argo/argo-cd --namespace argocd
+#kubectl apply -n argocd -f manifests/argocd.yaml
 
 echo
-echo "Bootstrapping Heket Apps..."
+echo "Bootstrapping Heqet Apps..."
 kubectl apply -n argocd -f manifests/heqet-apps.yaml
 
 exit 0

bin/50_port_forward.sh

@@ -5,7 +5,7 @@ echo 'Starting Portforwarding...'
 killall kubectl
 sleep 1
 
-kubectl port-forward svc/argocd-server -n argocd 8081:443 &>/dev/null &
+kubectl port-forward svc/argo-argocd-server -n argocd 8081:443 &>/dev/null &
 kubectl port-forward svc/loki-grafana -n heqet-loki 8082:80 &>/dev/null &
 kubectl port-forward svc/heqet-vault-ui -n heqet-vault 8083:8200 &>/dev/null &
 kubectl port-forward  service/heqet-jaeger-jaeger-operator-jaeger-query -n heqet-jaeger 8084:8200 &>/dev/null &

charts/heqet/templates/heqet.yaml

@@ -23,12 +23,7 @@ spec:
     path: {{ .path | default "." | quote }}
     repoURL: {{ .repoURL | default $.Values.heqet.defaults.repoURL | quote }}
     targetRevision: {{ .targetRevision | default "HEAD" | quote }}
-  syncPolicy:
-    automated:
-      # FIXME: Open Issue: https://github.com/helm/helm/issues/8026
-      prune: {{ $.Values.heqet.defaults.automated.prune | default false  }}
-      selfHeal: {{ $.Values.heqet.defaults.automated.selfHeal | default false }}
-  {{- if .values }}
+    {{- if .values }}
     helm:
       parameters:
     {{- range .values }}
@@ -36,4 +31,9 @@ spec:
           value: {{ .value | quote }}
     {{- end }}
   {{- end }}
+  syncPolicy:
+    automated:
+      # FIXME: Open Issue: https://github.com/helm/helm/issues/8026
+      prune: {{ $.Values.heqet.defaults.automated.prune | default false  }}
+      selfHeal: {{ $.Values.heqet.defaults.automated.selfHeal | default false }}
 {{- end }}