Merge pull request #2037 from beyonnex-io/ditto-360

added Ditto 3.6.0 release notes
eclipse-ditto · Oct 4, 2024 · 31f31d1 · 31f31d1
2 parents 5ebe68d + 9443c91
commit 31f31d1
Show file tree

Hide file tree

Showing 23 changed files with 887 additions and 104 deletions.
diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.yml
@@ -131,9 +131,9 @@ jobs:
             eclipse/ditto-connectivity:${{ env.IMAGE_TAG }}
       -
         name: Use Node.js 18.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       -
         name: Install npm dependencies
         run: npm install

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -31,17 +31,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 18.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - name: Install npm dependencies
         run: npm install
         working-directory: ./ui
       - name: Build UI with node
         run: npm run build
         working-directory: ./ui
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./ui
diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
@@ -11,7 +11,7 @@
 name: Release and publish Helm chart
 
 env:
-  VERSION_HELM: "v3.12.1"
+  VERSION_HELM: "v3.13.3"
 on:
   workflow_dispatch:
     inputs:
@@ -30,7 +30,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4.2.0
         with:
           version: ${{ env.VERSION_HELM }}
 

diff --git a/.github/workflows/helm-chart.yml b/.github/workflows/helm-chart.yml
@@ -12,9 +12,9 @@ name: Lint and test Helm chart
 
 env:
   CONFIG_OPTION_CHART_TESTING: "--config .github/ct.yml"
-  VERSION_CHART_TESTING: "v3.8.0" # 3.9.0 has an issue with comparing against "master" branch
-  VERSION_HELM: "v3.12.1"
-  VERSION_PYTHON: "3.9"
+  VERSION_CHART_TESTING: "v3.11.0"
+  VERSION_HELM: "v3.13.3"
+  VERSION_PYTHON: "3.10"
 on:
   pull_request:
     paths:
@@ -32,10 +32,10 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4.2.0
         with:
           version: ${{ env.VERSION_HELM }}
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.VERSION_PYTHON }}
           check-latest: true
@@ -63,16 +63,16 @@ jobs:
         # which a folder exists at
         # https://github.com/yannh/kubernetes-json-schema/
         k8s:
-          - v1.26.6
-          - v1.27.3
-          - v1.28.0
+          - v1.28.13
+          - v1.29.8
+          - v1.30.4
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Fetch history for chart testing
         run: git fetch --prune --unshallow
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4.2.0
         with:
           version: ${{ env.VERSION_HELM }}
       - name: Run kubeval
@@ -92,19 +92,19 @@ jobs:
         # available for the docker.io/kindest/node image
         # https://hub.docker.com/r/kindest/node/tags
         k8s:
-          - v1.26.6
-          - v1.27.3
-          - v1.28.0
+          - v1.28.13
+          - v1.29.8
+          - v1.30.4
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Fetch history for chart testing
         run: git fetch --prune --unshallow
       - name: Set up Helm
-        uses: azure/setup-helm@v3.5
+        uses: azure/setup-helm@v4.2.0
         with:
           version: ${{ env.VERSION_HELM }}
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.VERSION_PYTHON }}
           check-latest: true

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 21

diff --git a/.github/workflows/push-dockerhub-on-demand.yml b/.github/workflows/push-dockerhub-on-demand.yml
@@ -172,9 +172,9 @@ jobs:
             eclipse/ditto-connectivity:latest
       -
         name: Use Node.js 18.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       -
         name: Install npm dependencies
         run: npm install

diff --git a/.github/workflows/push-dockerhub.yml b/.github/workflows/push-dockerhub.yml
@@ -157,9 +157,9 @@ jobs:
             eclipse/ditto-connectivity:latest
       -
         name: Use Node.js 18.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       -
         name: Install npm dependencies
         run: npm install

diff --git a/.github/workflows/ui-ci.yml b/.github/workflows/ui-ci.yml
@@ -28,9 +28,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 18.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - name: Install npm dependencies
         run: npm install
         working-directory: ./ui

diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml
@@ -240,7 +240,7 @@ services:
         max-size: 10m
 
   nginx:
-    image: docker.io/nginx:1.26-alpine
+    image: docker.io/nginx:1.27-alpine
     deploy:
       resources:
         limits:

