diff --git a/bootstrap/platform/main.tf b/bootstrap/platform/main.tf index c6d76df..fa3bd14 100644 --- a/bootstrap/platform/main.tf +++ b/bootstrap/platform/main.tf @@ -1221,7 +1221,7 @@ resource "null_resource" "argocd_ready" { namespace = var.argocd.namespace version = var.argocd.version node_selector = jsonencode(local.argocd_node_selector) - readiness_check = "6" + readiness_check = "7" } provisioner "local-exec" { @@ -1262,22 +1262,9 @@ wait_for_argocd_component() { return 0 fi - echo "Waiting for Argo CD $target pods with selector $selector..." - for _ in $(seq 1 120); do - pod_count="$(kubectl --kubeconfig "$kubeconfig" -n "$namespace" get pods -l "$selector" -o name 2>/dev/null | wc -l | tr -d ' ')" - if [ "$pod_count" -gt 0 ]; then - break - fi - sleep 5 - done - if [ "$pod_count" -eq 0 ]; then - echo "Timed out waiting for pods for Argo CD $target." >&2 - dump_argocd_readiness_debug "$target" "$selector" - exit 1 - fi - - if ! kubectl --kubeconfig "$kubeconfig" -n "$namespace" wait --for=condition=Ready pod -l "$selector" --timeout=600s; then - echo "Timed out waiting for ready pods for Argo CD $target." >&2 + echo "Waiting for Argo CD $target rollout..." + if ! kubectl --kubeconfig "$kubeconfig" -n "$namespace" rollout status "$target" --timeout=600s; then + echo "Timed out waiting for Argo CD $target rollout." >&2 dump_argocd_readiness_debug "$target" "$selector" exit 1 fi diff --git a/jeannie b/jeannie index cdace2a..0bc0bc7 100755 --- a/jeannie +++ b/jeannie @@ -5077,6 +5077,12 @@ apps() { echo "Application deployment successfully completed." } +platform_apply() { + require_debian_server "platform" + + run_tofu_stack "bootstrap/platform" +} + edge_apply() { require_debian_server "edge" @@ -7853,6 +7859,7 @@ Operator View And Reports Observability And GitOps grafana-dashboards {list|apply} List or apply repo-managed Grafana dashboards. gitops-status Print focused Argo CD health and sync status. + platform Deploy platform stack only. edge Deploy/check the OCI edge stack only. promote {plan|validate|rollback APP} Run canary promotion gates and rollback plan. cert-check Check public DNS, TLS, and edge URL health. @@ -7975,6 +7982,14 @@ case "${1:-}" in gitops-status) gitops_status ;; + platform) + record_change_journal "platform" "$@" + require_debian_server "platform" + jeannie_log_start "platform" + jeannie_step_plan 1 + run_step "Platform OpenTofu apply" platform_apply + echo "Log: ${JEANNIE_LOG_FILE}" + ;; edge) record_change_journal "edge" "$@" edge_apply