Let Argo CD reconcile its application catalog

bootstrap/install-argocd.sh

@@ -10,9 +10,9 @@ fi
 
 script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 repository_dir=$(dirname -- "${script_dir}")
-app_dir="${repository_dir}/apps/argocd"
+values_file="${repository_dir}/apps/argocd/values.yaml"
 
-for command in helm kubectl openssl base64 ruby; do
+for command in helm kubectl openssl base64; do
   if ! command -v "${command}" >/dev/null 2>&1; then
     echo "Required command not found: ${command}" >&2
     exit 1
@@ -54,21 +54,10 @@ if ! kubectl --namespace argocd get secret argocd-oidc >/dev/null 2>&1; then
   exit 1
 fi
 
-helm dependency update "${app_dir}"
-set -- "${app_dir}"/charts/argo-cd-*.tgz
-if [ "$#" -ne 1 ] || [ ! -f "$1" ]; then
-  echo "Expected exactly one downloaded argo-cd chart archive" >&2
-  exit 1
-fi
-chart_archive=$1
-
-child_values=$(mktemp)
-trap 'rm -f "${child_values}"' EXIT HUP INT TERM
-ruby -ryaml -e 'puts YAML.dump(YAML.load_file(ARGV.fetch(0)).fetch("argo-cd"))' \
-  "${app_dir}/values.yaml" > "${child_values}"
-
-helm upgrade --install argocd "${chart_archive}" \
+helm upgrade --install argocd argo-cd \
+  --repo https://argoproj.github.io/argo-helm \
+  --version 10.10.5 \
   --namespace argocd \
-  --values "${child_values}" \
+  --values "${values_file}" \
   --wait \
   --timeout 10m

bootstrap/install.sh

@@ -9,8 +9,16 @@ if [ "${current_context}" != "${expected_context}" ]; then
 fi
 
 script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
-kubectl apply --dry-run=server -k "${script_dir}"
-kubectl apply -k "${script_dir}"
+repository_dir=$(dirname -- "${script_dir}")
+root_application="${repository_dir}/root-application.yaml"
+kubectl apply --dry-run=server --filename "${root_application}"
+kubectl apply --filename "${root_application}"
+kubectl --namespace argocd wait application/homelab-bootstrap \
+  --for=jsonpath='{.status.sync.status}'=Synced \
+  --timeout=5m
+kubectl --namespace argocd wait application/homelab-bootstrap \
+  --for=jsonpath='{.status.health.status}'=Healthy \
+  --timeout=5m
 kubectl --namespace argocd wait application/immich-sync \
   --for=jsonpath='{.status.sync.status}'=Synced \
   --timeout=5m
@@ -56,7 +64,19 @@ do
     --timeout=5m
 done
 for application in \
-  artcraft \
+  cadcraft \
+  deckcraft \
+  designcraft \
+  effectcraft \
+  figcraft \
+  filmcraft \
+  gridcraft \
+  lightcraft \
+  pdfcraft \
+  photocraft \
+  soundcraft \
+  vectorcraft \
+  wordcraft \
   brunner-ninja \
   coturn \
   flaresolverr \