diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da4e59994d70e0e0b2816988df2e13f4c85aa723..aabe23b0094157247dec88aa39c1393168ad7ed7 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 5b6e14f04f1b220406e337664ae1eeb0d2361e32..0000000000000000000000000000000000000000 --- 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 d15a8f125269e11511bc189a48a5bf1d44b7076f..4a82336382e5357d237bf57f1a356896c570c1ba 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 0000000000000000000000000000000000000000..f887a2e7538ca02765c2f20e6c6f8bce9e3d13fd --- /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 e20507a78074eb2a6a889a2707b9666b7d167185..0000000000000000000000000000000000000000 --- 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 542a35007898e99e70137f09172fdf2308d76b31..2dee7e551295c46d26bc2c16c1ff38ae428cce5d 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}"