From ba7ddeec452636fc91f4d192138b43a35bca2fb3 Mon Sep 17 00:00:00 2001 From: Florian Herrengt Date: Thu, 25 Jan 2024 12:53:14 +0000 Subject: [PATCH] fix kustomization --- .drone.yml | 1 + .../bases/nocodelytics-events-worker.yaml | 1 - .../bases/nocodelytics-tracker-api.yaml | 4 +-- .../overlays/staging/kustomization.yaml | 27 ++++++++++++++++--- .../staging/nocodelytics-dashboard.yaml | 14 ---------- .../staging/nocodelytics-events-worker.yaml | 18 ------------- .../staging/nocodelytics-tracker-api.yaml | 27 ------------------- 7 files changed, 27 insertions(+), 65 deletions(-) delete mode 100644 kustomization/overlays/staging/nocodelytics-dashboard.yaml delete mode 100644 kustomization/overlays/staging/nocodelytics-events-worker.yaml delete mode 100644 kustomization/overlays/staging/nocodelytics-tracker-api.yaml diff --git a/.drone.yml b/.drone.yml index f0c4881..0ef5760 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,3 +16,4 @@ steps: from_secret: KUBE_CONFIG commands: - kubectl kustomize ./kustomization/overlays/staging + - kubectl apply -k ./kustomization/overlays/staging diff --git a/kustomization/bases/nocodelytics-events-worker.yaml b/kustomization/bases/nocodelytics-events-worker.yaml index 334a315..1143379 100644 --- a/kustomization/bases/nocodelytics-events-worker.yaml +++ b/kustomization/bases/nocodelytics-events-worker.yaml @@ -4,7 +4,6 @@ metadata: name: nocodelytics-events-worker spec: replicas: 1 - backoffLimit: 4 selector: matchLabels: ms: nocodelytics-events-worker diff --git a/kustomization/bases/nocodelytics-tracker-api.yaml b/kustomization/bases/nocodelytics-tracker-api.yaml index 690434c..5a2f616 100644 --- a/kustomization/bases/nocodelytics-tracker-api.yaml +++ b/kustomization/bases/nocodelytics-tracker-api.yaml @@ -41,8 +41,8 @@ spec: entryPoints: - websecure routes: - - match: Host(`default.nocodelytics.com`) - kind: Rule + - kind: Rule + match: Host(`default.nocodelytics.com`) services: - name: nocodelytics-tracker-api port: 8080 diff --git a/kustomization/overlays/staging/kustomization.yaml b/kustomization/overlays/staging/kustomization.yaml index d50a826..8d4ff09 100644 --- a/kustomization/overlays/staging/kustomization.yaml +++ b/kustomization/overlays/staging/kustomization.yaml @@ -9,9 +9,6 @@ patches: target: kind: Namespace name: default - - path: ./nocodelytics-dashboard.yaml - - path: ./nocodelytics-tracker-api.yaml - - path: ./nocodelytics-events-worker.yaml - target: group: apps version: v1 @@ -26,5 +23,29 @@ patches: - op: add path: /spec/template/spec/containers/0/env/- value: {name: POSTGRES_DATABASE, value: nocodelytics_staging} + - target: + group: traefik.containo.us + version: v1alpha1 + kind: IngressRoute + name: nocodelytics-dashboard + patch: |- + - op: replace + path: /spec/routes/0/match + value: "Host(`staging.nocodelytics.com`)" + - op: replace + path: /spec/tls/domains/0/main + value: staging.nocodelytics.com + - target: + group: traefik.containo.us + version: v1alpha1 + kind: IngressRoute + name: nocodelytics-tracker-api + patch: |- + - op: replace + path: /spec/routes/0/match + value: "Host(`tracker-staging.nocodelytics.com`)" + - op: replace + path: /spec/tls/domains/0/main + value: tracker-staging.nocodelytics.com apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/kustomization/overlays/staging/nocodelytics-dashboard.yaml b/kustomization/overlays/staging/nocodelytics-dashboard.yaml deleted file mode 100644 index 7231461..0000000 --- a/kustomization/overlays/staging/nocodelytics-dashboard.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: IngressRoute -metadata: - name: nocodelytics-dashboard -spec: - routes: - - match: Host(`staging.nocodelytics.com`) - kind: Rule - services: - - name: nocodelytics-dashboard - port: 8080 - tls: - domains: - - main: staging.nocodelytics.com diff --git a/kustomization/overlays/staging/nocodelytics-events-worker.yaml b/kustomization/overlays/staging/nocodelytics-events-worker.yaml deleted file mode 100644 index 74e52c1..0000000 --- a/kustomization/overlays/staging/nocodelytics-events-worker.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nocodelytics-events-worker -spec: - selector: - matchLabels: - ms: nocodelytics-events-worker - template: - metadata: - labels: - ms: nocodelytics-events-worker - spec: - containers: - - name: nocodelytics-events-worker - env: - - name: NODE_ENV - value: staging diff --git a/kustomization/overlays/staging/nocodelytics-tracker-api.yaml b/kustomization/overlays/staging/nocodelytics-tracker-api.yaml deleted file mode 100644 index 22e0a53..0000000 --- a/kustomization/overlays/staging/nocodelytics-tracker-api.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nocodelytics-tracker-api -spec: - template: - spec: - containers: - - name: nocodelytics-tracker-api - env: - - name: NODE_ENV - value: staging ---- -apiVersion: traefik.containo.us/v1alpha1 -kind: IngressRoute -metadata: - name: nocodelytics-tracker-api -spec: - routes: - - match: Host(`tracker-staging.nocodelytics.com`) - kind: Rule - services: - - name: nocodelytics-tracker-api - port: 8080 - tls: - domains: - - main: tracker-staging.nocodelytics.com