Refactor noble cluster configurations to transition from the deprecated apps structure to a streamlined bootstrap approach. Update paths in various YAML files and README documentation to reflect the new organization under clusters/noble/bootstrap. This change enhances clarity and consistency across the deployment process, ensuring that all components are correctly referenced and documented for user guidance.

2026-03-28 17:03:15 -04:00
parent 90fd8fb8a6
commit 76eb7df18c
58 changed files with 204 additions and 203 deletions
--- a/ansible/roles/noble_cert_manager/tasks/main.yml
+++ b/ansible/roles/noble_cert_manager/tasks/main.yml
@@ -5,7 +5,7 @@
      - kubectl
      - apply
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/cert-manager/namespace.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/cert-manager/namespace.yaml"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  changed_when: true
@@ -23,7 +23,7 @@
      - --version
      - v1.20.0
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/cert-manager/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/cert-manager/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
@@ -51,7 +51,7 @@
  ansible.builtin.debug:
    msg: >-
      Secret cert-manager/cloudflare-dns-api-token not found.
-      Create it per clusters/noble/apps/cert-manager/README.md before ClusterIssuers can succeed.
+      Create it per clusters/noble/bootstrap/cert-manager/README.md before ClusterIssuers can succeed.
  when:
    - noble_cert_manager_require_cloudflare_secret | default(true) | bool
    - noble_cf_secret.rc != 0
@@ -62,7 +62,7 @@
      - kubectl
      - apply
      - -k
-      - "{{ noble_repo_root }}/clusters/noble/apps/cert-manager"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/cert-manager"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  changed_when: true
--- a/ansible/roles/noble_cilium/tasks/main.yml
+++ b/ansible/roles/noble_cilium/tasks/main.yml
@@ -12,7 +12,7 @@
      - --version
      - "1.16.6"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/cilium/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/cilium/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
--- a/ansible/roles/noble_kube_vip/tasks/main.yml
+++ b/ansible/roles/noble_kube_vip/tasks/main.yml
@@ -5,7 +5,7 @@
      - kubectl
      - apply
      - -k
-      - "{{ noble_repo_root }}/clusters/noble/apps/kube-vip"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/kube-vip"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  changed_when: true
--- a/ansible/roles/noble_kyverno/tasks/main.yml
+++ b/ansible/roles/noble_kyverno/tasks/main.yml
@@ -5,7 +5,7 @@
      - kubectl
      - apply
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/kyverno/namespace.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/kyverno/namespace.yaml"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  changed_when: true
@@ -23,7 +23,7 @@
      - --version
      - "3.7.1"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/kyverno/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/kyverno/values.yaml"
      - --wait
      - --timeout
      - 15m
--- a/ansible/roles/noble_kyverno_policies/tasks/main.yml
+++ b/ansible/roles/noble_kyverno_policies/tasks/main.yml
@@ -12,7 +12,7 @@
      - --version
      - "3.7.1"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/kyverno/policies-values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/kyverno/policies-values.yaml"
      - --wait
      - --timeout
      - 10m
--- a/ansible/roles/noble_landing_urls/templates/noble-lab-ui-urls.md.j2
+++ b/ansible/roles/noble_landing_urls/templates/noble-lab-ui-urls.md.j2
@@ -2,7 +2,7 @@

 > **Sensitive:** This file may include **passwords read from Kubernetes Secrets** when credential fetch ran. It is **gitignored** — do not commit or share.

-**DNS:** point **`*.apps.noble.lab.pcenicni.dev`** at the Traefik **LoadBalancer** (MetalLB **`192.168.50.211`** by default — see `clusters/noble/apps/traefik/values.yaml`).
+**DNS:** point **`*.apps.noble.lab.pcenicni.dev`** at the Traefik **LoadBalancer** (MetalLB **`192.168.50.211`** by default — see `clusters/noble/bootstrap/traefik/values.yaml`).

 **TLS:** **cert-manager** + **`letsencrypt-prod`** on each Ingress (public **DNS-01** for **`pcenicni.dev`**).

@@ -24,7 +24,7 @@ This file is **generated** by Ansible (`noble_landing_urls` role). Use it as a t
 | **Prometheus** | — | No auth in default install (lab). |
 | **Alertmanager** | — | No auth in default install (lab). |
 | **Longhorn** | — | No default login unless you enable access control in the UI settings. |
-| **Vault** | Token | Root token is only from **`vault operator init`** (not stored in git). See `clusters/noble/apps/vault/README.md`. |
+| **Vault** | Token | Root token is only from **`vault operator init`** (not stored in git). See `clusters/noble/bootstrap/vault/README.md`. |

 ### Commands to retrieve passwords (if not filled above)

--- a/ansible/roles/noble_longhorn/tasks/main.yml
+++ b/ansible/roles/noble_longhorn/tasks/main.yml
@@ -5,7 +5,7 @@
      - kubectl
      - apply
      - -k
-      - "{{ noble_repo_root }}/clusters/noble/apps/longhorn"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/longhorn"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  changed_when: true
@@ -22,7 +22,7 @@
      - longhorn-system
      - --create-namespace
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/longhorn/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/longhorn/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
--- a/ansible/roles/noble_metallb/tasks/main.yml
+++ b/ansible/roles/noble_metallb/tasks/main.yml
@@ -5,7 +5,7 @@
      - kubectl
      - apply
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/metallb/namespace.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/metallb/namespace.yaml"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  changed_when: true
@@ -33,7 +33,7 @@
      - kubectl
      - apply
      - -k
