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 6739e99770c6684f43d562c5a2ee17a738c6d72d..3ae8ff916093ed56e8c4c53c49ddd34f79c43b06 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 526781e15213d87452d2c6c16fe9f94622df9c28..a82d9c5652a9220c72d9ec92c3f5adef859ffc59 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a2f4cc80aea8a541425d7aab7b52668ae7e00d37 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 b69959980405d0d1e883c0dc2c1375296a980b2d..0e7d0fa0d18c51f3b27ff5221c988182dda9a10c 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