From 68436fa4b1d0e5885991d4dbd894d8435ca303ba Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 17:44:32 +0200 Subject: [PATCH 01/10] add: zookeeper --- .../presidential-paradise/kustomization.yaml | 1 + .../zookeeper/deployment.yaml | 45 +++++++++++++++++++ .../zookeeper/ingress.yaml | 18 ++++++++ .../zookeeper/kustomization.yaml | 6 +++ .../presidential-paradise/zookeeper/svc.yaml | 24 ++++++++++ 5 files changed, 94 insertions(+) create mode 100644 cluster/apps/presidential-paradise/zookeeper/deployment.yaml create mode 100644 cluster/apps/presidential-paradise/zookeeper/ingress.yaml create mode 100644 cluster/apps/presidential-paradise/zookeeper/kustomization.yaml create mode 100644 cluster/apps/presidential-paradise/zookeeper/svc.yaml diff --git a/cluster/apps/presidential-paradise/kustomization.yaml b/cluster/apps/presidential-paradise/kustomization.yaml index d5ef44b4..cd9cd51d 100644 --- a/cluster/apps/presidential-paradise/kustomization.yaml +++ b/cluster/apps/presidential-paradise/kustomization.yaml @@ -2,3 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - wooloofanclub + - zookeeper diff --git a/cluster/apps/presidential-paradise/zookeeper/deployment.yaml b/cluster/apps/presidential-paradise/zookeeper/deployment.yaml new file mode 100644 index 00000000..1a3ebc5d --- /dev/null +++ b/cluster/apps/presidential-paradise/zookeeper/deployment.yaml @@ -0,0 +1,45 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: zookeeper + namespace: presidential-paradise + labels: + app: zookeeper +spec: + replicas: 3 + selector: + matchLabels: + app: zookeeper + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 34% + maxUnavailable: 34% + template: + metadata: + name: zookeeper + labels: + app: zookeeper + spec: + containers: + - name: zookeeper + image: ghcr.io/nullx76/zookeeper:latest + ports: + - containerPort: 8085 + env: + - name: LANG + value: C.UTF-8 + - name: HOSTNAME + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: SERVICE_NAME + value: zookeeper-private.default.svc.cluster.local + resources: {} + securityContext: + privileged: false + procMount: Default + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + dnsPolicy: ClusterFirst + terminationGracePeriodSeconds: 30 diff --git a/cluster/apps/presidential-paradise/zookeeper/ingress.yaml b/cluster/apps/presidential-paradise/zookeeper/ingress.yaml new file mode 100644 index 00000000..40c98a2b --- /dev/null +++ b/cluster/apps/presidential-paradise/zookeeper/ingress.yaml @@ -0,0 +1,18 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: zookeeper + namespace: presidential-paradise +spec: + rules: + - host: "zookeeper.0x76.dev" + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: zookeeper + port: + number: 8085 + diff --git a/cluster/apps/presidential-paradise/zookeeper/kustomization.yaml b/cluster/apps/presidential-paradise/zookeeper/kustomization.yaml new file mode 100644 index 00000000..5b33a50e --- /dev/null +++ b/cluster/apps/presidential-paradise/zookeeper/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - deployment.yaml + - svc.yaml + - ingress.yaml diff --git a/cluster/apps/presidential-paradise/zookeeper/svc.yaml b/cluster/apps/presidential-paradise/zookeeper/svc.yaml new file mode 100644 index 00000000..ea3bfa1f --- /dev/null +++ b/cluster/apps/presidential-paradise/zookeeper/svc.yaml @@ -0,0 +1,24 @@ +apiVersion: v1 +kind: Service +metadata: + name: zookeeper-private + namespace: presidential-paradise +spec: + clusterIP: None + ports: + - name: epmd + port: 4369 + selector: + app: zookeeper +--- +apiVersion: v1 +kind: Service +metadata: + name: zookeeper + namespace: presidential-paradise +spec: + ports: + - name: http + port: 8085 + selector: + app: zookeeper From bf432801af135ce6919c4c5d5cbbec58c94376f9 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 17:48:40 +0200 Subject: [PATCH 02/10] zookeeper: change tag --- cluster/apps/presidential-paradise/zookeeper/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/apps/presidential-paradise/zookeeper/deployment.yaml b/cluster/apps/presidential-paradise/zookeeper/deployment.yaml index 1a3ebc5d..12cb0c5c 100644 --- a/cluster/apps/presidential-paradise/zookeeper/deployment.yaml +++ b/cluster/apps/presidential-paradise/zookeeper/deployment.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: zookeeper - image: ghcr.io/nullx76/zookeeper:latest + image: ghcr.io/nullx76/zookeeper:manual ports: - containerPort: 8085 env: From de692dfc93ee6fe35b46c3fc727f39c30459cfc5 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 17:50:02 +0200 Subject: [PATCH 03/10] zookeeper: change tag (again) --- cluster/apps/presidential-paradise/zookeeper/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/apps/presidential-paradise/zookeeper/deployment.yaml b/cluster/apps/presidential-paradise/zookeeper/deployment.yaml index 12cb0c5c..c464580f 100644 --- a/cluster/apps/presidential-paradise/zookeeper/deployment.yaml +++ b/cluster/apps/presidential-paradise/zookeeper/deployment.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: zookeeper - image: ghcr.io/nullx76/zookeeper:manual + image: docker.io/0x76/zookeeper:manual ports: - containerPort: 8085 env: From 5e080821187c1020309179a2857781145ba32d01 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 17:51:35 +0200 Subject: [PATCH 04/10] zookeeper: undeploy (for now) --- cluster/apps/presidential-paradise/kustomization.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/cluster/apps/presidential-paradise/kustomization.yaml b/cluster/apps/presidential-paradise/kustomization.yaml index cd9cd51d..d5ef44b4 100644 --- a/cluster/apps/presidential-paradise/kustomization.yaml +++ b/cluster/apps/presidential-paradise/kustomization.yaml @@ -2,4 +2,3 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - wooloofanclub - - zookeeper From a67e9c3ba39c8d5f2a752922466e16658f65aa6a Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 18:20:27 +0200 Subject: [PATCH 05/10] crds: external-secrets --- cluster/crds/external-secrets/crds.yaml | 31 +++++++++++++++++++ .../crds/external-secrets/kustomization.yaml | 4 +++ cluster/crds/kustomization.yaml | 1 + 3 files changed, 36 insertions(+) create mode 100644 cluster/crds/external-secrets/crds.yaml create mode 100644 cluster/crds/external-secrets/kustomization.yaml diff --git a/cluster/crds/external-secrets/crds.yaml b/cluster/crds/external-secrets/crds.yaml new file mode 100644 index 00000000..ae88a33d --- /dev/null +++ b/cluster/crds/external-secrets/crds.yaml @@ -0,0 +1,31 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: GitRepository +metadata: + name: external-secrets-crd-source + namespace: flux-system +spec: + interval: 30m + url: https://github.com/external-secrets/external-secrets.git + ref: + # renovate: registryUrl=https://charts.external-secrets.io chart=external-secrets + tag: v0.3.7 + ignore: | + # exclude all + /* + # path to crds + !/deploy/crds/ +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 +kind: Kustomization +metadata: + name: external-secrets-crds + namespace: flux-system +spec: + interval: 15m + prune: false + wait: true + sourceRef: + kind: GitRepository + name: external-secrets-crd-source + diff --git a/cluster/crds/external-secrets/kustomization.yaml b/cluster/crds/external-secrets/kustomization.yaml new file mode 100644 index 00000000..2ed3b351 --- /dev/null +++ b/cluster/crds/external-secrets/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - crds.yaml diff --git a/cluster/crds/kustomization.yaml b/cluster/crds/kustomization.yaml index 15e57e2b..f2ee43c6 100644 --- a/cluster/crds/kustomization.yaml +++ b/cluster/crds/kustomization.yaml @@ -2,3 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - traefik + - external-secrets From 215306138e198c9964cdb573866f4ecd64e878fa Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 18:26:24 +0200 Subject: [PATCH 06/10] namespaces: add external-secrets --- cluster/core/namespaces/external-secrets.yaml | 5 +++++ cluster/core/namespaces/kustomization.yaml | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 cluster/core/namespaces/external-secrets.yaml diff --git a/cluster/core/namespaces/external-secrets.yaml b/cluster/core/namespaces/external-secrets.yaml new file mode 100644 index 00000000..591aac5d --- /dev/null +++ b/cluster/core/namespaces/external-secrets.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: external-secrets diff --git a/cluster/core/namespaces/kustomization.yaml b/cluster/core/namespaces/kustomization.yaml index 8b2dd57b..5f33cedc 100644 --- a/cluster/core/namespaces/kustomization.yaml +++ b/cluster/core/namespaces/kustomization.yaml @@ -3,3 +3,5 @@ kind: Kustomization resources: - presidential-paradise.yaml - networking.yaml + - external-secrets.yaml + From 20d82759fb73950759956ecf4f7695b4a79960cf Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 18:40:32 +0200 Subject: [PATCH 07/10] charts: add external-secrets --- .../charts/helm/external-secrets-charts.yaml | 10 ++++++++++ .../base/flux-system/charts/helm/kustomization.yaml | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 cluster/base/flux-system/charts/helm/external-secrets-charts.yaml diff --git a/cluster/base/flux-system/charts/helm/external-secrets-charts.yaml b/cluster/base/flux-system/charts/helm/external-secrets-charts.yaml new file mode 100644 index 00000000..2d49244d --- /dev/null +++ b/cluster/base/flux-system/charts/helm/external-secrets-charts.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: external-secrets-charts + namespace: flux-system +spec: + interval: 15m0s + url: https://charts.external-secrets.io + diff --git a/cluster/base/flux-system/charts/helm/kustomization.yaml b/cluster/base/flux-system/charts/helm/kustomization.yaml index 65d6813f..cc37fadd 100644 --- a/cluster/base/flux-system/charts/helm/kustomization.yaml +++ b/cluster/base/flux-system/charts/helm/kustomization.yaml @@ -3,3 +3,5 @@ kind: Kustomization resources: - metallb-charts.yaml - traefik-charts.yaml + - external-secrets-charts.yaml + From f47cc16766d3794597ea2b694d9dcd725bf04f2c Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 18:47:10 +0200 Subject: [PATCH 08/10] external-secrets: added it --- .../external-secrets/helm-release.yaml | 22 +++++++++++++++++++ .../external-secrets/kustomization.yaml | 5 +++++ .../core/external-secrets/kustomization.yaml | 5 +++++ cluster/core/kustomization.yaml | 2 ++ 4 files changed, 34 insertions(+) create mode 100644 cluster/core/external-secrets/external-secrets/helm-release.yaml create mode 100644 cluster/core/external-secrets/external-secrets/kustomization.yaml create mode 100644 cluster/core/external-secrets/kustomization.yaml diff --git a/cluster/core/external-secrets/external-secrets/helm-release.yaml b/cluster/core/external-secrets/external-secrets/helm-release.yaml new file mode 100644 index 00000000..60789741 --- /dev/null +++ b/cluster/core/external-secrets/external-secrets/helm-release.yaml @@ -0,0 +1,22 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: external-secrets + namespace: external-secrets +spec: + interval: 5m + chart: + spec: + # renovate: registryUrl=https://charts.external-secrets.io + chart: external-secrets + version: 0.3.7 + sourceRef: + kind: HelmRepository + name: external-secrets-charts + namespace: flux-system + interval: 5m + values: + configInline: + installCRDs: false + diff --git a/cluster/core/external-secrets/external-secrets/kustomization.yaml b/cluster/core/external-secrets/external-secrets/kustomization.yaml new file mode 100644 index 00000000..2fa2de20 --- /dev/null +++ b/cluster/core/external-secrets/external-secrets/kustomization.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helm-release.yaml diff --git a/cluster/core/external-secrets/kustomization.yaml b/cluster/core/external-secrets/kustomization.yaml new file mode 100644 index 00000000..cf78af62 --- /dev/null +++ b/cluster/core/external-secrets/kustomization.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - external-secrets diff --git a/cluster/core/kustomization.yaml b/cluster/core/kustomization.yaml index bf0a6d5c..88687c77 100644 --- a/cluster/core/kustomization.yaml +++ b/cluster/core/kustomization.yaml @@ -3,3 +3,5 @@ kind: Kustomization resources: - namespaces - networking + - external-secrets + From d0d5b9d729b4bdec04eaa4d8cfeee7d3c1790e33 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 18:57:26 +0200 Subject: [PATCH 09/10] external-secrets: skip crds --- .../core/external-secrets/external-secrets/helm-release.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/core/external-secrets/external-secrets/helm-release.yaml b/cluster/core/external-secrets/external-secrets/helm-release.yaml index 60789741..4d146868 100644 --- a/cluster/core/external-secrets/external-secrets/helm-release.yaml +++ b/cluster/core/external-secrets/external-secrets/helm-release.yaml @@ -19,4 +19,7 @@ spec: values: configInline: installCRDs: false - + install: + crds: Skip + upgrade: + crds: Skip \ No newline at end of file From c110920bb4d8a5d0e3dfb35a3ce79b11a42f0f91 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Thu, 28 Oct 2021 19:06:12 +0200 Subject: [PATCH 10/10] external-secrets: skip crds (again) --- .../core/external-secrets/external-secrets/helm-release.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cluster/core/external-secrets/external-secrets/helm-release.yaml b/cluster/core/external-secrets/external-secrets/helm-release.yaml index 4d146868..8466118c 100644 --- a/cluster/core/external-secrets/external-secrets/helm-release.yaml +++ b/cluster/core/external-secrets/external-secrets/helm-release.yaml @@ -17,8 +17,7 @@ spec: namespace: flux-system interval: 5m values: - configInline: - installCRDs: false + installCRDs: false install: crds: Skip upgrade: