From c6233166793d8c253c4d966181d4b99168266fe2 Mon Sep 17 00:00:00 2001
From: Johannes Buechele <johannes@bujo.at>
Date: Mon, 29 May 2023 12:12:40 +0200
Subject: [PATCH] some k8s fixes
---
...eplyoment.yaml => backend-deployment.yaml} | 0
deployments/k8s/base/postgres.yaml | 2 +-
.../k8s/dev/backend-deployment-patch.yaml | 9 -----
deployments/k8s/dev/ingress.yaml | 40 +++++++++++++++++++
deployments/k8s/dev/kustomization.yaml | 8 ++--
5 files changed, 46 insertions(+), 13 deletions(-)
rename deployments/k8s/base/{backend-deplyoment.yaml => backend-deployment.yaml} (100%)
diff --git a/deployments/k8s/base/backend-deplyoment.yaml b/deployments/k8s/base/backend-deployment.yaml
similarity index 100%
rename from deployments/k8s/base/backend-deplyoment.yaml
rename to deployments/k8s/base/backend-deployment.yaml
diff --git a/deployments/k8s/base/postgres.yaml b/deployments/k8s/base/postgres.yaml
index 6739e99..3ae8ff9 100644
--- a/deployments/k8s/base/postgres.yaml
+++ b/deployments/k8s/base/postgres.yaml
@@ -8,7 +8,7 @@ spec:
postgres: postgres
numberOfInstances: 2
postgresql:
- version: "15"
+ version: "14"
teamId: fairregister
users:
fairregister: []
diff --git a/deployments/k8s/dev/backend-deployment-patch.yaml b/deployments/k8s/dev/backend-deployment-patch.yaml
index 526781e..a82d9c5 100644
--- a/deployments/k8s/dev/backend-deployment-patch.yaml
+++ b/deployments/k8s/dev/backend-deployment-patch.yaml
@@ -52,15 +52,6 @@ spec:
{{- end }}
labels:
app: hashing-service
- spec:
- containers:
- - name: hashing-service
- image: local_hashing-service_1
- ports:
- - containerPort: 8081
- env:
- - name: SPRING_PROFILES_ACTIVE
- value: localdocker
---
apiVersion: apps/v1
diff --git a/deployments/k8s/dev/ingress.yaml b/deployments/k8s/dev/ingress.yaml
index e69de29..a2f4cc8 100644
--- a/deployments/k8s/dev/ingress.yaml
+++ b/deployments/k8s/dev/ingress.yaml
@@ -0,0 +1,40 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ name: fairregister-dev
+ labels:
+ app: fairregister-dev
+ annotations:
+ cert-manager.io/issuer: letsencrypt-prod
+ nginx.ingress.kubernetes.io/enable-cors: "true"
+ nginx.ingress.kubernetes.io/cors-allow-origin: "*"
+ nginx.ingress.kubernetes.io/cors-allow-methods: "*"
+ nginx.ingress.kubernetes.io/cors-allow-headers: "*"
+spec:
+ rules:
+ - host: dev.fairregister.net
+ http:
+ paths:
+ - backend:
+ service:
+ name: frontend-fairregister
+ port:
+ number: 80
+ path: /
+ pathType: ImplementationSpecific
+ - host: api.dev.fairregister.net
+ http:
+ paths:
+ - backend:
+ service:
+ name: api-service
+ port:
+ number: 8080
+ path: /
+ pathType: ImplementationSpecific
+ tls:
+ - hosts:
+ - dev.fairregister.net
+ - api.dev.fairregister.net
+ secretName: dev-fairregister-net
+
diff --git a/deployments/k8s/dev/kustomization.yaml b/deployments/k8s/dev/kustomization.yaml
index b699599..0e7d0fa 100644
--- a/deployments/k8s/dev/kustomization.yaml
+++ b/deployments/k8s/dev/kustomization.yaml
@@ -1,6 +1,8 @@
namespace: fairregister-dev
resources:
- - ../base
- - ingress.yaml
- - wellknown.yaml
+- ../base
+- ingress.yaml
+
+patchesStrategicMerge:
+- backend-deployment-patch.yaml
--
GitLab