diff --git a/p3/scripts/argo-install.sh b/p3/scripts/argo-install.sh index 77832f2..76fc5f9 100755 --- a/p3/scripts/argo-install.sh +++ b/p3/scripts/argo-install.sh @@ -1,7 +1,5 @@ #!/usr/bin/env sh -set -e - k3d cluster create inception-of-things kubectl create namespace argocd kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml @@ -28,8 +26,7 @@ echo 'App is starting...' kubectl wait --namespace dev \ --for=condition=ready pod \ --selector=app.kubernetes.io/name=app-deployment \ - --timeout=300s \ - 1>/dev/null 2>/dev/null + --timeout=300s echo 'App imported in ArgoCD' TRAEFIK_IP=$(kubectl get service -n kube-system traefik -o jsonpath='{.status.loadBalancer.ingress[0].ip}') diff --git a/p3/scripts/uninstall.sh b/p3/scripts/uninstall.sh index 846e4ab..9850ce3 100755 --- a/p3/scripts/uninstall.sh +++ b/p3/scripts/uninstall.sh @@ -1,5 +1,8 @@ +SCRIPT_PATH="$(realpath "${BASH_SOURCE[0]}")" +SCRIPT_DIR="$(dirname "$SCRIPT_PATH")" + kubectl delete -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml -kubectl delete -n argocd -f ../confs/argocd-app.yml +kubectl delete -n argocd -f "$SCRIPT_DIR/../confs/argocd-app.yml" kubectl delete namespace argocd kubectl delete namespace dev -k3d cluster delete inception-of-things \ No newline at end of file +k3d cluster delete inception-of-things diff --git a/vm/flake.nix b/vm/flake.nix index e8c2563..1b6ca88 100644 --- a/vm/flake.nix +++ b/vm/flake.nix @@ -63,8 +63,8 @@ set -x source ${selfPkgs.vm}/bin/run-${hostname}-vm \ -enable-kvm \ - -m 8G \ - -smp 4 \ + -m 4G \ + -smp 1 \ -cpu host \ -virtfs local,path=$(${pkgs.coreutils}/bin/pwd)/..,mount_tag=host0,security_model=mapped-xattr,id=host0 ''; @@ -81,8 +81,8 @@ ${selfPkgs.vm}/bin/run-${hostname}-vm \ -enable-kvm \ -nographic \ - -m 8G \ - -smp 4 \ + -m 4G \ + -smp 1 \ -cpu host \ -virtfs local,path=$(${pkgs.coreutils}/bin/pwd)/..,mount_tag=host0,security_model=mapped-xattr,id=host0 '';