rename aoa in k8s1

README.md

@@ -72,9 +72,15 @@ k8s0
 ### Apply `aoa.yaml` in the `gitops` namespace:
 ```bash
 cd helm
-kubectl apply -f k3s0/aoa.yaml -n gitops
+kubectl apply -f cluster/k3s0-ops/helm/aoa.yaml -n gitops
 ```
 
+```bash
+argocd cluster add default --kubeconfig ~/.kube/k3s1-app --name default --grpc-web
+```
+
+or
+
 k8s1
 ```bash
 k apply -f k3s1-cluster-secret.yaml -n kube-system
@@ -87,15 +93,10 @@ k8s0
 ```bash
 k apply -f k3s1-cluster-secret.yaml -n gitops
 ```
-or
-
-```bash
-argocd cluster add default --kubeconfig ~/.kube/k3s1-app --name default --grpc-web
-```
 
 k8s0
 ```bash
-k apply k3s0/aoa.yaml -n gitops
+k apply k3s1/aoa.yaml -n gitops
 ```
 
 The cluster will be automatically bootstrapped.

cluster/k3s1-app/helm/aoa.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   destination:
     namespace: gitops
-    server: https://kubernetes.default.svc 
+    server: https://kubernetes.default.svc
   project: ops-cluster-bootstrap
   source:
     path: cluster/k3s1-app/helm/app-of-apps

cluster/k3s1-app/helm/app-of-apps/100_system_cilium.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: system-cilium
+  name: system-cilium-app-cluster
   namespace: gitops
   annotations:
     argocd.argoproj.io/sync-wave: "1"

cluster/k3s1-app/helm/app-of-apps/110_system_metallb_operator.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: system-metallb-operator
+  name: system-metallb-operator-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/120_system_metallb_config.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: system-metallb-config
+  name: system-metallb-config-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/150_system_ingress_nginx.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: system-ingress-nginx
+  name: system-ingress-nginx--app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/200_system_cert_manager.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: system-cert-manager
+  name: system-cert-manager--app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/300_system_cluster_issuer.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: system-cluster-issuer
+  name: system-cluster-issuer-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/400_system_postgres_operator.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: system-postgres-operator
+  name: system-postgres-operator-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/410_system_minio_operator.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: system-minio-operator
+  name: system-minio-operator-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/500_system_external_secrets.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: system-external-secrets
+  name: system-external-secrets-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/910_app_portfolio.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: app-portfolio
+  name: app-portfolio-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/920_app_streamlit_wh.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: app-streamlit-wh
+  name: app-streamlit-wh-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/930_app_todo_go_htmx.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: app-todo-go-htmx
+  name: app-todo-go-htmx-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/940_app_notes_flask.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: app-notes-flask
+  name: app-notes-flask-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/950_app_plausible_analytics.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: app-plausible-analytics
+  name: app-plausible-analytics-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/955_app_uptime_kuma.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: app-uptime-kuma
+  name: app-uptime-kuma-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io

cluster/k3s1-app/helm/app-of-apps/960_app_wordpress_ds.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: app-wordpress-ds
+  name: app-wordpress-ds-app-cluster
   namespace: gitops
   finalizers:
     - resources-finalizer.argocd.argoproj.io