Release version 0.1.2 (#441)

catenax-ng · Sep 30, 2022 · aedbf25 · aedbf25
1 parent deadedc
commit aedbf25
Show file tree

Hide file tree

Showing 121 changed files with 1,080 additions and 404 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -13,7 +13,7 @@ on:
       - released
   pull_request:
     paths-ignore:
-      - 'deployment/helm/**'
+      - 'charts/**'
     branches:
       - '*'
 
@@ -46,7 +46,7 @@ jobs:
           fetch-depth: 0
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.1
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -69,7 +69,7 @@ jobs:
           fetch-depth: 0
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.3.0
+        uses: actions/setup-java@v3.5.1
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -79,7 +79,7 @@ jobs:
         run: git submodule update --init
       -
         name: Build edc with Gradle to get specific snapshot
-        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220902-SNAPSHOT
+        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
         working-directory: edc
       -
         name: Cache SonarCloud packages
@@ -103,6 +103,37 @@ jobs:
             -Dsonar.coverage.jacoco.xmlReportPaths=${GITHUB_WORKSPACE}/edc-tests/target/site/jacoco-aggregate/jacoco.xml \
             -Dsonar.verbose=true
 
+  build-extensions:
+    runs-on: ubuntu-latest
+    needs: [ secret-presence, verify-formatting ]
+    steps:
+      # Set-Up
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up JDK 11
+        uses: actions/[email protected]
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          cache: 'maven'
+      # Build
+      -
+        name: Init git submodule
+        run: git submodule update --init
+      -
+        name: Build edc with Gradle to get specific snapshot
+        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
+        working-directory: edc
+      -
+        name: Build Extensions
+        run: |-
+          ./mvnw -s settings.xml -B -f edc-extensions -am package
+        env:
+          GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
+          GITHUB_PACKAGE_PASSWORD: ${{ secrets.CXNG_GHCR_PAT }}
+
   build-controlplane:
     runs-on: ubuntu-latest
     needs: [ secret-presence, verify-formatting ]
@@ -129,7 +160,7 @@ jobs:
           password: ${{ secrets.CXNG_GHCR_PAT }}
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.4.0
+        uses: actions/setup-java@v3.5.1
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -140,7 +171,7 @@ jobs:
         run: git submodule update --init
       -
         name: Build edc with Gradle to get specific snapshot
-        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220902-SNAPSHOT
+        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
         working-directory: edc
       -
         name: Build Controlplane
@@ -218,7 +249,7 @@ jobs:
           password: ${{ secrets.CXNG_GHCR_PAT }}
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.1
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -229,7 +260,7 @@ jobs:
         run: git submodule update --init
       -
         name: Build edc with Gradle to get specific snapshot
-        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220902-SNAPSHOT
+        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
         working-directory: edc
       -
         name: Build Dataplane

diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Set-Up JDK 11
-        uses: actions/setup-java@v3.4.0
+        uses: actions/setup-java@v3.5.1
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -62,7 +62,7 @@ jobs:
           EOF
       -
         name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.3.0
+        uses: helm/kind-action@v1.4.0
         with:
           config: kind.config.yaml
 
@@ -74,7 +74,7 @@ jobs:
         run: git submodule update --init
       -
         name: Build edc with Gradle to get specific snapshot
-        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220902-SNAPSHOT
+        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
         working-directory: edc
       -
         name: Build edc-controlplane-postgresql-hashicorp-vault

diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
@@ -29,7 +29,7 @@ jobs:
           git config user.email [email protected]
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.1
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -42,24 +42,24 @@ jobs:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.CXNG_GHCR_PAT }}
       -
-        name: Bump version in deployment/helm
-        uses: mikefarah/[email protected].3
+        name: Bump version in /charts
+        uses: mikefarah/[email protected].5
         with:
           cmd: |-
-            find deployment/helm -name Chart.yaml | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'
+            find charts -name Chart.yaml | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'
       -
         name: Update Chart READMEs
         uses: addnab/docker-run-action@v3
         with:
           image: jnorwood/helm-docs:v1.10.0
-          options: -v ${{ github.workspace }}/deployment/helm:/helm-docs
+          options: -v ${{ github.workspace }}/charts:/helm-docs
           run: |
             helm-docs --log-level debug
       -
         name: Commit changelog and manifest files
         id: make-commit
         run: |
-          git add CHANGELOG.md $(find -name pom.xml) $(find deployment/helm -name Chart.yaml) $(find deployment/helm -name README.md)
+          git add CHANGELOG.md $(find -name pom.xml) $(find charts -name Chart.yaml) $(find charts -name README.md)
           git commit --message "Prepare release ${{ github.event.inputs.version }}"
 
           echo "::set-output name=commit::$(git rev-parse HEAD)"

diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
@@ -10,13 +10,13 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+'
     paths-ignore:
       - '**'
-      - '!deployment/helm/**'
+      - '!charts/**'
   pull_request:
     branches:
       - '*'
     paths-ignore:
       - '**'
-      - '!deployment/helm/**'
+      - '!charts/**'
 
 jobs:
   helm-lint:
@@ -42,7 +42,7 @@ jobs:
         python-version: 3.7
     -
       name: chart-testing (setup)
-      uses: helm/[email protected].0
+      uses: helm/[email protected].1
     #####################
     ### Chart Testing ###
     #####################

