From 01f82e5bb5e1ec85dbf7f273b62bd371445a4134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20J=C3=A4ckle?= Date: Fri, 6 Oct 2023 13:52:55 +0200 Subject: [PATCH] renaming akkaClusterMaxFramesize in Helm config after migration to Pekko MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Jäckle --- deployment/helm/ditto/Chart.yaml | 2 +- .../helm/ditto/templates/connectivity-deployment.yaml | 4 +++- deployment/helm/ditto/templates/dittoui-deployment.yaml | 2 +- deployment/helm/ditto/templates/gateway-deployment.yaml | 2 +- deployment/helm/ditto/templates/nginx-config.yaml | 2 +- deployment/helm/ditto/templates/nginx-deployment.yaml | 2 +- deployment/helm/ditto/templates/policies-deployment.yaml | 2 +- deployment/helm/ditto/templates/swaggerui-deployment.yaml | 6 +++--- deployment/helm/ditto/templates/things-deployment.yaml | 2 +- .../helm/ditto/templates/thingssearch-deployment.yaml | 2 +- deployment/helm/ditto/values.yaml | 4 ++-- 11 files changed, 16 insertions(+), 14 deletions(-) diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml index 2d704b2de1..a4e43864b5 100644 --- a/deployment/helm/ditto/Chart.yaml +++ b/deployment/helm/ditto/Chart.yaml @@ -16,7 +16,7 @@ description: | A digital twin is a virtual, cloud based, representation of his real world counterpart (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc). type: application -version: 3.3.9 # chart version is effectively set by release-job +version: 3.3.10 # chart version is effectively set by release-job appVersion: nightly keywords: - iot-chart diff --git a/deployment/helm/ditto/templates/connectivity-deployment.yaml b/deployment/helm/ditto/templates/connectivity-deployment.yaml index ea37af97e0..fb6749f299 100644 --- a/deployment/helm/ditto/templates/connectivity-deployment.yaml +++ b/deployment/helm/ditto/templates/connectivity-deployment.yaml @@ -164,7 +164,7 @@ spec: value: "{{ .Values.global.prometheus.port }}" {{- end }} - name: REMOTE_MAX_FRAMESIZE - value: "{{ .Values.global.limits.akkaClusterMaxFramesize }}" + value: "{{ .Values.global.limits.clusterMaxFramesize }}" - name: LIMITS_THINGS_MAX_SIZE value: "{{ .Values.global.limits.thingsMaxSize }}" - name: LIMITS_POLICIES_MAX_SIZE @@ -211,6 +211,8 @@ spec: value: "{{ .Values.connectivity.config.cleanup.timerThreshold }}" - name: CLEANUP_CREDITS_PER_BATCH value: "{{ .Values.connectivity.config.cleanup.creditsPerBatch }}" + - name: CLEANUP_DELETE_FINAL_DELETED_SNAPSHOT + value: "{{ .Values.connectivity.config.cleanup.deleteFinalDeletedSnapshot }}" - name: CONNECTION_SNAPSHOT_INTERVAL value: "{{ .Values.connectivity.config.persistence.snapshots.interval }}" - name: CONNECTION_SNAPSHOT_THRESHOLD diff --git a/deployment/helm/ditto/templates/dittoui-deployment.yaml b/deployment/helm/ditto/templates/dittoui-deployment.yaml index 6d3781617a..501b3b1cce 100644 --- a/deployment/helm/ditto/templates/dittoui-deployment.yaml +++ b/deployment/helm/ditto/templates/dittoui-deployment.yaml @@ -68,7 +68,7 @@ spec: cpu: {{ mulf .Values.dittoui.resources.cpu 1000 }}m memory: {{ .Values.dittoui.resources.memoryMi }}Mi limits: - # cpu: "" + # cpu: # don't limit memory: {{ .Values.dittoui.resources.memoryMi }}Mi volumeMounts: - name: dittoui-nginx-conf diff --git a/deployment/helm/ditto/templates/gateway-deployment.yaml b/deployment/helm/ditto/templates/gateway-deployment.yaml index d1f6fb13f1..79b971b65e 100644 --- a/deployment/helm/ditto/templates/gateway-deployment.yaml +++ b/deployment/helm/ditto/templates/gateway-deployment.yaml @@ -161,7 +161,7 @@ spec: value: "{{ .Values.global.prometheus.port }}" {{- end }} - name: REMOTE_MAX_FRAMESIZE - value: "{{ .Values.global.limits.akkaClusterMaxFramesize }}" + value: "{{ .Values.global.limits.clusterMaxFramesize }}" - name: LIMITS_THINGS_MAX_SIZE value: "{{ .Values.global.limits.thingsMaxSize }}" - name: LIMITS_POLICIES_MAX_SIZE diff --git a/deployment/helm/ditto/templates/nginx-config.yaml b/deployment/helm/ditto/templates/nginx-config.yaml index 0d6e51a47f..fea8f843d8 100644 --- a/deployment/helm/ditto/templates/nginx-config.yaml +++ b/deployment/helm/ditto/templates/nginx-config.yaml @@ -24,7 +24,7 @@ metadata: {{ $labels | indent 4 }} data: {{ $path | replace "nginx-config/" ""}}: |- -{{ $root.Files.Get $path | indent 4 }} +{{ tpl ($root.Files.Get $path) $ | indent 4 }} --- {{- end -}} {{- end -}} diff --git a/deployment/helm/ditto/templates/nginx-deployment.yaml b/deployment/helm/ditto/templates/nginx-deployment.yaml index db106a74b6..6d4858ffd1 100644 --- a/deployment/helm/ditto/templates/nginx-deployment.yaml +++ b/deployment/helm/ditto/templates/nginx-deployment.yaml @@ -93,7 +93,7 @@ spec: cpu: {{ mulf .Values.nginx.resources.cpu 1000 }}m memory: {{ .Values.nginx.resources.memoryMi }}Mi limits: - # cpu: "" + # cpu: # don't limit memory: {{ .Values.nginx.resources.memoryMi }}Mi volumeMounts: - name: nginx-conf diff --git a/deployment/helm/ditto/templates/policies-deployment.yaml b/deployment/helm/ditto/templates/policies-deployment.yaml index 6724257026..664ef31586 100644 --- a/deployment/helm/ditto/templates/policies-deployment.yaml +++ b/deployment/helm/ditto/templates/policies-deployment.yaml @@ -182,7 +182,7 @@ spec: - name: CLUSTER_DOWNING_DOWN_ALL_WHEN_UNSTABLE value: "{{ .Values.global.cluster.downAllWhenUnstable }}" - name: REMOTE_MAX_FRAMESIZE - value: "{{ .Values.global.limits.akkaClusterMaxFramesize }}" + value: "{{ .Values.global.limits.clusterMaxFramesize }}" - name: LIMITS_THINGS_MAX_SIZE value: "{{ .Values.global.limits.thingsMaxSize }}" - name: LIMITS_POLICIES_MAX_SIZE diff --git a/deployment/helm/ditto/templates/swaggerui-deployment.yaml b/deployment/helm/ditto/templates/swaggerui-deployment.yaml index 0e553d52ca..5edf1014ca 100644 --- a/deployment/helm/ditto/templates/swaggerui-deployment.yaml +++ b/deployment/helm/ditto/templates/swaggerui-deployment.yaml @@ -54,7 +54,7 @@ spec: - | mkdir -p /usr/share/nginx/html/openapi curl -sL https://raw.githubusercontent.com/eclipse/ditto/{{ .Chart.AppVersion }}/documentation/src/main/resources/openapi/ditto-api-2.yml -o /usr/share/nginx/html/openapi/ditto-api-2.yml - sed --in-place "\=- url: 'https://ditto.eclipseprojects.io/api/2'=d" /usr/share/nginx/html/openapi/ditto-api-2.yml + sed --in-place "\=- url: 'https://ditto.eclipseprojects.io/'=d" /usr/share/nginx/html/openapi/ditto-api-2.yml sed --in-place "/description: online Ditto Sandbox/d" /usr/share/nginx/html/openapi/ditto-api-2.yml echo "removing Google auth from ditto-api-2.yml" sed --in-place "/- Google:/,+1d" /usr/share/nginx/html/openapi/ditto-api-2.yml @@ -73,7 +73,7 @@ spec: sed --in-place "/- DevOpsBearer: \[]/d" /usr/share/nginx/html/openapi/ditto-api-2.yml sed --in-place "/ DevOpsBearer:/,+4d" /usr/share/nginx/html/openapi/ditto-api-2.yml {{- end }} - sed --in-place "s=- url: /api/2=- url: {{ .Values.global.proxyPart }}/api/2=g" /usr/share/nginx/html/openapi/ditto-api-2.yml + sed --in-place "s=- url: /=- url: {{ .Values.global.proxyPart }}/=g" /usr/share/nginx/html/openapi/ditto-api-2.yml cp -rv /usr/share/nginx/html/openapi/. /init-config/ volumeMounts: - name: swagger-ui-init-config @@ -104,7 +104,7 @@ spec: cpu: {{ mulf .Values.swaggerui.resources.cpu 1000 }}m memory: {{ .Values.swaggerui.resources.memoryMi }}Mi limits: - # cpu: "" + # cpu: # don't limit memory: {{ .Values.swaggerui.resources.memoryMi }}Mi volumeMounts: - name: swagger-ui-init-config diff --git a/deployment/helm/ditto/templates/things-deployment.yaml b/deployment/helm/ditto/templates/things-deployment.yaml index 2c782ccaba..4834c94c22 100644 --- a/deployment/helm/ditto/templates/things-deployment.yaml +++ b/deployment/helm/ditto/templates/things-deployment.yaml @@ -183,7 +183,7 @@ spec: - name: CLUSTER_DOWNING_DOWN_ALL_WHEN_UNSTABLE value: "{{ .Values.global.cluster.downAllWhenUnstable }}" - name: REMOTE_MAX_FRAMESIZE - value: "{{ .Values.global.limits.akkaClusterMaxFramesize }}" + value: "{{ .Values.global.limits.clusterMaxFramesize }}" - name: LIMITS_THINGS_MAX_SIZE value: "{{ .Values.global.limits.thingsMaxSize }}" - name: LIMITS_POLICIES_MAX_SIZE diff --git a/deployment/helm/ditto/templates/thingssearch-deployment.yaml b/deployment/helm/ditto/templates/thingssearch-deployment.yaml index a3be6ed48f..6fa9ba2862 100644 --- a/deployment/helm/ditto/templates/thingssearch-deployment.yaml +++ b/deployment/helm/ditto/templates/thingssearch-deployment.yaml @@ -161,7 +161,7 @@ spec: - name: CLUSTER_DOWNING_DOWN_ALL_WHEN_UNSTABLE value: "{{ .Values.global.cluster.downAllWhenUnstable }}" - name: REMOTE_MAX_FRAMESIZE - value: "{{ .Values.global.limits.akkaClusterMaxFramesize }}" + value: "{{ .Values.global.limits.clusterMaxFramesize }}" - name: LIMITS_THINGS_MAX_SIZE value: "{{ .Values.global.limits.thingsMaxSize }}" - name: LIMITS_POLICIES_MAX_SIZE diff --git a/deployment/helm/ditto/values.yaml b/deployment/helm/ditto/values.yaml index ea45b463ed..b988e9dfd2 100644 --- a/deployment/helm/ditto/values.yaml +++ b/deployment/helm/ditto/values.yaml @@ -54,8 +54,8 @@ global: downAllWhenUnstable: "on" # limits contains information about limit configuration, e.g. towards max. entity and payload sizes limits: - # akkaClusterMaxFramesize the maximum serialized message size in the cluster, including header data, default: 256 KiB - akkaClusterMaxFramesize: 256k + # clusterMaxFramesize the maximum serialized message size in the cluster, including header data, default: 256 KiB + clusterMaxFramesize: 256k # thingsMaxSize the maximum possible size of "Thing" entities, default: 100k thingsMaxSize: 100k # policiesMaxSize the maximum possible size of "Policy" entities, default: 100k