diff --git a/deployment/docker/sandbox/docker-compose.yml b/deployment/docker/sandbox/docker-compose.yml
@@ -226,7 +226,7 @@ services:
 #       - ./nodered/flows-ditto.json:/data/flows-ditto.json:rw
 
   nginx:
-    image: docker.io/nginx:1.26-alpine
+    image: docker.io/nginx:1.27-alpine
     deploy:
       resources:
         limits:

diff --git 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.5.13  # chart version is effectively set by release-job
+version: 3.6.0  # chart version is effectively set by release-job
 appVersion: 3.5.12
 keywords:
   - iot-chart

diff --git a/deployment/helm/ditto/templates/connectivity-deployment.yaml b/deployment/helm/ditto/templates/connectivity-deployment.yaml
@@ -288,18 +288,19 @@ spec:
             {{- if .Values.connectivity.extraEnv }}
               {{- toYaml .Values.connectivity.extraEnv | nindent 12 }}
             {{- end }}
-            {{- if .Values.serviceAccount.useAwsIamRole }}
+            - name: MONGO_DB_USE_AWS_IAM_ROLE
+              value: "{{ printf "%t" .Values.dbconfig.connectivity.useAwsIamRole }}"
+            {{- if .Values.dbconfig.connectivity.useAwsIamRole }}
             - name: MONGO_DB_AWS_REGION
-              value: "{{ .Values.serviceAccount.awsRegion }}"
+              value: "{{ .Values.dbconfig.connectivity.awsRegion }}"
             - name: MONGO_DB_AWS_ROLE_ARN
-              value: "{{ .Values.serviceAccount.awsRoleArn }}"
+              value: "{{ .Values.dbconfig.connectivity.awsRoleArn }}"
             - name: AWS_WEB_IDENTITY_TOKEN_FILE
               value: "/var/run/secrets/eks.amazonaws.com/serviceaccount/token"
             - name: MONGO_DB_AWS_SESSION_NAME
-              value: "{{ .Values.serviceAccount.awsSessionName }}"
+              value: "{{ .Values.dbconfig.connectivity.awsSessionName }}"
             {{- end }}
-            - name: MONGO_DB_USE_AWS_IAM_ROLE
-              value: "{{ printf "%t" .Values.serviceAccount.useAwsIamRole }}"
+
           ports:
             - name: remoting
               containerPort: {{ .Values.pekko.remoting.port }}

diff --git a/deployment/helm/ditto/templates/policies-deployment.yaml b/deployment/helm/ditto/templates/policies-deployment.yaml
@@ -280,18 +280,19 @@ spec:
             {{- if .Values.policies.extraEnv }}
               {{- toYaml .Values.policies.extraEnv | nindent 12 }}
             {{- end }}
-            {{- if .Values.serviceAccount.useAwsIamRole }}
+            - name: MONGO_DB_USE_AWS_IAM_ROLE
+              value: "{{ printf "%t" .Values.dbconfig.policies.useAwsIamRole }}"
+            {{- if .Values.dbconfig.policies.useAwsIamRole }}
             - name: MONGO_DB_AWS_REGION
-              value: "{{ .Values.serviceAccount.awsRegion }}"
+              value: "{{ .Values.dbconfig.policies.awsRegion }}"
             - name: MONGO_DB_AWS_ROLE_ARN
-              value: "{{ .Values.serviceAccount.awsRoleArn }}"
+              value: "{{ .Values.dbconfig.policies.awsRoleArn }}"
             - name: AWS_WEB_IDENTITY_TOKEN_FILE
               value: "/var/run/secrets/eks.amazonaws.com/serviceaccount/token"
             - name: MONGO_DB_AWS_SESSION_NAME
-              value: "{{ .Values.serviceAccount.awsSessionName }}"
+              value: "{{ .Values.dbconfig.policies.awsSessionName }}"
             {{- end }}
-            - name: MONGO_DB_USE_AWS_IAM_ROLE
-              value: "{{ printf "%t" .Values.serviceAccount.useAwsIamRole }}"
+
           ports:
             - name: http
               containerPort: 8080

