From 51e3a2d1e86ede486a1984b0e87c147fe9385627 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Tue, 9 Apr 2024 23:01:09 +0200
Subject: [PATCH] Kustomizierung
---
deploy/base/deployment.yaml | 40 +++++++++++++++++++
deploy/base/ingress.yaml | 11 +++++
deploy/base/kustomization.yaml | 10 +++++
deploy/{ => base}/service.yaml | 0
deploy/deployment.yaml | 22 ----------
.../production/ingress_patch.yaml} | 0
deploy/overlays/production/kustomization.yaml | 12 ++++++
deploy/overlays/review/ingress_patch.yaml | 25 ++++++++++++
deploy/overlays/review/kustomization.yaml | 13 ++++++
9 files changed, 111 insertions(+), 22 deletions(-)
create mode 100644 deploy/base/deployment.yaml
create mode 100644 deploy/base/ingress.yaml
create mode 100644 deploy/base/kustomization.yaml
rename deploy/{ => base}/service.yaml (100%)
delete mode 100644 deploy/deployment.yaml
rename deploy/{ingress.yaml => overlays/production/ingress_patch.yaml} (100%)
create mode 100644 deploy/overlays/production/kustomization.yaml
create mode 100644 deploy/overlays/review/ingress_patch.yaml
create mode 100644 deploy/overlays/review/kustomization.yaml
diff --git a/deploy/base/deployment.yaml b/deploy/base/deployment.yaml
new file mode 100644
index 00000000..20fee733
--- /dev/null
+++ b/deploy/base/deployment.yaml
@@ -0,0 +1,40 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: teckids-website
+ namespace: teckids-website
+ labels:
+ app: teckids-website
+spec:
+ replicas: 3
+ selector:
+ matchLabels:
+ app: teckids-website
+ template:
+ metadata:
+ labels:
+ app: teckids-website
+ spec:
+ containers:
+ - name: caddy
+ image: registry.edugit.org/teckids/team-pr/teckids.org:IMAGE_TAG
+ ports:
+ - containerPort: 80
+ livenessProbe:
+ httpGet:
+ scheme: HTTP
+ port: http
+ path: /
+ timeoutSeconds: 10
+ initialDelaySeconds: 60
+ name: adressbuch
+ ports:
+ - containerPort: 80
+ name: http
+ readinessProbe:
+ httpGet:
+ scheme: HTTP
+ port: http
+ path: /
+ timeoutSeconds: 10
+ initialDelaySeconds: 120
diff --git a/deploy/base/ingress.yaml b/deploy/base/ingress.yaml
new file mode 100644
index 00000000..b22f5716
--- /dev/null
+++ b/deploy/base/ingress.yaml
@@ -0,0 +1,11 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ annotations:
+ cert-manager.io/cluster-issuer: letsencrypt-prod
+ kubernetes.io/tls-acme: "true"
+ name: teckids-website-caddy
+ namespace: teckids-website
+spec:
+ ingressClassName: nginx
+ rules: []
diff --git a/deploy/base/kustomization.yaml b/deploy/base/kustomization.yaml
new file mode 100644
index 00000000..dfde199d
--- /dev/null
+++ b/deploy/base/kustomization.yaml
@@ -0,0 +1,10 @@
+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
diff --git a/deploy/service.yaml b/deploy/base/service.yaml
similarity index 100%
rename from deploy/service.yaml
rename to deploy/base/service.yaml
diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml
deleted file mode 100644
index 53688d5f..00000000
--- a/deploy/deployment.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: teckids-website
- namespace: teckids-website
- labels:
- app: teckids-website
-spec:
- replicas: 3
- selector:
- matchLabels:
- app: teckids-website
- template:
- metadata:
- labels:
- app: teckids-website
- spec:
- containers:
- - name: caddy
- image: registry.edugit.org/teckids/team-pr/teckids.org:IMAGE_TAG
- ports:
- - containerPort: 80
diff --git a/deploy/ingress.yaml b/deploy/overlays/production/ingress_patch.yaml
similarity index 100%
rename from deploy/ingress.yaml
rename to deploy/overlays/production/ingress_patch.yaml
diff --git a/deploy/overlays/production/kustomization.yaml b/deploy/overlays/production/kustomization.yaml
new file mode 100644
index 00000000..e5903017
--- /dev/null
+++ b/deploy/overlays/production/kustomization.yaml
@@ -0,0 +1,12 @@
+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
+patchesStrategicMerge:
+- ingress_patch.yaml
diff --git a/deploy/overlays/review/ingress_patch.yaml b/deploy/overlays/review/ingress_patch.yaml
new file mode 100644
index 00000000..f4e70331
--- /dev/null
+++ b/deploy/overlays/review/ingress_patch.yaml
@@ -0,0 +1,25 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ annotations:
+ cert-manager.io/cluster-issuer: letsencrypt-prod
+ kubernetes.io/tls-acme: "true"
+ name: teckids-website-caddy
+ namespace: teckids-website
+spec:
+ ingressClassName: nginx
+ rules:
+ - host: __REVIEW_ENVIRONMENT__.staging.teckids.org
+ http:
+ paths:
+ - backend:
+ service:
+ name: teckids-website
+ port:
+ number: 80
+ path: /
+ pathType: Prefix
+ tls:
+ - hosts:
+ - __REVIEW_ENVIRONMENT__.staging.teckids.org
+ secretName: __REVIEW_ENVIRONMENT__-teckids-website-tls
diff --git a/deploy/overlays/review/kustomization.yaml b/deploy/overlays/review/kustomization.yaml
new file mode 100644
index 00000000..549a7e02
--- /dev/null
+++ b/deploy/overlays/review/kustomization.yaml
@@ -0,0 +1,13 @@
+bases:
+- ../../base
+commonAnnotations:
+ source-repository: https://edugit.org/Teckids/team-pr/teckids.org
+commonLabels:
+ app: teckids-website
+ environment: __REVIEW_ENVIRONMENT__
+namePrefix: __REVIEW_ENVIRONMENT__-
+namespace: teckids-website
+patchesStrategicMerge:
+- ingress_patch.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
--
GitLab