From 991667079bef3cf01391753a02a599f3f7092e36 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 15 Jul 2024 23:41:35 +1000 Subject: [PATCH] fix namespaces --- apps/homer/env/k3s-cluster/config.json | 1 + infrastructures/ingress-nginx/env/k3s-cluster/config.json | 1 + projects/k3s-cluster-app.yaml | 2 +- projects/k3s-cluster-infra.yaml | 2 +- projects/k3s-cluster-res.yaml | 2 +- resources/ingress-nginx-configmap/env/k3s-cluster/config.json | 1 + resources/local-path-provisioner/env/k3s-cluster/config.json | 1 + resources/namespaces/env/k3s-cluster/config.json | 1 + resources/sealed-secrets/env/k3s-cluster/config.json | 1 + resources/sync-job/env/k3s-cluster/config.json | 1 + scripts/{encript-file-by-age.sh => encrypt-file-by-age.sh} | 0 11 files changed, 10 insertions(+), 3 deletions(-) rename scripts/{encript-file-by-age.sh => encrypt-file-by-age.sh} (100%) diff --git a/apps/homer/env/k3s-cluster/config.json b/apps/homer/env/k3s-cluster/config.json index bc1a9bc..79bd194 100644 --- a/apps/homer/env/k3s-cluster/config.json +++ b/apps/homer/env/k3s-cluster/config.json @@ -1,6 +1,7 @@ { "appName": "homer", "userGivenName": "homer", + "namespace": "homer", "destNamespace": "homer", "destServer": "https://kubernetes.default.svc", "srcPath": "apps/homer/env/k3s-cluster", diff --git a/infrastructures/ingress-nginx/env/k3s-cluster/config.json b/infrastructures/ingress-nginx/env/k3s-cluster/config.json index c4c946b..2f2cd35 100644 --- a/infrastructures/ingress-nginx/env/k3s-cluster/config.json +++ b/infrastructures/ingress-nginx/env/k3s-cluster/config.json @@ -1,6 +1,7 @@ { "appName": "ingress-nginx", "userGivenName": "ingress-nginx", + "namespace": "ingress-nginx", "destNamespace": "ingress-nginx", "destServer": "https://kubernetes.default.svc", "srcPath": "infrastructures/ingress-nginx/env/k3s-cluster", diff --git a/projects/k3s-cluster-app.yaml b/projects/k3s-cluster-app.yaml index 3987395..27a2eeb 100644 --- a/projects/k3s-cluster-app.yaml +++ b/projects/k3s-cluster-app.yaml @@ -46,7 +46,7 @@ spec: app.kubernetes.io/managed-by: argocd app.kubernetes.io/name: '{{ appName }}' name: '{{ userGivenName }}' - namespace: argocd + namespace: '{{ namespace }}' spec: destination: namespace: '{{ destNamespace }}' diff --git a/projects/k3s-cluster-infra.yaml b/projects/k3s-cluster-infra.yaml index e09f6aa..6890179 100644 --- a/projects/k3s-cluster-infra.yaml +++ b/projects/k3s-cluster-infra.yaml @@ -46,7 +46,7 @@ spec: app.kubernetes.io/managed-by: argocd app.kubernetes.io/name: '{{ appName }}' name: '{{ userGivenName }}' - namespace: argocd + namespace: '{{ namespace }}' spec: destination: namespace: '{{ destNamespace }}' diff --git a/projects/k3s-cluster-res.yaml b/projects/k3s-cluster-res.yaml index f7b34f3..fe59844 100644 --- a/projects/k3s-cluster-res.yaml +++ b/projects/k3s-cluster-res.yaml @@ -46,7 +46,7 @@ spec: app.kubernetes.io/managed-by: argocd app.kubernetes.io/name: '{{ appName }}' name: '{{ userGivenName }}' - namespace: argocd + namespace: '{{ namespace }}' spec: destination: namespace: '{{ destNamespace }}' diff --git a/resources/ingress-nginx-configmap/env/k3s-cluster/config.json b/resources/ingress-nginx-configmap/env/k3s-cluster/config.json index 7b6a97c..150a793 100644 --- a/resources/ingress-nginx-configmap/env/k3s-cluster/config.json +++ b/resources/ingress-nginx-configmap/env/k3s-cluster/config.json @@ -1,6 +1,7 @@ { "appName": "ingress-nginx-configmap", "userGivenName": "ingress-nginx-configmap", + "namespace": "ingress-nginx", "destNamespace": "ingress-nginx", "destServer": "https://kubernetes.default.svc", "srcPath": "resources/ingress-nginx-configmap/env/k3s-cluster", diff --git a/resources/local-path-provisioner/env/k3s-cluster/config.json b/resources/local-path-provisioner/env/k3s-cluster/config.json index 44bfa62..fafad8d 100644 --- a/resources/local-path-provisioner/env/k3s-cluster/config.json +++ b/resources/local-path-provisioner/env/k3s-cluster/config.json @@ -1,6 +1,7 @@ { "appName": "local-path-provisioner", "userGivenName": "local-path-provisioner", + "namespace": "local-path-provisioner", "destNamespace": "local-path-provisioner", "destServer": "https://kubernetes.default.svc", "srcPath": "resources/local-path-provisioner/env/k3s-cluster", diff --git a/resources/namespaces/env/k3s-cluster/config.json b/resources/namespaces/env/k3s-cluster/config.json index d027bb8..1892bad 100644 --- a/resources/namespaces/env/k3s-cluster/config.json +++ b/resources/namespaces/env/k3s-cluster/config.json @@ -1,6 +1,7 @@ { "appName": "namespaces", "userGivenName": "namespaces", + "namespace": "argocd", "destNamespace": "argocd", "destServer": "https://kubernetes.default.svc", "srcPath": "resources/namespaces/env/k3s-cluster", diff --git a/resources/sealed-secrets/env/k3s-cluster/config.json b/resources/sealed-secrets/env/k3s-cluster/config.json index ed49ca0..41ce2f9 100644 --- a/resources/sealed-secrets/env/k3s-cluster/config.json +++ b/resources/sealed-secrets/env/k3s-cluster/config.json @@ -1,6 +1,7 @@ { "appName": "sealed-secrets", "userGivenName": "sealed-secrets", + "namespace": "sealed-secrets", "destNamespace": "kube-system", "destServer": "https://kubernetes.default.svc", "srcPath": "resources/sealed-secrets/env/k3s-cluster", diff --git a/resources/sync-job/env/k3s-cluster/config.json b/resources/sync-job/env/k3s-cluster/config.json index 6a1af33..d1b37b7 100644 --- a/resources/sync-job/env/k3s-cluster/config.json +++ b/resources/sync-job/env/k3s-cluster/config.json @@ -1,6 +1,7 @@ { "appName": "sync-job", "userGivenName": "sync-job", + "namespace": "argocd", "destNamespace": "argocd", "destServer": "https://kubernetes.default.svc", "srcPath": "resources/sync-job/env/k3s-cluster", diff --git a/scripts/encript-file-by-age.sh b/scripts/encrypt-file-by-age.sh similarity index 100% rename from scripts/encript-file-by-age.sh rename to scripts/encrypt-file-by-age.sh