Verified Commit 98e80c58 authored by blint's avatar blint 😶
Browse files

cleanup and try staging

parent 882f7571
......@@ -76,7 +76,7 @@ staging:
script:
- bash
- cd "$CI_PROJECT_DIR"/k8s
- envsubst < values.staging.yaml | helm upgrade --install --wait becskasszasch . -n becskasszasch-staging --values -
- envsubst < values.staging.yaml | helm upgrade --install --wait becskasszasch-staging . -n becskasszasch-staging --values -
rules:
- when: manual
......
apiVersion: cert-manager.io/v1alpha2
kind: Certificate
metadata:
name: becskasszasch
name: {{ .Values.Name }}
namespace: istio-system
spec:
commonName: {{ .Values.Domain }}
......@@ -9,4 +9,4 @@ spec:
- {{ .Values.Domain }}
issuerRef:
name: letsencrypt-issuer
secretName: becskasszasch-cert
secretName: {{ .Values.Name }}-cert
apiVersion: apps/v1
kind: Deployment
metadata:
name: becskasszasch
name: {{ .Values.Name }}
spec:
selector:
matchLabels:
app: becskasszasch
app: {{ .Values.Name }}
template:
metadata:
labels:
app: becskasszasch
app: {{ .Values.Name }}
spec:
containers:
- name: becskasszasch
- name: {{ .Values.Name }}
image: "docker.io/blintmester/becskasszasch:{{ .Values.Tag }}"
args:
- -logSQL
......@@ -21,7 +21,7 @@ spec:
name: http
envFrom:
- secretRef:
name: becskasszasch-secret
name: {{ .Values.Name }}-secret
resources:
requests:
memory: 50Mi
......
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
metadata:
name: becskasszasch-gateway
name: {{ .Values.Name }}-gateway
spec:
selector:
istio: ingressgateway
......@@ -13,22 +13,22 @@ spec:
number: 443
protocol: HTTPS
tls:
credentialName: becskasszasch-cert
credentialName: {{ .Values.Name }}-cert
mode: SIMPLE
---
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: becskasszasch
name: {{ .Values.Name }}
spec:
gateways:
- becskasszasch-gateway
- {{ .Values.Name }}-gateway
hosts:
- {{ .Values.Domain }}
http:
- route:
- destination:
host: becskasszasch-service
host: {{ .Values.Name }}-service
port:
number: 80
apiVersion: v1
kind: Secret
metadata:
name: becskasszasch-secret
name: {{ .Values.Name }}-secret
stringData:
CLIENTID: "{{ .Values.CLIENTID}}"
CLIENTSECRET: "{{ .Values.CLIENTSECRET }}"
......
apiVersion: v1
kind: Service
metadata:
name: becskasszasch-service
name: {{ .Values.Name }}-service
spec:
ports:
- name: http
......@@ -9,4 +9,4 @@ spec:
port: 80
targetPort: 8080
selector:
app: becskasszasch
app: {{ .Values.Name }}
replicas: 1
Domain: staging.becskassza.kszk.bme.hu
Name: becskasszasch-staging
CLIENTID: "${STAGING_CLIENTID}"
CLIENTSECRET: "${STAGING_CLIENTSECRET}"
POSTGRES: "${STAGING_POSTGRES}"
......
replicas: 1
Domain: becskassza.kszk.bme.hu
Name: becskasszasch
CLIENTID: "${CLIENTID}"
CLIENTSECRET: "${CLIENTSECRET}"
POSTGRES: "${POSTGRES}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment