move namespaces

Author: angelnu

ansible/flux_install.yaml

@@ -62,6 +62,8 @@
   - name: "Deploy flux to cluster if crd fluxcd.io missing"
     shell: > 
       {{ KUBECTL_BIN }} apply -k ../{{ FLUX_GIT_PATH }}
+    environment:
+      KUBECONFIG: "{{ KUBECTL_CONFIG }}"
     delegate_to: localhost
     register: result
     changed_when:

ansible/group_vars/all.yaml

@@ -49,6 +49,7 @@ K8S_RESET: false
 
 # microk8s
 KUBECTL_BIN: "{{ '/snap/bin/microk8s kubectl' if K8S_TYPE=='k8s' else 'kubectl' }}"
+KUBECTL_CONFIG: "/root/.kube/config-{{ 'production' if production else 'staging' }}"
 DOCKER_USER: !vault |
           $ANSIBLE_VAULT;1.1;AES256
           39353438346635386437643834303766353339336230623766666333626562323231613538656162

ansible/k3s_install.yaml

@@ -158,13 +158,13 @@
     run_once: true
     ansible.builtin.fetch:
       src: /etc/rancher/k3s/k3s.yaml
-      dest: /root/.kube/config
+      dest: "{{ KUBECTL_CONFIG }}"
       flat: yes
 
   - name: Ansible replace string example
     #TBD: this always result in changed
     replace:
-      path: /root/.kube/config
+      path: "{{ KUBECTL_CONFIG }}"
       regexp: '127.0.0.1'
       replace: "{{ inventory_hostname }}"
     delegate_to: localhost

apps/podinfo/kustomization.yaml

@@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: podinfo
 resources:
-  - namespace.yaml
   - release.yaml

core/ceph-rbd/namespace.yaml base/namespaces/ceph-rbd.yaml

@@ -1,3 +1,13 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources: []
+resources:
+- ceph.yaml
+- ceph-rbd.yaml
+- cert-manager.yaml
+- monitoring.yaml
+- nginx.yaml
+- podinfo.yaml
+- postgres.yaml
+- redis.yaml
+- vpn-gateway.yaml
+- vpn.yaml

core/ceph/namespace.yaml base/namespaces/ceph.yaml

@@ -2,6 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: ceph-rbd
 resources:
-- namespace.yaml
 - rbd.yaml
 - secret.yaml

operators/cert-manager/namespace.yaml base/namespaces/cert-manager.yaml

@@ -2,6 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: ceph
 resources:
-- namespace.yaml
 - cephfs.yaml
 - secret.yaml

base/namespaces/kustomization.yaml

@@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: monitoring
 resources:
-- namespace.yaml
 - botkube

core/monitoring/namespace.yaml base/namespaces/monitoring.yaml

@@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: nginx
 resources:
-  - namespace.yaml
   - release.yaml

core/nginx/namespace.yaml base/namespaces/nginx.yaml

@@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: redis
 resources:
-  - namespace.yaml
   - release.yaml
 configMapGenerator:
   - name: redis-values

apps/podinfo/namespace.yaml base/namespaces/podinfo.yaml

@@ -2,6 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: vpn
 resources:
-  - namespace.yaml
   - networkPolicy.yaml
   - terminal.yaml

operators/postgres/namespace.yaml base/namespaces/postgres.yaml

@@ -4,6 +4,5 @@ namespace: cert-manager
 #crds:
 #  - https://github.com/jetstack/cert-manager/releases/download/v1.2.0/cert-manager.crds.yaml
 resources:
-  - namespace.yaml
   - cert-manager.yaml
 

core/redis/namespace.yaml base/namespaces/redis.yaml

@@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: postgres
 resources:
-- namespace.yaml
 - operator.yaml

settings/production/secrets/vpn-namespace.yaml base/namespaces/vpn-gateway.yaml

@@ -3,5 +3,4 @@ kind: Kustomization
 resources:
 # - drone.yaml
 - git-ssh-key.yaml
-- vpn-namespace.yaml
 - vpn.yaml

core/vpn/namespace.yaml base/namespaces/vpn.yaml

@@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - git-ssh-key.yaml
-- vpn-namespace.yaml
 - vpn.yaml