From 31849780ea1ac66e83e48d180382db362e642223 Mon Sep 17 00:00:00 2001 From: Ujstor Date: Thu, 12 Dec 2024 00:13:38 +0100 Subject: [PATCH] rename aoa in k8s1 --- README.md | 15 ++++++++------- cluster/k3s1-app/helm/aoa.yaml | 2 +- .../helm/app-of-apps/100_system_cilium.yaml | 2 +- .../app-of-apps/110_system_metallb_operator.yaml | 2 +- .../app-of-apps/120_system_metallb_config.yaml | 2 +- .../app-of-apps/150_system_ingress_nginx.yaml | 2 +- .../helm/app-of-apps/200_system_cert_manager.yaml | 2 +- .../app-of-apps/300_system_cluster_issuer.yaml | 2 +- .../app-of-apps/400_system_postgres_operator.yaml | 2 +- .../app-of-apps/410_system_minio_operator.yaml | 2 +- .../app-of-apps/500_system_external_secrets.yaml | 2 +- .../helm/app-of-apps/910_app_portfolio.yaml | 2 +- .../helm/app-of-apps/920_app_streamlit_wh.yaml | 2 +- .../helm/app-of-apps/930_app_todo_go_htmx.yaml | 2 +- .../helm/app-of-apps/940_app_notes_flask.yaml | 2 +- .../app-of-apps/950_app_plausible_analytics.yaml | 2 +- .../helm/app-of-apps/955_app_uptime_kuma.yaml | 2 +- .../helm/app-of-apps/960_app_wordpress_ds.yaml | 2 +- 18 files changed, 25 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 4490172..1dd6e69 100644 --- a/README.md +++ b/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. diff --git a/cluster/k3s1-app/helm/aoa.yaml b/cluster/k3s1-app/helm/aoa.yaml index 00a1fa7..d2c0414 100644 --- a/cluster/k3s1-app/helm/aoa.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/100_system_cilium.yaml b/cluster/k3s1-app/helm/app-of-apps/100_system_cilium.yaml index 7e30a86..ebb7aa7 100644 --- a/cluster/k3s1-app/helm/app-of-apps/100_system_cilium.yaml +++ b/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" diff --git a/cluster/k3s1-app/helm/app-of-apps/110_system_metallb_operator.yaml b/cluster/k3s1-app/helm/app-of-apps/110_system_metallb_operator.yaml index f604e39..9fbe81e 100644 --- a/cluster/k3s1-app/helm/app-of-apps/110_system_metallb_operator.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/120_system_metallb_config.yaml b/cluster/k3s1-app/helm/app-of-apps/120_system_metallb_config.yaml index 442dcdf..1714ccc 100644 --- a/cluster/k3s1-app/helm/app-of-apps/120_system_metallb_config.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/150_system_ingress_nginx.yaml b/cluster/k3s1-app/helm/app-of-apps/150_system_ingress_nginx.yaml index ed29a86..417fa58 100644 --- a/cluster/k3s1-app/helm/app-of-apps/150_system_ingress_nginx.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/200_system_cert_manager.yaml b/cluster/k3s1-app/helm/app-of-apps/200_system_cert_manager.yaml index 968eeb5..66b5ad6 100644 --- a/cluster/k3s1-app/helm/app-of-apps/200_system_cert_manager.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/300_system_cluster_issuer.yaml b/cluster/k3s1-app/helm/app-of-apps/300_system_cluster_issuer.yaml index e192a2d..0a7e3ef 100644 --- a/cluster/k3s1-app/helm/app-of-apps/300_system_cluster_issuer.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/400_system_postgres_operator.yaml b/cluster/k3s1-app/helm/app-of-apps/400_system_postgres_operator.yaml index 84a1c7a..0d11df0 100644 --- a/cluster/k3s1-app/helm/app-of-apps/400_system_postgres_operator.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/410_system_minio_operator.yaml b/cluster/k3s1-app/helm/app-of-apps/410_system_minio_operator.yaml index f7e4df2..cb19f6d 100644 --- a/cluster/k3s1-app/helm/app-of-apps/410_system_minio_operator.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/500_system_external_secrets.yaml b/cluster/k3s1-app/helm/app-of-apps/500_system_external_secrets.yaml index 52abcfc..429debd 100644 --- a/cluster/k3s1-app/helm/app-of-apps/500_system_external_secrets.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/910_app_portfolio.yaml b/cluster/k3s1-app/helm/app-of-apps/910_app_portfolio.yaml index 2fcc28a..009e150 100644 --- a/cluster/k3s1-app/helm/app-of-apps/910_app_portfolio.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/920_app_streamlit_wh.yaml b/cluster/k3s1-app/helm/app-of-apps/920_app_streamlit_wh.yaml index 0820549..a79a3d9 100644 --- a/cluster/k3s1-app/helm/app-of-apps/920_app_streamlit_wh.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/930_app_todo_go_htmx.yaml b/cluster/k3s1-app/helm/app-of-apps/930_app_todo_go_htmx.yaml index a65458e..20bb8dc 100644 --- a/cluster/k3s1-app/helm/app-of-apps/930_app_todo_go_htmx.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/940_app_notes_flask.yaml b/cluster/k3s1-app/helm/app-of-apps/940_app_notes_flask.yaml index b04654b..fd91db9 100644 --- a/cluster/k3s1-app/helm/app-of-apps/940_app_notes_flask.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/950_app_plausible_analytics.yaml b/cluster/k3s1-app/helm/app-of-apps/950_app_plausible_analytics.yaml index e68de8d..a918873 100644 --- a/cluster/k3s1-app/helm/app-of-apps/950_app_plausible_analytics.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/955_app_uptime_kuma.yaml b/cluster/k3s1-app/helm/app-of-apps/955_app_uptime_kuma.yaml index b5b46f4..b0137ea 100644 --- a/cluster/k3s1-app/helm/app-of-apps/955_app_uptime_kuma.yaml +++ b/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 diff --git a/cluster/k3s1-app/helm/app-of-apps/960_app_wordpress_ds.yaml b/cluster/k3s1-app/helm/app-of-apps/960_app_wordpress_ds.yaml index ca34ca4..f1b227f 100644 --- a/cluster/k3s1-app/helm/app-of-apps/960_app_wordpress_ds.yaml +++ b/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