From 765faba4d682cd9149913e211dee87be4fbd1700 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 15 Jul 2024 01:12:36 +1000 Subject: [PATCH 1/2] fix app name --- projects/k3s-cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/k3s-cluster.yaml b/projects/k3s-cluster.yaml index 9d1e810..8a39757 100644 --- a/projects/k3s-cluster.yaml +++ b/projects/k3s-cluster.yaml @@ -66,7 +66,7 @@ spec: labels: app.kubernetes.io/managed-by: argocd app.kubernetes.io/name: '{{ appName }}' - name: k3s-cluster-{{ userGivenName }} + name: {{ userGivenName }} namespace: argocd spec: destination: From 6d08fbb130b4b4fad2ad2256a66b20ddea59e272 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 15 Jul 2024 01:17:33 +1000 Subject: [PATCH 2/2] refactor --- .../env}/k3s-cluster/config.json | 8 ++++---- .../{overlays => env}/k3s-cluster/kustomization.yaml | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename apps/{my-app/overlays => ingress-nginx/env}/k3s-cluster/config.json (55%) rename apps/my-app/{overlays => env}/k3s-cluster/kustomization.yaml (100%) diff --git a/apps/my-app/overlays/k3s-cluster/config.json b/apps/ingress-nginx/env/k3s-cluster/config.json similarity index 55% rename from apps/my-app/overlays/k3s-cluster/config.json rename to apps/ingress-nginx/env/k3s-cluster/config.json index f221d7c..d11eae8 100644 --- a/apps/my-app/overlays/k3s-cluster/config.json +++ b/apps/ingress-nginx/env/k3s-cluster/config.json @@ -1,9 +1,9 @@ { - "appName": "my-app", - "userGivenName": "my-app", - "destNamespace": "default", + "appName": "ingress-nginx", + "userGivenName": "ingress-nginx", + "destNamespace": "ingress-nginx", "destServer": "https://kubernetes.default.svc", - "srcPath": "apps/my-app/overlays/k3s-cluster", + "srcPath": "apps/ingress-nginx/env/k3s-cluster", "srcRepoURL": "https://github.com/3dwardch3ng/home-cluster-ops.git", "srcTargetRevision": "", "labels": null, diff --git a/apps/my-app/overlays/k3s-cluster/kustomization.yaml b/apps/my-app/env/k3s-cluster/kustomization.yaml similarity index 100% rename from apps/my-app/overlays/k3s-cluster/kustomization.yaml rename to apps/my-app/env/k3s-cluster/kustomization.yaml