Commit 509613a8 authored by threedytech's avatar threedytech
Browse files

release: trk_jttk_10_2-10741

parent 88612bec
......@@ -88,9 +88,15 @@ spec:
name: {{ .Values.credentials.admin.secretKeyRef.name }}
key: {{ .Values.credentials.admin.secretKeyRef.key }}
{{- end }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- name: i3dhub-cache-storage
......
......@@ -3,6 +3,9 @@ kind: Deployment
metadata:
name: i3dhub-apigw
spec:
{{- if .Values.numApiGwPods }}
replicas: {{ .Values.numApiGwPods }}
{{- end }}
selector:
matchLabels:
app: i3dhub-apigw
......@@ -122,9 +125,15 @@ spec:
secretKeyRef:
name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- name: local-i3dhub-log
......
......@@ -3,6 +3,9 @@ kind: Deployment
metadata:
name: i3dhub-deliverysvc
spec:
{{- if .Values.numDeliveryServicePods }}
replicas: {{ .Values.numDeliveryServicePods }}
{{- end }}
selector:
matchLabels:
app: i3dhub-deliverysvc
......@@ -75,9 +78,15 @@ spec:
value: i3dhub-consul:8500
- name: JAEGER_COLLECTOR_HOSTS
value: i3dhub-jaeger-collector:14250
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- mountPath: /var/cache/instant3Dhub/
......@@ -120,9 +129,15 @@ spec:
secretKeyRef:
name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- mountPath: /var/cache/instant3Dhub/
......
{{- if .Values.tracing.withJaeger }}
# ELASTIC BEGIN
{{- if .Values.elasticStackFeatures.enabled }}
apiVersion: apps/v1
kind: Deployment
......
......@@ -3,6 +3,9 @@ kind: Deployment
metadata:
name: i3dhub-entrygw
spec:
{{- if .Values.numEntryGwPods }}
replicas: {{ .Values.numEntryGwPods }}
{{- end }}
selector:
matchLabels:
app: i3dhub-entrygw
......@@ -67,9 +70,15 @@ spec:
value: i3dhub-elastic:9200
- name: I3DH_CONSUL_HOST
value: i3dhub-consul:8500
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- mountPath: /opt/instant3Dhub/share/instant3Dhub/services/hubgw/
......
......@@ -89,9 +89,15 @@ spec:
secretKeyRef:
name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- mountPath: /var/cache/instant3Dhub/
......
{{- if .Values.elasticStackFeatures.enabled }}
{{- if .Values.tracing.withJaeger }}
apiVersion: apps/v1
kind: Deployment
......
......@@ -81,9 +81,15 @@ spec:
secretKeyRef:
name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- name: local-i3dhub-log
......
......@@ -81,9 +81,15 @@ spec:
secretKeyRef:
name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
{{- if not .Values.resourceLimits.ignore }}
resources:
......
......@@ -5,6 +5,9 @@ kind: Deployment
metadata:
name: i3dhub-pgbouncer
spec:
{{- if .Values.numPgBouncerPods }}
replicas: {{ .Values.numPgBouncerPods }}
{{- end }}
selector:
matchLabels:
app: i3dhub-pgbouncer
......
......@@ -3,6 +3,9 @@ kind: Deployment
metadata:
name: i3dhub-querysvc
spec:
{{- if .Values.numQueryServicePods }}
replicas: {{ .Values.numQueryServicePods }}
{{- end }}
selector:
matchLabels:
app: i3dhub-querysvc
......@@ -75,9 +78,15 @@ spec:
value: i3dhub-consul:8500
- name: JAEGER_COLLECTOR_HOSTS
value: i3dhub-jaeger-collector:14250
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
- name: AUTHSVC_HOST
value: 127.0.0.1:6060
......@@ -124,9 +133,15 @@ spec:
secretKeyRef:
name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- mountPath: /var/cache/instant3Dhub/
......
......@@ -3,6 +3,9 @@ kind: Deployment
metadata:
name: i3dhub-resourcegw
spec:
{{- if .Values.numResourceGwPods }}
replicas: {{ .Values.numResourceGwPods }}
{{- end }}
selector:
matchLabels:
app: i3dhub-resourcegw
......@@ -85,9 +88,15 @@ spec:
secretKeyRef:
name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- name: local-i3dhub-log
......
......@@ -22,7 +22,7 @@ monitoring:
- name: Debug Configuration
description: "View internal configuration for debugging purposes"
path: /admin/config/
{{- if .Values.elasticStackFeatures.enabled }}
{{- if .Values.tracing.withJaeger }}
- name: Kibana
description: "Service log discovery"
path: /kibana/
......
......@@ -274,13 +274,13 @@ service:
{{- $_ := set $defaultL3dGen "x3d-vrml" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "x3d-xml" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "xyz" (list "Core/l3dGen") -}}
{{ range $type, $licenses := $defaultL3dGen }}
- name: l3dGen Pattern - {{ $type }}
params:
inputContentType: "{{ $type }}"
resultContentType: l3d
class: l3dGen
licenses-allow-missing: {{ eq $type "" }}
licenses:
{{ range $license := $licenses }}
- {{ $license }}
......@@ -303,6 +303,7 @@ service:
inputContentType: any
resultContentType: l3d
class: l3dGen
licenses-allow-missing: true
licenses:
- "Core/l3dGen"
- "Core/l3dGen|Loader/FBX"
......
......@@ -3,6 +3,9 @@ kind: Deployment
metadata:
name: i3dhub-spacestoresvc
spec:
{{- if .Values.numSpaceStorePods }}
replicas: {{ .Values.numSpaceStorePods }}
{{- end }}
selector:
matchLabels:
app: i3dhub-spacestoresvc
......@@ -73,10 +76,16 @@ spec:
secretKeyRef:
name: {{ .Values.credentials.postgres.spaces.secretKeyRef.name }}
key: {{ .Values.credentials.postgres.spaces.secretKeyRef.key }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
{{- if not .Values.resourceLimits.ignore }}
resources:
{{ .Values.resourceLimits.sessionstore | toYaml | indent 12 }}
......
......@@ -81,9 +81,15 @@ spec:
secretKeyRef:
name: {{ .Values.credentials.rabbitmq.secretKeyRef.name }}
key: {{ .Values.credentials.rabbitmq.secretKeyRef.key }}
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
{{- if not .Values.resourceLimits.ignore }}
resources:
......
......@@ -3,6 +3,9 @@ kind: Deployment
metadata:
name: i3dhub-spacesvc
spec:
{{- if .Values.numSpaceServicePods }}
replicas: {{ .Values.numSpaceServicePods }}
{{- end }}
selector:
matchLabels:
app: i3dhub-spacesvc
......@@ -63,9 +66,15 @@ spec:
value: i3dhub-elastic:9200
- name: I3DH_CONSUL_HOST
value: i3dhub-consul:8500
{{- if .Values.elasticStackFeatures.enabled }}
- name: ELK_ENABLED
{{- if .Values.tracing.withJaeger }}
- name: I3DH_JAEGER_ELK_ENABLED
value: "true"
{{- else if .Values.tracing.withDatadog }}
- name: I3DH_DATADOG_ENABLED
value: "true"
{{- end }}
{{- if .Values.tracing.additionalContainerEnv }}
{{ .Values.tracing.additionalContainerEnv | toYaml | indent 12 }}
{{- end }}
volumeMounts:
- name: local-i3dhub-log
......
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