diff --git a/Taskfile.yaml b/Taskfile.yaml index a067523..122df36 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -65,7 +65,7 @@ tasks: platform:install: desc: Bootstrap ArgoCD and platform components cmds: - - kubectl apply -k {{.K8S_DIR}}/argocd/ + - kubectl apply --server-side --force-conflicts -k {{.K8S_DIR}}/argocd/ - echo "ArgoCD installed. It will sync remaining platform components." platform:status: diff --git a/infra/kubernetes/argocd/kustomization.yaml b/infra/kubernetes/argocd/kustomization.yaml index 000b45a..d90fc58 100644 --- a/infra/kubernetes/argocd/kustomization.yaml +++ b/infra/kubernetes/argocd/kustomization.yaml @@ -3,7 +3,7 @@ kind: Kustomization namespace: argocd resources: - namespace.yaml - - https://raw.githubusercontent.com/argoproj/argo-cd/v2.13.3/manifests/install.yaml + - https://raw.githubusercontent.com/argoproj/argo-cd/v3.3.4/manifests/install.yaml - app-of-apps.yaml - appsets/platform.yaml - appsets/apps.yaml