Commit d6e58b85 authored by Gerrit Voss's avatar Gerrit Voss
Browse files

update: 3.0_pre1

parent e31949c6
......@@ -26,7 +26,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-adminsvc
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-adminsvc:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-adminsvc:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 8080
......
......@@ -25,7 +25,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-apigw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-apigw:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-apigw:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 8080
......
......@@ -25,7 +25,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-consul
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-consul:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-consul:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 8080
......
......@@ -27,6 +27,7 @@
server {
include /opt/nginx.custom/namespace.conf;
client_max_body_size 100M;
listen 8080;
# proxy_set_header X-Forwarded-Host $http_x_forwarded_host;
# proxy_set_header X-Forwarded-Server $host;
......@@ -40,13 +41,21 @@
proxy_pass http://i3dhub-entrygw:8080/repo/$1;
}
location ~ /rabbitmq/(.*) {
{{- if .Values.compose }}
proxy_pass http://i3dhub-rabbitmq:15672/$1$is_args$args;
{{- else }}
proxy_pass http://i3dhub-rabbitmq-management$i3dhubDomain:8080/$1$is_args$args;
{{- end }}
}
location ~ /i3dhub-resourcegw/([0-9]+)/(.*) {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
{{- if .Values.compose }}
proxy_pass http://i3dhub-resourcegw:$1/$2$is_args$args;
{{- else }}
proxy_pass http://i3dhub-resourcegw$i3dhubDomain:$1/$2$is_args$args;
{{- end }}
}
{{- if .Values.proxy }}
location ~ {{ .Values.proxy.path | default "" }}/consul/(.*) {
......@@ -54,20 +63,35 @@
}
{{- else }}
location ~ /consul/(.*) {
{{- if .Values.compose }}
proxy_pass http://i3dhub-consul:8083/consul/$1$is_args$args;
}
{{- else }}
proxy_pass http://i3dhub-consul$i3dhubDomain:8081/consul/$1$is_args$args;
}
{{- end }}
{{- end }}
location ~ /kibana/(.*) {
{{- if .Values.compose }}
proxy_pass http://i3dhub-kibana:5601/$1$is_args$args;
}
{{- else }}
proxy_pass http://i3dhub-kibana$i3dhubDomain:8080/$1$is_args$args;
}
{{- end }}
{{- if .Values.proxy }}
location ~ {{ .Values.proxy.path | default "" }}/jaeger/(.*) {
proxy_pass http://i3dhub-jaeger-query$i3dhubDomain:8080{{ .Values.proxy.path | default "" }}/jaeger/$1$is_args$args;
}
{{- else }}
location ~ /jaeger/(.*) {
{{- if .Values.compose }}
proxy_pass http://i3dhub-jaeger-query:16686/jaeger/$1$is_args$args;
}
{{- else }}
proxy_pass http://i3dhub-jaeger-query$i3dhubDomain:8080/jaeger/$1$is_args$args;
}
{{- end }}
{{- end }}
location /setupSession {
proxy_pass http://i3dhub-entrygw:8080/setupSession;
......@@ -76,7 +100,11 @@
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
{{- if .Values.compose }}
proxy_pass http://$2:$3/$4$is_args$args;
{{- else }}
proxy_pass http://$2$i3dhubDomain:$3/$4$is_args$args;
{{- end }}
}
location / {
root /data;
......
......@@ -42,7 +42,11 @@ service:
force-queue: '[[ gt .RESOURCE.State 3 ]]'
access:
{{- if .Values.compose }}
target-id: i3dhub-deliverysvc
{{- else }}
target-id: {{"{{"}} hostname {{"}}"}}.i3dhub-deliverysvc
{{- end }}
ip: {{"{{"}} hostname_ip {{"}}"}}
endpoints:
- name: DeliveryDataAPI
......
......@@ -31,7 +31,11 @@ service:
worker-port-start: 8080
access:
{{- if .Values.compose }}
target-id: i3dhub-measurementsvc
{{- else }}
target-id: {{"{{"}} hostname {{"}}"}}.i3dhub-measurementsvc
{{- end }}
ip: {{"{{"}} hostname_ip {{"}}"}}
endpoints:
- name: MeasurementAPI
......
......@@ -39,7 +39,11 @@ service:
value: '[[ .Params.output ]]'
access:
{{- if .Values.compose }}
target-id: i3dhub-rendersvc
{{- else }}
target-id: {{"{{"}} hostname {{"}}"}}.i3dhub-rendersvc
{{- end }}
ip: {{"{{"}} hostname_ip {{"}}"}}
endpoints:
- name: RenderNaVisAPI
......
......@@ -42,7 +42,11 @@ service:
force-queue: '[[ gt .RESOURCE.State 3 ]]'
access:
{{- if .Values.compose }}
target-id: i3dhub-querysvc
{{- else }}
target-id: {{"{{"}} hostname {{"}}"}}.i3dhub-querysvc
{{- end }}
ip: {{"{{"}} hostname_ip {{"}}"}}
endpoints:
- name: QueryDataAPI
......
......@@ -41,7 +41,11 @@ service:
force-queue: '[[ gt .RESOURCE.State 3 ]]'
access:
{{- if .Values.compose }}
target-id: i3dhub-sessionstoresvc
{{- else }}
target-id: {{"{{"}} hostname {{"}}"}}.i3dhub-sessionstoresvc
{{- end }}
ip: {{"{{"}} hostname_ip {{"}}"}}
endpoints:
- name: SessionStoreAPI
......
......@@ -52,7 +52,11 @@ service:
value: '[[ .Params.sessionId ]]'
access:
{{- if .Values.compose }}
target-id: i3dhub-sharedsessionsvc
{{- else }}
target-id: {{"{{"}} hostname {{"}}"}}.i3dhub-sharedsessionsvc
{{- end }}
ip: {{"{{"}} hostname_ip {{"}}"}}
endpoints:
- name: SharedSessionInspectAPI
......
......@@ -25,7 +25,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-deliverygw
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverygw:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverygw:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......@@ -73,7 +73,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-deliverysvc
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverysvc:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverysvc:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
......@@ -27,7 +27,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-elastic
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-elastic:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-elastic:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 9200 #TODO
......@@ -87,7 +87,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-kibana
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-kibana:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-kibana:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 5601
......
......@@ -26,7 +26,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-entrygw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-entrygw:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-entrygw:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 8080
......
......@@ -25,7 +25,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-jaeger-collector
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-jaeger-collector:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-jaeger-collector:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 14250
......@@ -79,7 +79,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-jaeger-query
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-jaeger-query:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-jaeger-query:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 16686
......
......@@ -25,7 +25,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-measurementgw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-measurementgw:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-measurementgw:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......@@ -74,7 +74,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-measurementsvc
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-measurementsvc:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-measurementsvc:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
......@@ -43,7 +43,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-postgres
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-postgres:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-postgres:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 5432 #TODO
......
......@@ -25,7 +25,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-querygw
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-querygw:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-querygw:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......@@ -73,7 +73,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-querysvc
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-querysvc:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-querysvc:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
......@@ -25,7 +25,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-rabbitmq
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-rabbitmq:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-rabbitmq:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 5672 #Fixed
......
......@@ -25,7 +25,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-resourcegw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-resourcegw:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-resourcegw:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 8080
......
......@@ -25,7 +25,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-sessionstoregw
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sessionstoregw:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sessionstoregw:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......@@ -73,7 +73,7 @@ spec:
{{- end }}
containers:
- name: i3dhub-sessionstoresvc
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sessionstoresvc:{{ .Values.imageTag | default "861a4b7db81c4bf2da2a4a1d2de1974b" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sessionstoresvc:{{ .Values.imageTag | default "d6cf0c4fcd302d9cb991e22d91111359" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
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