Commit c677f459 authored by threedytech's avatar threedytech
Browse files

release: trk_debug_container-9972

parent 42ee2ef1
......@@ -32,6 +32,7 @@ service:
workers: {{ .Values.numTranscoderWorkersPerPod }}
# reschedule current jobs to run elsewhere on shutdown
reschedule-on-shutdown: true
with-proxy-server: true
rewrites:
# preserve the original request parameters before rewrites. this is necessary to be able to trigger
......@@ -231,7 +232,11 @@ service:
# all types except the fallback type
{{ $defaultL3dGen := dict "3dsmax" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "3mf" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "acis" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -}}
{{- $_ := set $defaultL3dGen "blender" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "catiav4" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -}}
{{- $_ := set $defaultL3dGen "catiav5" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -}}
{{- $_ := set $defaultL3dGen "catiav6" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -}}
{{- $_ := set $defaultL3dGen "collada-dae" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "creoview" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -}}
{{- $_ := set $defaultL3dGen "dgn" (list "Core/l3dGen" "Core/l3dGen|Loader/DGN") -}}
......@@ -241,9 +246,12 @@ service:
{{- $_ := set $defaultL3dGen "fhs" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "glb" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "gltf" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "ifc" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -}}
{{- $_ := set $defaultL3dGen "iges" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "inventor" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -}}
{{- $_ := set $defaultL3dGen "kbl" (list "Core/l3dGen" "Core/l3dGen|Loader/KBL") -}}
{{- $_ := set $defaultL3dGen "las" (list "Core/l3dGen" "Core/l3dGen|Loader/LAS") -}}
{{- $_ := set $defaultL3dGen "nx" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -}}
{{- $_ := set $defaultL3dGen "obj" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "off" (list "Core/l3dGen") -}}
{{- $_ := set $defaultL3dGen "openjt" (list "Core/l3dGen" "Core/l3dGen|Loader/OpenJT") -}}
......@@ -285,23 +293,8 @@ service:
I3DH_PG_L3D_STATS_CONNECTION_STRING: '[[ $u := urlParse (env "POSTGRES_CONNECTION_STRING") ]][[ $_ := set $u "path" "/instantStats" ]][[ urlJoin $u ]]'
cmds:
- >
curl [[ shell_escape .Params.resolvedUri ]]
-k
-H 'Accept: model/vnd.siemens.openjt; q=1.0, model/jt; q=1.0, */*; q=0.1'
[[- range $k, $vs := header_filter .Params.inputUri .Headers ]]
-H [[ printf "%v: %v" $k (first $vs) | shell_escape ]]
[[- end ]]
> out.jt
- >
{{- $cmdArgs := dict "transcoder" $.Values.transcoder "contentType" $type "isFallback" false "logLevel" $.Values.logLevel }}
{{ include "l3dGenCmdLine" $cmdArgs | indent 10 }}
- >
cat index.l3d | jq "del(.source.eTag)" > newindex.l3d
- >
mv newindex.l3d index.l3d
- >
rm
-f out.jt
{{ end }}
# the fallback case with unknown type
......@@ -329,23 +322,9 @@ service:
I3DH_PG_L3D_STATS_CONNECTION_STRING: '[[ $u := urlParse (env "POSTGRES_CONNECTION_STRING") ]][[ $_ := set $u "path" "/instantStats" ]][[ urlJoin $u ]]'
cmds:
- >
curl [[ shell_escape .Params.resolvedUri ]]
-k
-H 'Accept: model/vnd.siemens.openjt; q=1.0, model/jt; q=1.0, */*; q=0.1'
[[- range $k, $vs := header_filter .Params.inputUri .Headers ]]
-H [[ printf "%v: %v" $k (first $vs) | shell_escape ]]
[[- end ]]
> out.jt
- >
{{- $cmdArgs := dict "transcoder" $.Values.transcoder "isFallback" true "logLevel" $.Values.logLevel }}
{{ include "l3dGenCmdLine" $cmdArgs | indent 10 }}
- >
cat index.l3d | jq "del(.source.eTag)" > newindex.l3d
- >
mv newindex.l3d index.l3d
- >
rm
-f out.jt
- name: scnGen
params:
inputContentType: xscn
......@@ -415,7 +394,8 @@ service:
{{- end }}
{{ define "l3dGenCmdLine" }}
l3dGen -i out.jt
l3dGen -i [[ printf "http://%v/%v" proxy_server_addr .Params.resolvedUri | shell_escape ]]
-u [[ shell_escape .Params.resolvedUri ]]
-o .
[[ if .Params.inputContentTypeList -]]
[[- $parsedList := .Params.inputContentTypeList | fromJson -]]
......
......@@ -63,7 +63,7 @@ storage:
# Set the microservice log levels.
# Available levels, in order of severity:
# fatal panic error warning info debug trace
logLevel: trace
logLevel: warning
# Set this to true if elasticsearch kibana and jaeger are needed.
# If set to default(false) no elkstack and no jaeger pods will be started.
......@@ -324,7 +324,7 @@ numGeometricServicePods: 1
numGeometricWorkerPerPod: 24
# This is the version name and the tag for the instant3Dhub images
imageTag: 026ef31af9c26d4ebf660f19fbde301f
imageTag: 69f947aa5017333b0b371da7b0db52d8
# Override ping interval in seconds on websocket connections.
# Setting it to 0 will disable sending pings.
......
# instant3Dhub Open Source Software (OSS) Licenses
*Date: 27. April 2022*
*Date: 28. April 2022*
## 1. Open Source Software Licenses
### 1.1 Apache License, Version 2.0 [Apache-2.0]
### 1.1.1 License Text
......
#Wed Apr 27 04:42:32 UTC 2022
export VERSION_NAME=trk_debug_container-9931
export IMAGE_TAG=026ef31af9c26d4ebf660f19fbde301f
#Thu Apr 28 12:29:17 UTC 2022
export VERSION_NAME=trk_debug_container-9972
export IMAGE_TAG=69f947aa5017333b0b371da7b0db52d8
export CONSUMER_ARVIDAPIXI_HASH=fdd45e87458419ca610445db83dab293eade7c51
export CONSUMER_ARVIDAPIXI_REF=master
export CONSUMER_ARVIDAPIXI_TAG=5755d3a5377a7a3b8988218bae806165
export CONSUMER_ARVIDAPIXI_TAG=ad38d4a6434f12c0f7a97dd0da110259
export CONSUMER_SENLIN_HASH=590d63a0d5c61378ac22702bf2d8ea75dd246250
export CONSUMER_SENLIN_REF=master
export CONSUMER_SENLIN_TAG=5755d3a5377a7a3b8988218bae806165
export CONSUMER_SENLIN_TAG=ad38d4a6434f12c0f7a97dd0da110259
export CONSUMER_SENLINL3D_HASH=f035edc79a4315a40eb0b6ec66516fa84187f4e4
export CONSUMER_SENLINL3D_REF=master
export CONSUMER_SENLINL3D_TAG=5755d3a5377a7a3b8988218bae806165
export CONSUMER_SENLINL3D_TAG=ad38d4a6434f12c0f7a97dd0da110259
export CONSUMER_CIBUILD_HASH=24971741c78ea73c3bc8157fb1e813c5de6e8ce6
export CONSUMER_CIBUILD_REF=master
export CONSUMER_CIBUILD_TAG=5755d3a5377a7a3b8988218bae806165
export CONSUMER_CIBUILD_TAG=ad38d4a6434f12c0f7a97dd0da110259
export CONSUMER_AR_HASH=1d5943ce993b0dbe0ad8eb22026978905861dbe7
export CONSUMER_AR_REF=master
export CONSUMER_AR_TAG=5755d3a5377a7a3b8988218bae806165
export CONSUMER_AR_TAG=ad38d4a6434f12c0f7a97dd0da110259
export CONSUMER_GEOMETRIC_HASH=6fb26b719b075d5b2f95abffdb21f6cefea12978
export CONSUMER_GEOMETRIC_REF=master
export CONSUMER_GEOMETRIC_TAG=5755d3a5377a7a3b8988218bae806165
export CONSUMER_GEOMETRIC_TAG=ad38d4a6434f12c0f7a97dd0da110259
export CONSUMER_FLATBUFFER_HASH=f957c63d769234fefff5f7793708941d17a7f97f
export CONSUMER_FLATBUFFER_REF=master
export CONSUMER_FLATBUFFER_TAG=5755d3a5377a7a3b8988218bae806165
export CONSUMER_TAG=60cd6d5ab296bd2e48ad7649ac2b9ce7
export WEBVIS_HASH=43f90f8cc9f8dc562381f3b9311d0dfb10694dc1
export CONSUMER_FLATBUFFER_TAG=ad38d4a6434f12c0f7a97dd0da110259
export CONSUMER_TAG=307f47fa9dcd32e71f2baae06a570364
export WEBVIS_HASH=7a6230ee32ad5ab29d0f96a096271b8c7df7fa33
export WEBVIS_REF=master
export WEBVIS_TAG=b090f7144b0582580279181506483496
export GENERATORS_HASH=c8f46435cdfd5de1cfd8d053820a7553403c940c
export WEBVIS_TAG=8ee83788fd5546e6f9f08c5a853572aa
export GENERATORS_HASH=987b126cbe01fd8ad11f46759a1340cb0e6d4769
export GENERATORS_REF=trk_debug_container
export GENERATORS_TAG=e8f8428c35f1fd7368f097431a3cd02f
export MICROSERVICES_HASH=0d42bebb03b8ab2033b32dbf4cd4d78ac44e2599
export MICROSERVICES_REF=master
export MICROSERVICES_TAG=af0255524f5f4687c24ccb8b3d3b6cf4
export GENERATORS_TAG=eeb75e8338fe1098db5619ac21870aeb
export MICROSERVICES_HASH=7f0de1b0b205e1ef1acfe14aff5845e1b7f560c3
export MICROSERVICES_REF=trk_debug_container
export MICROSERVICES_TAG=9900de2e25341e47d0e72ee93baee623
export EXTERNALLIBRARIES_HASH=8f8dd23702e057f69f7ab1446bc723c9fa2a329d
export EXTERNALLIBRARIES_REF=trk_debug_container
export EXTERNALLIBRARIES_TAG=d3b1dbb8dc73ac486068aa2f0e5ec863
export INTERNALEXTLIBS_HASH=bf1e5768a27e94c877b811d2ce39fae66ea5a064
export INTERNALEXTLIBS_REF=master
export INTERNALEXTLIBS_TAG=cc9b7cdea013c5508502b16f19498600
export DEPLOY_HASH=3096d2023cd31e889ba44841a6fc768b54e1edcb
export DEPLOY_HASH=91cec6efaf81345dfa10903b8649aa0bc7ac050a
export DEPLOY_REF=trk_debug_container
export DEPLOY_TAG=026ef31af9c26d4ebf660f19fbde301f
export DEPLOY_TAG=69f947aa5017333b0b371da7b0db52d8
export CPACK_HASH=1759470e7e09de24581dc99b269723ff49c9def1
export CPACK_REF=trk_debug_container
export CPACK_TAG=9fc89977e656e103a2f5492c5dda52da
export CPACK_TAG=1970a107422e118c1b77f05e3946c169
export SESSIONHANDLER_HASH=4fe9275495805569a07ba181e51427fdaaf26f04
export SESSIONHANDLER_REF=master
export SESSIONHANDLER_TAG=9ec85bbb23da00ff31010f3a0e5a9304
......
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