From e5b85a82dbf5620fd717ecead922b81afd1c0cb0 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Wed, 10 Apr 2024 00:10:10 +0200
Subject: [PATCH] Remove deprectatet kustomize dings
---
deploy/base/kustomization.yaml | 12 ++++++-----
deploy/overlays/production/kustomization.yaml | 20 ++++++++++---------
deploy/overlays/review/kustomization.yaml | 20 ++++++++++---------
3 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/deploy/base/kustomization.yaml b/deploy/base/kustomization.yaml
index dfde199d..05be69a0 100644
--- a/deploy/base/kustomization.yaml
+++ b/deploy/base/kustomization.yaml
@@ -2,9 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
commonAnnotations:
source-repository: https://edugit.org/Teckids/team-pr/teckids.org
-commonLabels:
- app: teckids-website
resources:
- - deployment.yaml
- - service.yaml
- - ingress.yaml
+- deployment.yaml
+- service.yaml
+- ingress.yaml
+labels:
+- includeSelectors: true
+ pairs:
+ app: teckids-website
diff --git a/deploy/overlays/production/kustomization.yaml b/deploy/overlays/production/kustomization.yaml
index e02d0bfd..aeffaa3d 100644
--- a/deploy/overlays/production/kustomization.yaml
+++ b/deploy/overlays/production/kustomization.yaml
@@ -1,21 +1,23 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
-bases:
-- ../../base
commonAnnotations:
source-repository: https://edugit.org/Teckids/team-pr/teckids.org
-commonLabels:
- app: teckids-website
- environment: production
namespace: teckids-website
patches:
-- target:
- kind: Ingress
- name: teckids-website-caddy
- patch: |-
+- patch: |-
- op: replace
path: /spec/rules/0/host
value: teckids.org
- op: replace
path: /spec/tls/0/hosts/0
value: teckids.org
+ target:
+ kind: Ingress
+ name: teckids-website-caddy
+resources:
+- ../../base
+labels:
+- includeSelectors: true
+ pairs:
+ app: teckids-website
+ environment: production
diff --git a/deploy/overlays/review/kustomization.yaml b/deploy/overlays/review/kustomization.yaml
index 58a8bcb9..07e58d7e 100644
--- a/deploy/overlays/review/kustomization.yaml
+++ b/deploy/overlays/review/kustomization.yaml
@@ -1,18 +1,10 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
-bases:
-- ../../base
commonAnnotations:
source-repository: https://edugit.org/Teckids/team-pr/teckids.org
-commonLabels:
- app: teckids-website
- environment: __REVIEW_NAME__
namespace: teckids-website
patches:
-- target:
- kind: Ingress
- name: teckids-website-caddy
- patch: |-
+- patch: |-
- op: replace
path: /spec/rules/0/host
value: __REVIEW_NAME__.review.teckids.org
@@ -22,3 +14,13 @@ patches:
- op: replace
path: /spec/tls/0/secretName
value: __REVIEW_NAME__-website-tls
+ target:
+ kind: Ingress
+ name: teckids-website-caddy
+resources:
+- ../../base
+labels:
+- includeSelectors: true
+ pairs:
+ app: teckids-website
+ environment: __REVIEW_NAME__
--
GitLab