Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

renaming akkaClusterMaxFramesize in Helm config after migration to Pekko #1766

Merged
merged 2 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deployment/helm/ditto/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ 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
appVersion: nightly
version: 3.4.0 # chart version is effectively set by release-job
appVersion: 3.4.0-M1
keywords:
- iot-chart
- digital-twin
Expand Down
4 changes: 3 additions & 1 deletion deployment/helm/ditto/templates/connectivity-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/ditto/templates/dittoui-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/ditto/templates/gateway-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/ditto/templates/nginx-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
2 changes: 1 addition & 1 deletion deployment/helm/ditto/templates/nginx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/ditto/templates/policies-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions deployment/helm/ditto/templates/swaggerui-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/ditto/templates/things-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 9 additions & 3 deletions deployment/helm/ditto/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1238,7 +1238,13 @@ connectivity:
timerThreshold: 100ms
# creditsPerBatch configures how many "cleanup credits" should be generated per "interval" as long as the
creditsPerBatch: 5
# persistence holds configuration regarding (pekko) persistence of connections (event journal and snapshots)
# deleteFinalDeletedSnapshot configures whether for a deleted entity, the final snapshot (containing the
# "deleted" information) should be deleted or not.
# If the final snapshot is not deleted, re-creating the entity will cause that the recreated entity starts with
# a revision number 1 higher than the previously deleted entity. If the final snapshot is deleted as well,
# recreation of an entity with the same ID will lead to revisionNumber=1 after its recreation.
deleteFinalDeletedSnapshot: true
# persistence holds configuration regarding (akka) persistence of connections (event journal and snapshots)
persistence:
# keep closed, inactive connections for that amount of time in memory when no other use did happen:
activityCheckInterval: 45m
Expand Down
Loading