From 0b9e624a1a7e88635e064c71f75f6cf094fdea6a Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Sun, 9 Jun 2024 23:14:01 +1000 Subject: [PATCH 1/2] refactor - file naming conversion --- .../apps/cert-manager/{ks.yaml => cert-manager.yaml} | 0 kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml | 2 +- kubernetes/rpi5-cluster/apps/cilium/{ks.yaml => cilium.yaml} | 0 kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml | 2 +- kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml | 4 ++++ .../apps/podinfo/{podinfo-kustomization.yaml => podinfo.yaml} | 0 kubernetes/rpi5-cluster/infrastructure/kustomization.yaml | 4 ++-- .../repositories/podinfo.yaml} | 0 .../repositories/{ks.yaml => repositories.yaml} | 0 .../infrastructure/secrets/{ks.yaml => secrets.yaml} | 0 10 files changed, 8 insertions(+), 4 deletions(-) rename kubernetes/rpi5-cluster/apps/cert-manager/{ks.yaml => cert-manager.yaml} (100%) rename kubernetes/rpi5-cluster/apps/cilium/{ks.yaml => cilium.yaml} (100%) create mode 100644 kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml rename kubernetes/rpi5-cluster/apps/podinfo/{podinfo-kustomization.yaml => podinfo.yaml} (100%) rename kubernetes/rpi5-cluster/{apps/podinfo/podinfo-source.yaml => infrastructure/repositories/podinfo.yaml} (100%) rename kubernetes/rpi5-cluster/infrastructure/repositories/{ks.yaml => repositories.yaml} (100%) rename kubernetes/rpi5-cluster/infrastructure/secrets/{ks.yaml => secrets.yaml} (100%) diff --git a/kubernetes/rpi5-cluster/apps/cert-manager/ks.yaml b/kubernetes/rpi5-cluster/apps/cert-manager/cert-manager.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cert-manager/ks.yaml rename to kubernetes/rpi5-cluster/apps/cert-manager/cert-manager.yaml diff --git a/kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml b/kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml index d194337..859702d 100644 --- a/kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml +++ b/kubernetes/rpi5-cluster/apps/cert-manager/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ks.yaml + - cert-manager.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/ks.yaml b/kubernetes/rpi5-cluster/apps/cilium/cilium.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/cilium/ks.yaml rename to kubernetes/rpi5-cluster/apps/cilium/cilium.yaml diff --git a/kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml b/kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml index d194337..ebeeb65 100644 --- a/kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml +++ b/kubernetes/rpi5-cluster/apps/cilium/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ks.yaml + - cilium.yaml diff --git a/kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml b/kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml new file mode 100644 index 0000000..678ef11 --- /dev/null +++ b/kubernetes/rpi5-cluster/apps/podinfo/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - podinfo.yaml \ No newline at end of file diff --git a/kubernetes/rpi5-cluster/apps/podinfo/podinfo-kustomization.yaml b/kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/podinfo/podinfo-kustomization.yaml rename to kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml diff --git a/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml b/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml index 54e5811..157797e 100644 --- a/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml +++ b/kubernetes/rpi5-cluster/infrastructure/kustomization.yaml @@ -1,5 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - repositories/ks.yaml - - secrets/ks.yaml + - repositories/repositories.yaml + - secrets/secrets.yaml diff --git a/kubernetes/rpi5-cluster/apps/podinfo/podinfo-source.yaml b/kubernetes/rpi5-cluster/infrastructure/repositories/podinfo.yaml similarity index 100% rename from kubernetes/rpi5-cluster/apps/podinfo/podinfo-source.yaml rename to kubernetes/rpi5-cluster/infrastructure/repositories/podinfo.yaml diff --git a/kubernetes/rpi5-cluster/infrastructure/repositories/ks.yaml b/kubernetes/rpi5-cluster/infrastructure/repositories/repositories.yaml similarity index 100% rename from kubernetes/rpi5-cluster/infrastructure/repositories/ks.yaml rename to kubernetes/rpi5-cluster/infrastructure/repositories/repositories.yaml diff --git a/kubernetes/rpi5-cluster/infrastructure/secrets/ks.yaml b/kubernetes/rpi5-cluster/infrastructure/secrets/secrets.yaml similarity index 100% rename from kubernetes/rpi5-cluster/infrastructure/secrets/ks.yaml rename to kubernetes/rpi5-cluster/infrastructure/secrets/secrets.yaml From ddd50490259caae6971be6a0b126fd2967c4ec82 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Sun, 9 Jun 2024 23:49:52 +1000 Subject: [PATCH 2/2] add app capacitor --- .../rpi5-cluster/apps/capacitor/capacitor.yaml | 16 ++++++++++++++++ .../apps/capacitor/kustomization.yaml | 4 ++++ .../rpi5-cluster/apps/podinfo/podinfo.yaml | 1 - .../infrastructure/repositories/capacitor.yaml | 10 ++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 kubernetes/rpi5-cluster/apps/capacitor/capacitor.yaml create mode 100644 kubernetes/rpi5-cluster/apps/capacitor/kustomization.yaml create mode 100644 kubernetes/rpi5-cluster/infrastructure/repositories/capacitor.yaml diff --git a/kubernetes/rpi5-cluster/apps/capacitor/capacitor.yaml b/kubernetes/rpi5-cluster/apps/capacitor/capacitor.yaml new file mode 100644 index 0000000..82eb80b --- /dev/null +++ b/kubernetes/rpi5-cluster/apps/capacitor/capacitor.yaml @@ -0,0 +1,16 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: capacitor + namespace: flux-system +spec: + targetNamespace: flux-system + interval: 1h + retryInterval: 2m + timeout: 5m + wait: true + prune: true + path: "./" + sourceRef: + kind: OCIRepository + name: capacitor \ No newline at end of file diff --git a/kubernetes/rpi5-cluster/apps/capacitor/kustomization.yaml b/kubernetes/rpi5-cluster/apps/capacitor/kustomization.yaml new file mode 100644 index 0000000..c0a1a18 --- /dev/null +++ b/kubernetes/rpi5-cluster/apps/capacitor/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - capacitor.yaml \ No newline at end of file diff --git a/kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml b/kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml index 07e30d6..7d077a7 100644 --- a/kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml +++ b/kubernetes/rpi5-cluster/apps/podinfo/podinfo.yaml @@ -1,4 +1,3 @@ ---- apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: diff --git a/kubernetes/rpi5-cluster/infrastructure/repositories/capacitor.yaml b/kubernetes/rpi5-cluster/infrastructure/repositories/capacitor.yaml new file mode 100644 index 0000000..b0bd67a --- /dev/null +++ b/kubernetes/rpi5-cluster/infrastructure/repositories/capacitor.yaml @@ -0,0 +1,10 @@ +apiVersion: source.toolkit.fluxcd.io/v1beta2 +kind: OCIRepository +metadata: + name: capacitor + namespace: flux-system +spec: + interval: 12h + url: oci://ghcr.io/gimlet-io/capacitor-manifests + ref: + semver: ">=0.1.0" \ No newline at end of file