diff --git a/.github/workflows/kics.yaml → .github/workflows/kics.yml b/.github/workflows/kics.yaml → .github/workflows/kics.yml
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -15,13 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       CXNG_GHCR_PAT: ${{ steps.secret-presence.outputs.CXNG_GHCR_PAT }}
-      CXNG_RELEASE_PAT: ${{ steps.secret-presence.outputs.CXNG_RELEASE_PAT }}
     steps:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
           [ ! -z "${{ secrets.CXNG_GHCR_PAT }}" ] && echo "::set-output name=CXNG_GHCR_PAT::true"
-          [ ! -z "${{ secrets.CXNG_RELEASE_PAT }}" ] && echo "::set-output name=CXNG_RELEASE_PAT::true"
 
           exit 0
   # Gate: Check release version presence
@@ -69,7 +67,7 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.1
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -79,13 +77,13 @@ jobs:
         run: git submodule update --init
       -
         name: Build edc with Gradle to get specific snapshot
-        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220902-SNAPSHOT
+        run: ./gradlew publishToMavenLocal -Pskip.signing=true -PedcVersion=0.0.1-20220922-SNAPSHOT -xjavadoc
         working-directory: edc
       -
         name: Deploy
         run: |-
           ./mvnw -s settings.xml \
-            -Pdelombok -pl '!edc-controlplane/edc-controlplane-memory,!edc-controlplane/edc-controlplane-postgresql,!edc-controlplane/edc-controlplane-postgresql-hashicorp-vault,!edc-dataplane/edc-dataplane-azure-vault,!edc-dataplane/edc-dataplane-hashicorp-vault,!edc-tests' \
+            -Pdelombok -pl '!edc-tests' \
             -DaltReleaseDeploymentRepository=github::https://maven.pkg.github.com/${{ github.repository }} \
             -Dmaven.test.skip=true -B package deploy:deploy
         env:
@@ -121,7 +119,7 @@ jobs:
           git config user.email [email protected]
 
           # Package all charts
-          find deployment/helm -name Chart.yaml -not -path "./edc-tests/*" | xargs -n1 dirname | xargs -n1 helm package -u -d helm-charts
+          find charts -name Chart.yaml -not -path "./edc-tests/*" | xargs -n1 dirname | xargs -n1 helm package -u -d helm-charts
 
           git checkout gh-pages || git checkout -b gh-pages
           git pull --rebase origin gh-pages
@@ -140,7 +138,7 @@ jobs:
     name: Publish new github release
     needs: [ secret-presence, release-version ]
     runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == true && needs.secret-presence.outputs.CXNG_RELEASE_PAT && needs.release-version.outputs.RELEASE_VERSION
+    if: github.event.pull_request.merged == true && needs.release-version.outputs.RELEASE_VERSION
     steps:
       -
         name: Export RELEASE_VERSION env
@@ -172,7 +170,7 @@ jobs:
         id: create_release
         uses: thomaseizinger/[email protected]
         env:
-          GITHUB_TOKEN: ${{ secrets.CXNG_RELEASE_PAT }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           target_commitish: ${{ github.event.pull_request.merge_commit_sha }}
           tag_name: ${{ env.RELEASE_VERSION }}
@@ -181,7 +179,7 @@ jobs:
           prerelease: false
       -
         name: Set up JDK 11
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.1
         with:
           java-version: '11'
           distribution: 'adopt'

diff --git a/.github/workflows/trivy.yaml → .github/workflows/trivy.yml b/.github/workflows/trivy.yaml → .github/workflows/trivy.yml
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
@@ -0,0 +1,2 @@
+# file to satisfy check in https://gh-org-checks.core.demo.catena-x.net/
+# veracode runs inside the build.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,22 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.2] - 2022-09-30
+
+### Added
+
+-   Introduced DEPENDENCIES file
+
+### Changed
+
+-   Moved helm charts from `deployment/helm` to `charts`
+-   Replaced distroless image with alpine in all docker images
+-   Update EDC commit to `740c100ac162bc41b1968c232ad81f7d739aefa9`
+
 ## [0.1.1] - 2022-09-04
 
-**Important Note**: Please consolidate the migration documentation before updating your connector. [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
+**Important Note**: Please consolidate the migration documentation before updating your connector. [documentation](/docs/migration/Version_0.1.0_0.1.1.md).
 
 ### Added
 
--  Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
+-   Control-Plane Extension ([cx-oauth2](/edc-extensions/cx-oauth2/README.md))
 
 ### Changed
 
-- Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
-- Helm Charts: TLS secret name is now configurable
+-   Introduced git submodule to import EDC dependencies (instead of snapshot- or milestone artifact)
+-   Helm Charts: TLS secret name is now configurable
 
 ### Fixed
 
-- Connectors with Azure Vault extension are now starting again [link](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/issues/1892)
+-   Connectors with Azure Vault extension are now starting again [link](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/issues/1892)
 
 ## [0.1.0] - 2022-08-19
 
@@ -96,7 +108,9 @@ corresponding [documentation](/docs/migration/Version_0.0.x_0.1.x.md).
 
 ## [0.0.1] - 2022-05-13
 
-[Unreleased]: https://github.com/catenax-ng/product-edc/compare/0.1.1...HEAD
+[Unreleased]: https://github.com/catenax-ng/product-edc/compare/0.1.2...HEAD
+
+[0.1.2]: https://github.com/catenax-ng/product-edc/compare/0.1.1...0.1.2
 
 [0.1.1]: https://github.com/catenax-ng/product-edc/compare/0.1.0...0.1.1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# file to satisfy check in https://gh-org-checks.core.demo.catena-x.net/
		# veracode runs inside the build.yaml