diff --git a/deployment/helm/ditto/templates/serviceaccount.yaml b/deployment/helm/ditto/templates/serviceaccount.yaml
@@ -17,8 +17,8 @@ metadata:
   labels:
     app.kubernetes.io/name: {{ include "ditto.name" . }}
   annotations:
-    {{- if .Values.serviceAccount.useAwsIamRole }}
-    eks.amazonaws.com/role-arn: {{ .Values.serviceAccount.awsRoleArn }}
+    {{- if .Values.serviceAccount.assumeAwsIamRole }}
+    eks.amazonaws.com/role-arn: {{ .Values.serviceAccount.assumedAwsRoleArn }}
     {{- end }}
 {{ include "ditto.labels" . | indent 4 }}
 {{- end -}}
diff --git a/deployment/helm/ditto/templates/things-deployment.yaml b/deployment/helm/ditto/templates/things-deployment.yaml
@@ -357,18 +357,18 @@ spec:
             {{- if .Values.things.extraEnv }}
               {{- toYaml .Values.things.extraEnv | nindent 12 }}
             {{- end }}
-            {{- if .Values.serviceAccount.useAwsIamRole }}
+            - name: MONGO_DB_USE_AWS_IAM_ROLE
+              value: "{{ printf "%t" .Values.dbconfig.things.useAwsIamRole }}"
+            {{- if .Values.dbconfig.things.useAwsIamRole }}
             - name: MONGO_DB_AWS_REGION
-              value: "{{ .Values.serviceAccount.awsRegion }}"
+              value: "{{ .Values.dbconfig.things.awsRegion }}"
             - name: MONGO_DB_AWS_ROLE_ARN
-              value: "{{ .Values.serviceAccount.awsRoleArn }}"
+              value: "{{ .Values.dbconfig.things.awsRoleArn }}"
             - name: AWS_WEB_IDENTITY_TOKEN_FILE
               value: "/var/run/secrets/eks.amazonaws.com/serviceaccount/token"
             - name: MONGO_DB_AWS_SESSION_NAME
-              value: "{{ .Values.serviceAccount.awsSessionName }}"
+              value: "{{ .Values.dbconfig.things.awsSessionName }}"
             {{- end }}
-            - name: MONGO_DB_USE_AWS_IAM_ROLE
-              value: "{{ printf "%t" .Values.serviceAccount.useAwsIamRole }}"
           ports:
             - name: remoting
               containerPort: {{ .Values.pekko.remoting.port }}

diff --git a/deployment/helm/ditto/templates/thingssearch-deployment.yaml b/deployment/helm/ditto/templates/thingssearch-deployment.yaml
@@ -257,18 +257,18 @@ spec:
             {{- if .Values.thingsSearch.extraEnv }}
               {{- toYaml .Values.thingsSearch.extraEnv | nindent 12 }}
             {{- end }}
-            {{- if .Values.serviceAccount.useAwsIamRole }}
+            - name: MONGO_DB_USE_AWS_IAM_ROLE
+              value: "{{ printf "%t" .Values.dbconfig.thingsSearch.useAwsIamRole }}"
+            {{- if .Values.dbconfig.thingsSearch.useAwsIamRole }}
             - name: MONGO_DB_AWS_REGION
-              value: "{{ .Values.serviceAccount.awsRegion }}"
+              value: "{{ .Values.dbconfig.thingsSearch.awsRegion }}"
             - name: MONGO_DB_AWS_ROLE_ARN
-              value: "{{ .Values.serviceAccount.awsRoleArn }}"
+              value: "{{ .Values.dbconfig.thingsSearch.awsRoleArn }}"
             - name: AWS_WEB_IDENTITY_TOKEN_FILE
               value: "/var/run/secrets/eks.amazonaws.com/serviceaccount/token"
             - name: MONGO_DB_AWS_SESSION_NAME
-              value: "{{ .Values.serviceAccount.awsSessionName }}"
+              value: "{{ .Values.dbconfig.thingsSearch.awsSessionName }}"
             {{- end }}
-            - name: MONGO_DB_USE_AWS_IAM_ROLE
-              value: "{{ printf "%t" .Values.serviceAccount.useAwsIamRole }}"
           ports:
             - name: remoting
               containerPort: {{ .Values.pekko.remoting.port }}