From ea7fe09b7edbfa972b36eb773ab8a074e38e0633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikl=C3=B3s=20T=C3=B3th?= <tothmiklostibor@gmail.com>
Date: Mon, 4 Oct 2021 11:19:53 +0200
Subject: [PATCH] update versions
---
.gitlab-ci.yml | 2 +-
k8s/templates/cert.yml | 12 ------------
k8s/templates/deployment.yml | 3 +++
k8s/templates/ingress.yml | 26 ++++++++++++++++++++++++++
k8s/templates/istio.yml | 34 ----------------------------------
k8s/values.yaml | 2 +-
6 files changed, 31 insertions(+), 48 deletions(-)
delete mode 100644 k8s/templates/cert.yml
create mode 100644 k8s/templates/ingress.yml
delete mode 100644 k8s/templates/istio.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da4e599..aabe23b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
image: alpine
variables:
- VERSION: v1.1.1
+ VERSION: v2
stages:
- build
diff --git a/k8s/templates/cert.yml b/k8s/templates/cert.yml
deleted file mode 100644
index 5b6e14f..0000000
--- a/k8s/templates/cert.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: cert-manager.io/v1alpha2
-kind: Certificate
-metadata:
- name: {{ .Values.Name }}
- namespace: istio-system
-spec:
- commonName: {{ .Values.Domain }}
- dnsNames:
- - {{ .Values.Domain }}
- issuerRef:
- name: letsencrypt-issuer
- secretName: {{ .Values.Name }}-cert
diff --git a/k8s/templates/deployment.yml b/k8s/templates/deployment.yml
index d15a8f1..4a82336 100644
--- a/k8s/templates/deployment.yml
+++ b/k8s/templates/deployment.yml
@@ -17,6 +17,9 @@ spec:
ports:
- containerPort: 8080
name: http
+ env:
+ - name: POSTGRES
+ value: "postgres://feri:almafa@cockroachdb-public.matrix.svc:26257"
resources:
requests:
memory: 50Mi
diff --git a/k8s/templates/ingress.yml b/k8s/templates/ingress.yml
new file mode 100644
index 0000000..f887a2e
--- /dev/null
+++ b/k8s/templates/ingress.yml
@@ -0,0 +1,26 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ name: {{ .Values.Name }}-ingress
+ namespace: {{ .Values.Name }}
+ annotations:
+ cert-manager.io/cluster-issuer: letsencrypt-prod
+ kubernetes.io/ingress.class: nginx
+ kubernetes.io/tls-acme: 'true'
+
+spec:
+ tls:
+ - hosts:
+ - {{ .Values.Name }}.kszk.bme.hu
+ secretName: {{ .Values.Name }}-cert
+ rules:
+ - host: {{ .Values.Name }}.kszk.bme.hu
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: {{ .Values.Name }}-service
+ port:
+ number: 80
\ No newline at end of file
diff --git a/k8s/templates/istio.yml b/k8s/templates/istio.yml
deleted file mode 100644
index e20507a..0000000
--- a/k8s/templates/istio.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: networking.istio.io/v1alpha3
-kind: Gateway
-metadata:
- name: {{ .Values.Name }}-gateway
-spec:
- selector:
- istio: ingressgateway
- servers:
- - hosts:
- - {{ .Values.Domain }}
- port:
- name: web
- number: 443
- protocol: HTTPS
- tls:
- credentialName: {{ .Values.Name }}-cert
- mode: SIMPLE
-
----
-apiVersion: networking.istio.io/v1alpha3
-kind: VirtualService
-metadata:
- name: {{ .Values.Name }}
-spec:
- gateways:
- - {{ .Values.Name }}-gateway
- hosts:
- - {{ .Values.Domain }}
- http:
- - route:
- - destination:
- host: {{ .Values.Name }}-service
- port:
- number: 80
diff --git a/k8s/values.yaml b/k8s/values.yaml
index 542a350..2dee7e5 100644
--- a/k8s/values.yaml
+++ b/k8s/values.yaml
@@ -2,5 +2,5 @@ replicas: 1
Domain: keresettaferi.kszk.bme.hu
Name: keresettaferi
-Tag: "v1.1.1"
+Tag: "v2"
REGISTRY_CONF: "${REGISTRY_CONF}"
--
GitLab