diff --git a/bootstrap/Makefile b/bootstrap/Makefile index 5ba99d91..d8de5db8 100644 --- a/bootstrap/Makefile +++ b/bootstrap/Makefile @@ -3,8 +3,12 @@ KUBECONFIG = ../metal/kubeconfig.yaml -default: argocd +default: argocd root .PHONY: argocd argocd: kustomize build ./argocd | kubectl apply -f - + +.PHONY: root +root: + kustomize build ./root | kubectl apply -f - diff --git a/bootstrap/argocd/kustomization.yaml b/bootstrap/argocd/kustomization.yaml index d52a1d64..245ace47 100644 --- a/bootstrap/argocd/kustomization.yaml +++ b/bootstrap/argocd/kustomization.yaml @@ -6,7 +6,6 @@ resources: - https://raw.githubusercontent.com/argoproj/argo-cd/v2.2.0-rc1/manifests/install.yaml # TODO switch back to stable - https://raw.githubusercontent.com/argoproj-labs/applicationset/master/manifests/install.yaml # TODO switch back to stable - ingress.yaml -- bootstrap.yaml patches: - path: argocd-server-deployment-patch.yaml diff --git a/bootstrap/argocd/bootstrap.yaml b/bootstrap/root/bootstrap.yaml similarity index 100% rename from bootstrap/argocd/bootstrap.yaml rename to bootstrap/root/bootstrap.yaml diff --git a/bootstrap/root/kustomization.yaml b/bootstrap/root/kustomization.yaml index 89e3d309..1d999d58 100644 --- a/bootstrap/root/kustomization.yaml +++ b/bootstrap/root/kustomization.yaml @@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: +- bootstrap.yaml - system.yaml - platform.yaml - apps.yaml