From 25d75f272b25266a6af50d0bb4dd374ba90be565 Mon Sep 17 00:00:00 2001
From: 456130 <456130@mail.muni.cz>
Date: Tue, 20 Aug 2019 10:30:22 +0200
Subject: [PATCH] Scoped ingress & var on domain & sed domain
---
.gitlab-ci.yml | 3 +++
yaml/bash.sh | 1 +
yaml/ingress-proxy.yml | 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73aeaa9..6ceaf5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,6 +48,7 @@ deploy to k8s:
stage: deploy
variables:
NAMESPACE: cbio-on-demand
+ DOMAIN: cbiood
<<: *kube-auth
image: registry.gitlab.ics.muni.cz:443/europdx/k8s/ci:latest
script:
@@ -86,6 +87,7 @@ deploy to k8s beta:
stage: deploy
variables:
NAMESPACE: cbio-on-demand-beta
+ DOMAIN: cbiood-beta
<<: *kube-auth
image: registry.gitlab.ics.muni.cz:443/europdx/k8s/ci:latest
script:
@@ -124,6 +126,7 @@ deploy to k8s dev:
stage: deploy
variables:
NAMESPACE: cbio-on-demand-dev
+ DOMAIN: cbiood-dev
<<: *kube-auth
image: registry.gitlab.ics.muni.cz:443/europdx/k8s/ci:latest
script:
diff --git a/yaml/bash.sh b/yaml/bash.sh
index f3a9e8c..495754a 100755
--- a/yaml/bash.sh
+++ b/yaml/bash.sh
@@ -2,4 +2,5 @@ echo "Hi I am here"
cd yaml
for i in *; do
sed -i "s^__NAMESPACE__^${NAMESPACE}^" $i
+ sed -i "s^__DOMAIN__^${DOMAIN}" $i
done
diff --git a/yaml/ingress-proxy.yml b/yaml/ingress-proxy.yml
index 2126046..ebde1ec 100644
--- a/yaml/ingress-proxy.yml
+++ b/yaml/ingress-proxy.yml
@@ -8,10 +8,10 @@ metadata:
spec:
tls:
- hosts:
- - cbiood.edirex.ics.muni.cz
+ - __DOMAIN__.edirex.ics.muni.cz
secretName: ingress
rules:
- - host: cbiood.edirex.ics.muni.cz
+ - host: __DOMAIN__.edirex.ics.muni.cz
http:
paths:
- path: /
--
GitLab