From ae9be01baf0af67622419596e4e086f919c36fc8 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 10 Jun 2024 11:34:01 +1000 Subject: [PATCH 1/2] fix incorrect directory --- .../templates/apps/cert-manager/{apps => app}/helmrelease.yaml | 0 .../templates/apps/cert-manager/{apps => app}/helmrepository.yaml | 0 .../templates/apps/cert-manager/{apps => app}/namespace.yaml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename kubernetes/rpi5-cluster/templates/apps/cert-manager/{apps => app}/helmrelease.yaml (100%) rename kubernetes/rpi5-cluster/templates/apps/cert-manager/{apps => app}/helmrepository.yaml (100%) rename kubernetes/rpi5-cluster/templates/apps/cert-manager/{apps => app}/namespace.yaml (100%) diff --git a/kubernetes/rpi5-cluster/templates/apps/cert-manager/apps/helmrelease.yaml b/kubernetes/rpi5-cluster/templates/apps/cert-manager/app/helmrelease.yaml similarity index 100% rename from kubernetes/rpi5-cluster/templates/apps/cert-manager/apps/helmrelease.yaml rename to kubernetes/rpi5-cluster/templates/apps/cert-manager/app/helmrelease.yaml diff --git a/kubernetes/rpi5-cluster/templates/apps/cert-manager/apps/helmrepository.yaml b/kubernetes/rpi5-cluster/templates/apps/cert-manager/app/helmrepository.yaml similarity index 100% rename from kubernetes/rpi5-cluster/templates/apps/cert-manager/apps/helmrepository.yaml rename to kubernetes/rpi5-cluster/templates/apps/cert-manager/app/helmrepository.yaml diff --git a/kubernetes/rpi5-cluster/templates/apps/cert-manager/apps/namespace.yaml b/kubernetes/rpi5-cluster/templates/apps/cert-manager/app/namespace.yaml similarity index 100% rename from kubernetes/rpi5-cluster/templates/apps/cert-manager/apps/namespace.yaml rename to kubernetes/rpi5-cluster/templates/apps/cert-manager/app/namespace.yaml From 6d1a3c677b0ae8bf27eca31ac69f122a73e2f1c8 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 10 Jun 2024 12:20:26 +1000 Subject: [PATCH 2/2] project restructure --- .../apps/capacitor/capacitor.yaml | 0 .../apps/capacitor/kustomization.yaml | 0 .../apps/capacitor/ocirepository.yaml | 0 .../cert-manager/app/cert-manager-secrets.yaml | 0 .../apps/cert-manager/cert-manager.yaml | 6 +++--- .../apps/cert-manager/kustomization.yaml | 0 .../{rpi5-cluster => }/apps/cilium/cilium.yaml | 0 .../apps/cilium/kustomization.yaml | 0 .../apps/cilium/networkpolicies/coredns.yaml | 0 .../cilium/networkpolicies/egress-kube-dns.yaml | 0 .../cilium/networkpolicies/egress-kubeapi.yaml | 0 .../cilium/networkpolicies/egress-namespace.yaml | 0 .../cilium/networkpolicies/egress-nodes.yaml | 0 .../networkpolicies/egress-world-with-lan.yaml | 0 .../cilium/networkpolicies/egress-world.yaml | 0 .../networkpolicies/ingress-namespace.yaml | 0 .../cilium/networkpolicies/ingress-nginx.yaml | 0 .../cilium/networkpolicies/ingress-nodes.yaml | 0 .../cilium/networkpolicies/ingress-world.yaml | 0 .../networkpolicies/local-path-provisioner.yaml | 0 kubernetes/apps/kustomization.yaml | 7 +++++++ .../apps/podinfo/kustomization.yaml | 0 .../{rpi5-cluster => }/apps/podinfo/podinfo.yaml | 0 .../infrastructure/kustomization.yaml | 3 +-- .../notification-controller/github-receiver.yaml | 0 .../notification-controller/slack-alerts.yaml | 0 .../webhook-receiver.yaml | 0 .../repositories/repositories.yaml | 0 kubernetes/rpi5-cluster/apps.yaml | 16 ++++++++++++++++ kubernetes/rpi5-cluster/infrastructure.yaml | 14 ++++++++++++++ .../apps/cert-manager/app/helmrelease.yaml | 0 .../apps/cert-manager/app/helmrepository.yaml | 0 .../apps/cert-manager/app/namespace.yaml | 0 .../cert-manager/issuers/letsencrypt-dns01.yaml | 0 .../cert-manager/issuers/letsencrypt-http01.yaml | 0 35 files changed, 41 insertions(+), 5 deletions(-) rename kubernetes/{rpi5-cluster => }/apps/capacitor/capacitor.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/capacitor/kustomization.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/capacitor/ocirepository.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cert-manager/app/cert-manager-secrets.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cert-manager/cert-manager.yaml (84%) rename kubernetes/{rpi5-cluster => }/apps/cert-manager/kustomization.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/cilium.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/kustomization.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/coredns.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/egress-kube-dns.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/egress-kubeapi.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/egress-namespace.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/egress-nodes.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/egress-world-with-lan.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/egress-world.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/ingress-namespace.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/ingress-nginx.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/ingress-nodes.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/ingress-world.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/cilium/networkpolicies/local-path-provisioner.yaml (100%) create mode 100644 kubernetes/apps/kustomization.yaml rename kubernetes/{rpi5-cluster => }/apps/podinfo/kustomization.yaml (100%) rename kubernetes/{rpi5-cluster => }/apps/podinfo/podinfo.yaml (100%) rename kubernetes/{rpi5-cluster => }/infrastructure/kustomization.yaml (55%) rename kubernetes/{rpi5-cluster/flux-system => infrastructure}/notification-controller/github-receiver.yaml (100%) rename kubernetes/{rpi5-cluster/flux-system => infrastructure}/notification-controller/slack-alerts.yaml (100%) rename kubernetes/{rpi5-cluster/flux-system => infrastructure}/notification-controller/webhook-receiver.yaml (100%) rename kubernetes/{rpi5-cluster => }/infrastructure/repositories/repositories.yaml (100%) create mode 100644 kubernetes/rpi5-cluster/apps.yaml create mode 100644 kubernetes/rpi5-cluster/infrastructure.yaml rename kubernetes/{rpi5-cluster => }/templates/apps/cert-manager/app/helmrelease.yaml (100%) rename kubernetes/{rpi5-cluster => }/templates/apps/cert-manager/app/helmrepository.yaml (100%) rename kubernetes/{rpi5-cluster => }/templates/apps/cert-manager/app/namespace.yaml (100%) rename kubernetes/{rpi5-cluster => }/templates/apps/cert-manager/issuers/letsencrypt-dns01.yaml (100%) rename kubernetes/{rpi5-cluster => }/templates/apps/cert-manager/issuers/letsencrypt-http01.yaml (100%) diff --git a/kubernetes/rpi5-cluster/apps/capacitor/capacitor.yaml b/kubernetes/apps/capacitor/capacitor.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/capacitor/capacitor.yaml rename to kubernetes/apps/capacitor/capacitor.yaml diff --git a/kubernetes/rpi5-cluster/apps/capacitor/kustomization.yaml b/kubernetes/apps/capacitor/kustomization.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/capacitor/kustomization.yaml rename to kubernetes/apps/capacitor/kustomization.yaml diff --git a/kubernetes/rpi5-cluster/apps/capacitor/ocirepository.yaml b/kubernetes/apps/capacitor/ocirepository.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/capacitor/ocirepository.yaml rename to kubernetes/apps/capacitor/ocirepository.yaml diff --git a/kubernetes/rpi5-cluster/apps/cert-manager/app/cert-manager-secrets.yaml b/kubernetes/apps/cert-manager/app/cert-manager-secrets.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cert-manager/app/cert-manager-secrets.yaml rename to kubernetes/apps/cert-manager/app/cert-manager-secrets.yaml diff --git a/kubernetes/rpi5-cluster/apps/cert-manager/cert-manager.yaml b/kubernetes/apps/cert-manager/cert-manager.yaml similarity index 84% rename from kubernetes/rpi5-cluster/apps/cert-manager/cert-manager.yaml rename to kubernetes/apps/cert-manager/cert-manager.yaml index 2ce20ea..4bf2217 100644 --- a/kubernetes/rpi5-cluster/apps/cert-manager/cert-manager.yaml +++ b/kubernetes/apps/cert-manager/cert-manager.yaml @@ -5,7 +5,7 @@ metadata: namespace: flux-system spec: interval: 1h - path: ./kubernetes/rpi5-cluster/apps/cert-manager/app + path: ./kubernetes//apps/cert-manager/app prune: true sourceRef: kind: GitRepository @@ -24,7 +24,7 @@ metadata: spec: interval: 1h targetNamespace: cert-manager - path: ./kubernetes/rpi5-cluster/templates/apps/cert-manager/app + path: ./kubernetes//templates/apps/cert-manager/app prune: true sourceRef: kind: GitRepository @@ -39,7 +39,7 @@ metadata: spec: interval: 1h targetNamespace: cert-manager - path: ./kubernetes/rpi5-cluster/templates/apps/cert-manager/issuers + path: ./kubernetes/templates/apps/cert-manager/issuers prune: true sourceRef: kind: GitRepository diff --git a/kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml b/kubernetes/apps/cert-manager/kustomization.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml rename to kubernetes/apps/cert-manager/kustomization.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/cilium.yaml b/kubernetes/apps/cilium/cilium.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/cilium.yaml rename to kubernetes/apps/cilium/cilium.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml b/kubernetes/apps/cilium/kustomization.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml rename to kubernetes/apps/cilium/kustomization.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/coredns.yaml b/kubernetes/apps/cilium/networkpolicies/coredns.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/coredns.yaml rename to kubernetes/apps/cilium/networkpolicies/coredns.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-kube-dns.yaml b/kubernetes/apps/cilium/networkpolicies/egress-kube-dns.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-kube-dns.yaml rename to kubernetes/apps/cilium/networkpolicies/egress-kube-dns.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-kubeapi.yaml b/kubernetes/apps/cilium/networkpolicies/egress-kubeapi.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-kubeapi.yaml rename to kubernetes/apps/cilium/networkpolicies/egress-kubeapi.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-namespace.yaml b/kubernetes/apps/cilium/networkpolicies/egress-namespace.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-namespace.yaml rename to kubernetes/apps/cilium/networkpolicies/egress-namespace.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-nodes.yaml b/kubernetes/apps/cilium/networkpolicies/egress-nodes.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-nodes.yaml rename to kubernetes/apps/cilium/networkpolicies/egress-nodes.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-world-with-lan.yaml b/kubernetes/apps/cilium/networkpolicies/egress-world-with-lan.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-world-with-lan.yaml rename to kubernetes/apps/cilium/networkpolicies/egress-world-with-lan.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-world.yaml b/kubernetes/apps/cilium/networkpolicies/egress-world.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/egress-world.yaml rename to kubernetes/apps/cilium/networkpolicies/egress-world.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/ingress-namespace.yaml b/kubernetes/apps/cilium/networkpolicies/ingress-namespace.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/ingress-namespace.yaml rename to kubernetes/apps/cilium/networkpolicies/ingress-namespace.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/ingress-nginx.yaml b/kubernetes/apps/cilium/networkpolicies/ingress-nginx.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/ingress-nginx.yaml rename to kubernetes/apps/cilium/networkpolicies/ingress-nginx.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/ingress-nodes.yaml b/kubernetes/apps/cilium/networkpolicies/ingress-nodes.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/ingress-nodes.yaml rename to kubernetes/apps/cilium/networkpolicies/ingress-nodes.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/ingress-world.yaml b/kubernetes/apps/cilium/networkpolicies/ingress-world.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/ingress-world.yaml rename to kubernetes/apps/cilium/networkpolicies/ingress-world.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/networkpolicies/local-path-provisioner.yaml b/kubernetes/apps/cilium/networkpolicies/local-path-provisioner.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/networkpolicies/local-path-provisioner.yaml rename to kubernetes/apps/cilium/networkpolicies/local-path-provisioner.yaml diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml new file mode 100644 index 0000000..1c8d156 --- /dev/null +++ b/kubernetes/apps/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ./capacitor + - ./cert-manager + - ./cilium + - ./podinfo \ No newline at end of file diff --git a/kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml b/kubernetes/apps/podinfo/kustomization.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml rename to kubernetes/apps/podinfo/kustomization.yaml diff --git a/kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml b/kubernetes/apps/podinfo/podinfo.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml rename to kubernetes/apps/podinfo/podinfo.yaml diff --git a/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml b/kubernetes/infrastructure/kustomization.yaml similarity index 55% rename from kubernetes/rpi5-cluster/infrastructure/kustomization.yaml rename to kubernetes/infrastructure/kustomization.yaml index 157797e..d47da2f 100644 --- a/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml +++ b/kubernetes/infrastructure/kustomization.yaml @@ -1,5 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repositories/repositories.yaml - - secrets/secrets.yaml + - ./repositories diff --git a/kubernetes/rpi5-cluster/flux-system/notification-controller/github-receiver.yaml b/kubernetes/infrastructure/notification-controller/github-receiver.yaml similarity index 100% rename from kubernetes/rpi5-cluster/flux-system/notification-controller/github-receiver.yaml rename to kubernetes/infrastructure/notification-controller/github-receiver.yaml diff --git a/kubernetes/rpi5-cluster/flux-system/notification-controller/slack-alerts.yaml b/kubernetes/infrastructure/notification-controller/slack-alerts.yaml similarity index 100% rename from kubernetes/rpi5-cluster/flux-system/notification-controller/slack-alerts.yaml rename to kubernetes/infrastructure/notification-controller/slack-alerts.yaml diff --git a/kubernetes/rpi5-cluster/flux-system/notification-controller/webhook-receiver.yaml b/kubernetes/infrastructure/notification-controller/webhook-receiver.yaml similarity index 100% rename from kubernetes/rpi5-cluster/flux-system/notification-controller/webhook-receiver.yaml rename to kubernetes/infrastructure/notification-controller/webhook-receiver.yaml diff --git a/kubernetes/rpi5-cluster/infrastructure/repositories/repositories.yaml b/kubernetes/infrastructure/repositories/repositories.yaml similarity index 100% rename from kubernetes/rpi5-cluster/infrastructure/repositories/repositories.yaml rename to kubernetes/infrastructure/repositories/repositories.yaml diff --git a/kubernetes/rpi5-cluster/apps.yaml b/kubernetes/rpi5-cluster/apps.yaml new file mode 100644 index 0000000..3d80368 --- /dev/null +++ b/kubernetes/rpi5-cluster/apps.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: apps + namespace: flux-system +spec: + interval: 10m0s + dependsOn: + - name: infrustructure + sourceRef: + kind: GitRepository + name: flux-system + path: ./kubernetes/apps + prune: true + wait: true + timeout: 5m0s \ No newline at end of file diff --git a/kubernetes/rpi5-cluster/infrastructure.yaml b/kubernetes/rpi5-cluster/infrastructure.yaml new file mode 100644 index 0000000..bd9c10d --- /dev/null +++ b/kubernetes/rpi5-cluster/infrastructure.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: infrustructure + namespace: flux-system +spec: + interval: 5m0s + sourceRef: + kind: GitRepository + name: flux-system + path: ./kubernetes/infrustructure + prune: true + wait: true + timeout: 5m0s \ No newline at end of file diff --git a/kubernetes/rpi5-cluster/templates/apps/cert-manager/app/helmrelease.yaml b/kubernetes/templates/apps/cert-manager/app/helmrelease.yaml similarity index 100% rename from kubernetes/rpi5-cluster/templates/apps/cert-manager/app/helmrelease.yaml rename to kubernetes/templates/apps/cert-manager/app/helmrelease.yaml diff --git a/kubernetes/rpi5-cluster/templates/apps/cert-manager/app/helmrepository.yaml b/kubernetes/templates/apps/cert-manager/app/helmrepository.yaml similarity index 100% rename from kubernetes/rpi5-cluster/templates/apps/cert-manager/app/helmrepository.yaml rename to kubernetes/templates/apps/cert-manager/app/helmrepository.yaml diff --git a/kubernetes/rpi5-cluster/templates/apps/cert-manager/app/namespace.yaml b/kubernetes/templates/apps/cert-manager/app/namespace.yaml similarity index 100% rename from kubernetes/rpi5-cluster/templates/apps/cert-manager/app/namespace.yaml rename to kubernetes/templates/apps/cert-manager/app/namespace.yaml diff --git a/kubernetes/rpi5-cluster/templates/apps/cert-manager/issuers/letsencrypt-dns01.yaml b/kubernetes/templates/apps/cert-manager/issuers/letsencrypt-dns01.yaml similarity index 100% rename from kubernetes/rpi5-cluster/templates/apps/cert-manager/issuers/letsencrypt-dns01.yaml rename to kubernetes/templates/apps/cert-manager/issuers/letsencrypt-dns01.yaml diff --git a/kubernetes/rpi5-cluster/templates/apps/cert-manager/issuers/letsencrypt-http01.yaml b/kubernetes/templates/apps/cert-manager/issuers/letsencrypt-http01.yaml similarity index 100% rename from kubernetes/rpi5-cluster/templates/apps/cert-manager/issuers/letsencrypt-http01.yaml rename to kubernetes/templates/apps/cert-manager/issuers/letsencrypt-http01.yaml