diff --git a/infrastructures/metallb-conf/env/k3s-cluster/advertisement.yaml b/resources/metallb-conf/env/k3s-cluster/advertisement.yaml similarity index 100% rename from infrastructures/metallb-conf/env/k3s-cluster/advertisement.yaml rename to resources/metallb-conf/env/k3s-cluster/advertisement.yaml diff --git a/infrastructures/metallb-conf/env/k3s-cluster/cluster-ip.yaml b/resources/metallb-conf/env/k3s-cluster/cluster-ip.yaml similarity index 100% rename from infrastructures/metallb-conf/env/k3s-cluster/cluster-ip.yaml rename to resources/metallb-conf/env/k3s-cluster/cluster-ip.yaml diff --git a/infrastructures/metallb-conf/env/k3s-cluster/config.json b/resources/metallb-conf/env/k3s-cluster/config.json similarity index 83% rename from infrastructures/metallb-conf/env/k3s-cluster/config.json rename to resources/metallb-conf/env/k3s-cluster/config.json index af85c10..c3fa10a 100644 --- a/infrastructures/metallb-conf/env/k3s-cluster/config.json +++ b/resources/metallb-conf/env/k3s-cluster/config.json @@ -4,7 +4,7 @@ "namespace": "metallb-system", "destNamespace": "metallb-system", "destServer": "https://kubernetes.default.svc", - "srcPath": "infrastructures/metallb-conf/env/k3s-cluster", + "srcPath": "resources/metallb-conf/env/k3s-cluster", "srcRepoURL": "https://github.com/3dwardch3ng/home-cluster-ops.git", "srcTargetRevision": "", "labels": null, diff --git a/infrastructures/metallb-conf/env/k3s-cluster/kustomization.yaml b/resources/metallb-conf/env/k3s-cluster/kustomization.yaml similarity index 100% rename from infrastructures/metallb-conf/env/k3s-cluster/kustomization.yaml rename to resources/metallb-conf/env/k3s-cluster/kustomization.yaml diff --git a/infrastructures/metallb/env/k3s-cluster/config.json.bak b/resources/metallb/env/k3s-cluster/config.json.bak similarity index 84% rename from infrastructures/metallb/env/k3s-cluster/config.json.bak rename to resources/metallb/env/k3s-cluster/config.json.bak index d823736..4db134e 100644 --- a/infrastructures/metallb/env/k3s-cluster/config.json.bak +++ b/resources/metallb/env/k3s-cluster/config.json.bak @@ -4,7 +4,7 @@ "namespace": "metallb-system", "destNamespace": "metallb-system", "destServer": "https://kubernetes.default.svc", - "srcPath": "infrastructures/metallb/env/k3s-cluster", + "srcPath": "resources/metallb/env/k3s-cluster", "srcRepoURL": "https://github.com/3dwardch3ng/home-cluster-ops.git", "srcTargetRevision": "", "labels": null, diff --git a/infrastructures/metallb/env/k3s-cluster/kustomization.yaml b/resources/metallb/env/k3s-cluster/kustomization.yaml similarity index 100% rename from infrastructures/metallb/env/k3s-cluster/kustomization.yaml rename to resources/metallb/env/k3s-cluster/kustomization.yaml diff --git a/infrastructures/metallb/env/k3s-cluster/values.yaml b/resources/metallb/env/k3s-cluster/values.yaml similarity index 100% rename from infrastructures/metallb/env/k3s-cluster/values.yaml rename to resources/metallb/env/k3s-cluster/values.yaml diff --git a/scripts/2.install-argocd.sh b/scripts/2.install-argocd.sh index 2c0723b..3ed358f 100644 --- a/scripts/2.install-argocd.sh +++ b/scripts/2.install-argocd.sh @@ -2,7 +2,6 @@ set -e kubectl apply -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=v2.11.4" -kubectl create namespace argocd || echo "Namespace argocd already exists" helm repo add argo https://argoproj.github.io/argo-helm || echo "Argo repo already exists" helm repo update || echo "Failed to update helm repos" -helm upgrade --install argocd -n argocd -f argocd-values.yaml argo/argo-cd --version 7.3.6 \ No newline at end of file +helm upgrade --install argocd -n argocd --create-namespace -f argocd-values.yaml argo/argo-cd --version 7.5.2 \ No newline at end of file