From 266a7b7da7ab7e3402520e0461120b02f418927c Mon Sep 17 00:00:00 2001 From: Stefan Maute Date: Wed, 27 Feb 2019 12:17:34 +0100 Subject: [PATCH] add .env file to .gitignore updated /status location in nginx.conf Signed-off-by: Stefan Maute --- .gitignore | 1 + deployment/docker/.env | 1 - deployment/docker/nginx.conf | 4 +++- deployment/kubernetes/nginx/nginx.conf | 4 +++- deployment/openshift/ditto/ditto-cluster.yaml | 12 ++++++------ deployment/openshift/nginx/nginx.conf | 4 +++- 6 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 deployment/docker/.env diff --git a/.gitignore b/.gitignore index cb26a99bac..1dea7c93a3 100755 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ dependencies.txt /deployment/docker/sandbox/graphite/storage ajcore.*.txt *.mdb +.env \ No newline at end of file diff --git a/deployment/docker/.env b/deployment/docker/.env deleted file mode 100644 index f9fd4a274d..0000000000 --- a/deployment/docker/.env +++ /dev/null @@ -1 +0,0 @@ -DITTO_VERSION=0-SNAPSHOT diff --git a/deployment/docker/nginx.conf b/deployment/docker/nginx.conf index 8fb478027d..7057afa202 100755 --- a/deployment/docker/nginx.conf +++ b/deployment/docker/nginx.conf @@ -81,7 +81,9 @@ http { location /status { include nginx-cors.conf; - proxy_pass http://gateway:8080/overall/status; + # switch to overall route for new versions + # proxy_pass http://gateway:8080/overall/status; + proxy_pass http://gateway:8080/status; proxy_http_version 1.1; proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; diff --git a/deployment/kubernetes/nginx/nginx.conf b/deployment/kubernetes/nginx/nginx.conf index 2b7a53e78f..8b619232a5 100644 --- a/deployment/kubernetes/nginx/nginx.conf +++ b/deployment/kubernetes/nginx/nginx.conf @@ -81,7 +81,9 @@ http { location /status { include nginx-cors.conf; - proxy_pass http://gateway:8080/overall/status; + # switch to overall route for new versions + # proxy_pass http://gateway:8080/overall/status; + proxy_pass http://gateway:8080/status; proxy_http_version 1.1; proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; diff --git a/deployment/openshift/ditto/ditto-cluster.yaml b/deployment/openshift/ditto/ditto-cluster.yaml index fb3e30e22a..8611df8a98 100644 --- a/deployment/openshift/ditto/ditto-cluster.yaml +++ b/deployment/openshift/ditto/ditto-cluster.yaml @@ -20,7 +20,7 @@ spec: restartPolicy: Always containers: - name: concierge - image: docker.io/eclipse/ditto-concierge:0.8.0 + image: docker.io/eclipse/ditto-concierge:lastest imagePullPolicy: IfNotPresent command: ["java"] args: ["-jar", "/opt/ditto/starter.jar"] @@ -93,7 +93,7 @@ spec: restartPolicy: Always containers: - name: connectivity - image: docker.io/eclipse/ditto-connectivity:0.8.0 + image: docker.io/eclipse/ditto-connectivity:latest imagePullPolicy: IfNotPresent command: ["java"] args: ["-jar", "/opt/ditto/starter.jar"] @@ -166,7 +166,7 @@ spec: restartPolicy: Always containers: - name: things - image: docker.io/eclipse/ditto-things:0.8.0 + image: docker.io/eclipse/ditto-things:latest imagePullPolicy: IfNotPresent command: ["java"] args: ["-jar", "/opt/ditto/starter.jar"] @@ -238,7 +238,7 @@ spec: spec: containers: - name: things-search - image: docker.io/eclipse/ditto-things-search:0.8.0 + image: docker.io/eclipse/ditto-things-search:latest imagePullPolicy: IfNotPresent command: ["java"] args: ["-jar", "/opt/ditto/starter.jar"] @@ -309,7 +309,7 @@ spec: spec: containers: - name: policies - image: docker.io/eclipse//eclipse-ditto-policies:0.8.0 + image: docker.io/eclipse//eclipse-ditto-policies:latest imagePullPolicy: IfNotPresent command: ["java"] args: ["-jar", "/opt/ditto/starter.jar"] @@ -381,7 +381,7 @@ spec: spec: containers: - name: gateway - image: docker.io/eclipse/ditto-gateway:0.8.0 + image: docker.io/eclipse/ditto-gateway:latest imagePullPolicy: IfNotPresent command: ["java"] args: ["-jar", "/opt/ditto/starter.jar"] diff --git a/deployment/openshift/nginx/nginx.conf b/deployment/openshift/nginx/nginx.conf index 2ccda51e11..d0ca02f8af 100644 --- a/deployment/openshift/nginx/nginx.conf +++ b/deployment/openshift/nginx/nginx.conf @@ -81,7 +81,9 @@ http { location /status { include nginx-cors.conf; - proxy_pass http://gateway:8080/overall/status + # switch to overall route for new versions + # proxy_pass http://gateway:8080/overall/status + proxy_pass http://gateway:8080/status proxy_http_version 1.1; proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr;