Release version 0.3.3

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+## WHAT
+
+_Briefly describe what your PR changes, which features it adds/modifies._
+
+## WHY
+
+_Briefly state why the change was necessary._
+
+## FURTHER NOTES
+
+_List other areas of code that have changed but are not necessarily linked to the main feature. This could be method signature changes, package declarations, bugs that were encountered and were fixed inline, etc._
+
+Closes # <-- _insert Issue number if one exists_

.github/actions/publish-docker-image/action.yml

@@ -0,0 +1,109 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  This program and the accompanying materials are made available under the
+#  terms of the Apache License, Version 2.0 which is available at
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Publish Docker Image"
+description: "Build and publish a Docker Image to DockerHub"
+inputs:
+  rootDir:
+    required: true
+    description: "The directory where the notice.md file and the src/main/docker directory are located"
+  namespace:
+    required: false
+    default: "tractusx"
+    description: "The Docker image namespace"
+  imagename:
+    required: true
+    description: "the name of the image"
+  docker_user:
+    required: false
+    description: "DockerHub user name. No push is done if omitted"
+  docker_token:
+    required: false
+    description: "DockerHub Token. No push is done if omitted"
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/[email protected]
+
+    #####################
+    # Login to DockerHub
+    #####################
+    - name: DockerHub login
+      uses: docker/login-action@v2
+      with:
+        username: ${{ inputs.docker_user }}
+        password: ${{ inputs.docker_token }}
+
+    #####################
+    # Build JAR file
+    #####################
+    - uses: ./.github/actions/setup-java
+    - name: Build Controlplane
+      shell: bash
+      run: |-
+        ./gradlew -p ${{ inputs.rootDir }} shadowJar
+
+    ###############################
+    # Set metadata of docker image
+    ###############################
+    # Create SemVer or ref tags dependent of trigger event
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+        images: |
+          ${{ inputs.namespace }}/${{ inputs.imagename }}
+        tags: |
+          type=ref,event=branch
+          type=ref,event=pr
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{raw}}
+          type=match,pattern=\d.\d.\d
+          type=raw,value=latest,enable={{is_default_branch}}
+          type=sha
+
+    ###############################
+    # Build and push the image
+    ###############################
+    - name: Build and push
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        file: ${{ inputs.rootDir }}/src/main/docker/Dockerfile
+        build-args: |
+          JAR=${{ inputs.rootDir }}/build/libs/${{ inputs.imagename }}.jar
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+
+    ###############################
+    # Update the description
+    # https://github.com/peter-evans/dockerhub-description
+    ###############################
+    - name: Update Docker Hub description
+      uses: peter-evans/dockerhub-description@v3
+      with:
+        readme-filepath: ${{ inputs.rootDir }}/notice.md
+        username: ${{ inputs.docker_user }}
+        password: ${{ inputs.docker_token }}
+        repository: ${{ inputs.namespace }}/${{ inputs.imagename }}

.github/actions/run-deployment-test/action.yml

@@ -0,0 +1,97 @@
+#
+#  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
+#
+#  See the NOTICE file(s) distributed with this work for additional
+#  information regarding copyright ownership.
+#
+#  This program and the accompanying materials are made available under the
+#  terms of the Apache License, Version 2.0 which is available at
+#  https://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+#
+#  SPDX-License-Identifier: Apache-2.0
+#
+
+---
+name: "Run Deployment Test"
+description: "Build and publish a Docker Image to DockerHub"
+inputs:
+  imagename:
+    required: true
+    description: "name of the docker image, e.g. edc-runtime-memory"
+
+  image_tag:
+    required: false
+    default: "latest"
+    description: "docker image tag, defaults to 'latest'"
+
+  helm_command:
+    required: true
+    description: "command which is executed to install the chart. must also include verification commands, such as 'helm test'"
+
+  rootDir:
+    required: true
+    description: "The directory that contains the docker file, e.g. edc-controlplane/edc-runtime-memory"
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/[email protected]
+
+    - name: Cache ContainerD Image Layers
+      uses: actions/cache@v3
+      with:
+        path: /var/lib/containerd/io.containerd.snapshotter.v1.overlayfs
+        key: ${{ runner.os }}-io.containerd.snapshotter.v1.overlayfs
+
+    - uses: ./.github/actions/setup-java
+
+    - name: Build docker images
+      shell: bash
+      run: |-
+        ./gradlew -p ${{ inputs.rootDir }} dockerize
+
+    - name: Setup Helm
+      uses: azure/[email protected]
+      with:
+        version: v3.8.1
+
+    - name: Setup Kubectl
+      uses: azure/[email protected]
+
+    - name: Create k8s Kind Cluster
+      uses: helm/[email protected]
+
+    - name: Load images into KinD
+      shell: bash
+      run: |
+        kind get clusters | xargs -n1 kind load docker-image ${{ inputs.imagename }}:${{ inputs.image_tag }} --name
+
+    ###################################################
+    # Install the test infrastructure
+    ###################################################
+    - name: Install Infrastructure
+      shell: bash
+      run: |-
+        helm install infra edc-tests/deployment/src/main/resources/helm/test-infrastructure \
+        --wait-for-jobs --timeout=30s --dependency-update
+
+    - name: Install Runtime
+      shell: bash
+      run: ${{ inputs.helm_command }}
+
+
+    #################
+    ### Tear Down ###
+    #################
+    - name: Destroy the kind cluster
+      if: always()
+      shell: bash
+      run: >-
+        kind get clusters | xargs -n1 kind delete cluster --name

charts/edc-dataplane/templates/configmap-env.yaml → .github/actions/setup-java/action.yml

@@ -1,8 +1,6 @@
 #
-#  Copyright (c) 2023 ZF Friedrichshafen AG
-#  Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH
 #  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#  Copyright (c) 2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.
@@ -21,12 +19,14 @@
 #
 
 ---
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "edc-dataplane.fullname" . }}-env
-  namespace: {{ .Release.Namespace | default "default" | quote }}
-  labels:
-    {{- include "edc-dataplane.labels" . | nindent 4 }}
-data:
-  {{- toYaml .Values.env | nindent 2 }}
+name: "Setup JDK 17"
+description: "Setup JDK 17"
+runs:
+  using: "composite"
+  steps:
+    - name: Setup JDK 17
+      uses: actions/[email protected]
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: 'gradle'

.github/dependabot.yml

@@ -3,8 +3,8 @@ version: 2
 updates:
   # Maven
   -
-    package-ecosystem: "maven"
-    target-branch: develop
+    package-ecosystem: "gradle"
+    target-branch: main
     directory: /
     labels:
       - "dependabot"
@@ -15,7 +15,7 @@ updates:
   # Github Actions
   -
     package-ecosystem: "github-actions"
-    target-branch: develop
+    target-branch: main
     directory: /
     labels:
       - "dependabot"
@@ -26,7 +26,7 @@ updates:
   # Docker
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/src/main/docker/
     labels:
       - "dependabot"
@@ -35,7 +35,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-postgresql/src/main/docker/
     labels:
       - "dependabot"
@@ -44,7 +44,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-controlplane/edc-controlplane-memory/src/main/docker/
     labels:
       - "dependabot"
@@ -53,7 +53,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/
     labels:
       - "dependabot"
@@ -62,7 +62,7 @@ updates:
       interval: "daily"
   -
     package-ecosystem: "docker"
-    target-branch: develop
+    target-branch: main
     directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/
     labels:
       - "dependabot"