-      - "{{ noble_repo_root }}/clusters/noble/apps/metallb"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/metallb"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  changed_when: true
--- a/ansible/roles/noble_metrics_server/tasks/main.yml
+++ b/ansible/roles/noble_metrics_server/tasks/main.yml
@@ -12,7 +12,7 @@
      - --version
      - "3.13.0"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/metrics-server/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/metrics-server/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
--- a/ansible/roles/noble_newt/tasks/main.yml
+++ b/ansible/roles/noble_newt/tasks/main.yml
@@ -10,7 +10,7 @@
      - kubectl
      - apply
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/newt/namespace.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/newt/namespace.yaml"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  when: noble_newt_install | bool
@@ -33,7 +33,7 @@
      - --version
      - "1.2.0"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/newt/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/newt/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
--- a/ansible/roles/noble_platform/tasks/main.yml
+++ b/ansible/roles/noble_platform/tasks/main.yml
@@ -1,13 +1,13 @@
 ---
-# Mirrors former **noble-platform** Argo Application: Helm releases + plain manifests under clusters/noble/apps.
- name: Apply clusters/noble/apps kustomize (namespaces, Grafana Loki datasource, Vault extras)
+# Mirrors former **noble-platform** Argo Application: Helm releases + plain manifests under clusters/noble/bootstrap.
+- name: Apply clusters/noble/bootstrap kustomize (namespaces, Grafana Loki datasource, Vault extras)
  ansible.builtin.command:
    argv:
      - kubectl
      - apply
      - "--request-timeout={{ noble_platform_kubectl_request_timeout }}"
      - -k
-      - "{{ noble_repo_root }}/clusters/noble/apps"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  register: noble_platform_kustomize
@@ -29,7 +29,7 @@
      - --version
      - "2.18.4"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/sealed-secrets/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/sealed-secrets/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
@@ -48,7 +48,7 @@
      - --version
      - "2.2.0"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/external-secrets/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/external-secrets/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
@@ -82,7 +82,7 @@
      - --version
      - "0.32.0"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/vault/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/vault/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
@@ -102,7 +102,7 @@
      - --version
      - "82.15.1"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/kube-prometheus-stack/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/kube-prometheus-stack/values.yaml"
      - --wait
      - --timeout
      - 30m
@@ -123,7 +123,7 @@
      - --version
      - "6.55.0"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/loki/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/loki/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
@@ -142,7 +142,7 @@
      - --version
      - "0.56.0"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/fluent-bit/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/fluent-bit/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
@@ -161,7 +161,7 @@
      - -n
      - headlamp
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/headlamp/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/headlamp/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
--- a/ansible/roles/noble_post_deploy/tasks/main.yml
+++ b/ansible/roles/noble_post_deploy/tasks/main.yml
@@ -4,9 +4,9 @@
    msg: |
      1. kubectl -n vault get pods  (wait for Running)
      2. kubectl -n vault exec -it vault-0 -- vault operator init  (once; save keys)
-      3. Unseal per clusters/noble/apps/vault/README.md
-      4. ./clusters/noble/apps/vault/configure-kubernetes-auth.sh
-      5. kubectl apply -f clusters/noble/apps/external-secrets/examples/vault-cluster-secret-store.yaml
+      3. Unseal per clusters/noble/bootstrap/vault/README.md
+      4. ./clusters/noble/bootstrap/vault/configure-kubernetes-auth.sh
+      5. kubectl apply -f clusters/noble/bootstrap/external-secrets/examples/vault-cluster-secret-store.yaml

 - name: Optional — apply Vault ClusterSecretStore for External Secrets
  ansible.builtin.command:
@@ -14,7 +14,7 @@
      - kubectl
      - apply
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/external-secrets/examples/vault-cluster-secret-store.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/external-secrets/examples/vault-cluster-secret-store.yaml"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  when: noble_apply_vault_cluster_secret_store | default(false) | bool
@@ -24,4 +24,4 @@
  ansible.builtin.debug:
    msg: >-
      Optional: kubectl apply -f clusters/noble/bootstrap/argocd/root-application.yaml
-      after editing repoURL. Core workloads are not synced by Argo — see bootstrap/argocd/apps/README.md
+      after editing repoURL. Core workloads are not synced by Argo — see clusters/noble/apps/README.md
--- a/ansible/roles/noble_traefik/tasks/main.yml
+++ b/ansible/roles/noble_traefik/tasks/main.yml
@@ -5,7 +5,7 @@
      - kubectl
      - apply
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/traefik/namespace.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/traefik/namespace.yaml"
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"
  changed_when: true
@@ -23,7 +23,7 @@
      - --version
      - "39.0.6"
      - -f
-      - "{{ noble_repo_root }}/clusters/noble/apps/traefik/values.yaml"
+      - "{{ noble_repo_root }}/clusters/noble/bootstrap/traefik/values.yaml"
      - --wait
  environment:
    KUBECONFIG: "{{ noble_kubeconfig }}"