From: Alexis de Talhouët Date: Thu, 25 Jan 2018 15:54:32 +0000 (-0500) Subject: Update the nginx server_name with regex X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7956fb277af4f4b4de5dfb734abdbf189ccf57f3;p=oom.git Update the nginx server_name with regex Since https://gerrit.onap.org/r/#/c/29063/ came in the server_name are now in the form or *.sdc.__random_str__.simpledemo.onap.org so we need to update nginx configuration accordingly. Change-Id: Ic175d4a7996979cfc9fee7a80511ee7cb42387ee Signed-off-by: Alexis de Talhouët Issue-ID: OOM-615 --- diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/aai-service.onap.org.conf b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/aai-service.onap.org.conf index 4670f35ec3..d88c45f9e3 100644 --- a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/aai-service.onap.org.conf +++ b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/aai-service.onap.org.conf @@ -6,7 +6,7 @@ server { index index.html index.htm index.nginx-debian.html; - server_name *.aai.simpledemo.onap.org; + server_name ~.aai.*.simpledemo.onap.org; resolver KUBE_DNS_IP_HERE valid=1s; diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/dmaap.onap.org.conf b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/dmaap.onap.org.conf index e9c38d5895..366b07cf90 100644 --- a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/dmaap.onap.org.conf +++ b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/dmaap.onap.org.conf @@ -6,7 +6,7 @@ server { index index.html index.htm index.nginx-debian.html; - server_name *.mr.simpledemo.onap.org; + server_name ~.mr.*.simpledemo.onap.org; resolver KUBE_DNS_IP_HERE valid=1s; diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/open.onap.org.conf b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/open.onap.org.conf index de4d04321f..8fdd4fb9f2 100644 --- a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/open.onap.org.conf +++ b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/open.onap.org.conf @@ -6,7 +6,7 @@ server { index index.html index.htm index.nginx-debian.html; - server_name *.openo.simpledemo.onap.org; + server_name ~.openo.*.simpledemo.onap.org; resolver KUBE_DNS_IP_HERE valid=1s; @@ -28,7 +28,7 @@ server { index index.html index.htm index.nginx-debian.html; - server_name *.openo.simpledemo.onap.org; + server_name ~.openo.*.simpledemo.onap.org; resolver KUBE_DNS_IP_HERE valid=1s; diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/pdp.onap.org.conf b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/pdp.onap.org.conf index 72fe7be134..adae4f3e96 100644 --- a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/pdp.onap.org.conf +++ b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/pdp.onap.org.conf @@ -6,7 +6,7 @@ server { index index.html index.htm index.nginx-debian.html; - server_name *.policy.simpledemo.onap.org; + server_name ~.policy.*.simpledemo.onap.org; resolver KUBE_DNS_IP_HERE valid=1s; diff --git a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/sdc-be.onap.org.conf b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/sdc-be.onap.org.conf index 0be9355b6d..8042ce9cbd 100644 --- a/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/sdc-be.onap.org.conf +++ b/kubernetes/config/docker/init/src/config/dcaegen2/nginx/config/sdc-be.onap.org.conf @@ -6,7 +6,7 @@ server { index index.html index.htm index.nginx-debian.html; - server_name *.sdc.simpledemo.onap.org; + server_name ~.sdc.*.simpledemo.onap.org; resolver KUBE_DNS_IP_HERE valid=1s; diff --git a/kubernetes/config/values.yaml b/kubernetes/config/values.yaml index e694641447..5a0cd5dafa 100644 --- a/kubernetes/config/values.yaml +++ b/kubernetes/config/values.yaml @@ -3,5 +3,5 @@ nsPrefix: onap dockerSharePath: /dockerdata-nfs image: repository: oomk8s/config-init - tag: 1.1.11 + tag: 1.1.12 pullPolicy: Always