diff --git a/bootstrap/Makefile b/bootstrap/Makefile index ada00d3e..b46540d0 100644 --- a/bootstrap/Makefile +++ b/bootstrap/Makefile @@ -2,7 +2,6 @@ .EXPORT_ALL_VARIABLES: KUBECONFIG = ../metal/kubeconfig.yaml -NAMESPACE = argocd default: namespace apply @@ -14,9 +13,4 @@ namespace: | kubectl apply -f - apply: charts - # ArgoCD only uses Helm as YAML generator - helm template \ - --include-crds \ - --namespace ${NAMESPACE} \ - argocd . \ - | kubectl apply -n argocd -f - + ./apply.sh diff --git a/bootstrap/apply.sh b/bootstrap/apply.sh new file mode 100755 index 00000000..de4b3b86 --- /dev/null +++ b/bootstrap/apply.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +curl -fks --connect-timeout 5 https://git.khuedoan.com \ + || extra_args="--values values-seed.yaml" + +helm template \ + --include-crds \ + --namespace argocd \ + ${extra_args} \ + argocd . \ + +# TODO https://github.com/argoproj/argo-helm/pull/1070 +# kubectl --namespace argocd wait --timeout=300s --for condition=ResourcesUpToDate \ +# applicationset/system \ +# applicationset/platform \ +# applicationset/apps diff --git a/bootstrap/values-seed.yaml b/bootstrap/values-seed.yaml new file mode 100644 index 00000000..ae729830 --- /dev/null +++ b/bootstrap/values-seed.yaml @@ -0,0 +1,2 @@ +gitops: + repo: https://github.com/khuedoan/homelab