Release version 0.1.1 (#385)

catenax-ng · Sep 5, 2022 · d9b037d · d9b037d
1 parent 549bb0a
commit d9b037d
Show file tree

Hide file tree

Showing 108 changed files with 3,266 additions and 467 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -74,6 +74,13 @@ jobs:
           java-version: '11'
           distribution: 'adopt'
           cache: 'maven'
+      -
+        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-20220902-SNAPSHOT
+        working-directory: edc
       -
         name: Cache SonarCloud packages
         uses: actions/cache@v3
@@ -128,6 +135,13 @@ jobs:
           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-20220902-SNAPSHOT
+        working-directory: edc
       -
         name: Build Controlplane
         run: |-
@@ -210,6 +224,13 @@ jobs:
           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-20220902-SNAPSHOT
+        working-directory: edc
       -
         name: Build Dataplane
         run: |-

diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
@@ -69,6 +69,13 @@ jobs:
       ##############################################
       ### Build and load recent images into KinD ###
       ##############################################
+      -
+        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-20220902-SNAPSHOT
+        working-directory: edc
       -
         name: Build edc-controlplane-postgresql-hashicorp-vault
         run: |-

diff --git a/.github/workflows/checkov.yaml b/.github/workflows/checkov.yaml
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
@@ -43,7 +43,7 @@ jobs:
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.CXNG_GHCR_PAT }}
       -
         name: Bump version in deployment/helm
-        uses: mikefarah/[email protected].2
+        uses: mikefarah/[email protected].3
         with:
           cmd: |-
             find deployment/helm -name Chart.yaml | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'

diff --git a/.github/workflows/kics.yaml b/.github/workflows/kics.yaml
@@ -0,0 +1,42 @@
+name: "KICS"
+
+on:
+  push:
+    branches: [main, master, develop]
+  pull_request:
+    branches: [main, master, develop]
+  workflow_dispatch:
+
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: KICS scan
+        uses: checkmarx/kics-github-action@master
+        with:
+          path: "."
+          fail_on: high
+          disable_secrets: true
+          output_path: kicsResults/
+          output_formats: "json,sarif"
+          exclude_queries: "fd54f200-402c-4333-a5a4-36ef6709af2f,b03a748a-542d-44f4-bb86-9199ab4fd2d5"
+          # Excluded queries are:
+          # fd54f200-402c-4333-a5a4-36ef6709af2f Missing User Instruction
+          # b03a748a-542d-44f4-bb86-9199ab4fd2d5 Healthcheck Instruction Missing
+
+      - name: Upload SARIF file for GitHub Advanced Security Dashboard
+        if: always()
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: kicsResults/results.sarif
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
@@ -74,6 +74,13 @@ jobs:
           java-version: '11'
           distribution: 'adopt'
           cache: 'maven'
+      -
+        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-20220902-SNAPSHOT
+        working-directory: edc
       -
         name: Deploy
         run: |-

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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).
+
+### Added
+
+-  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
+
+### Fixed
+
+- Connectors with Azure Vault extension are now starting again [link](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/issues/1892)
+
 ## [0.1.0] - 2022-08-19
 
 **Important Note**: Version 0.1.0 introduces multiple breaking changes. Before updating **always** consolidate the
@@ -79,7 +96,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.0...HEAD
+[Unreleased]: https://github.com/catenax-ng/product-edc/compare/0.1.1...HEAD
+
+[0.1.1]: https://github.com/catenax-ng/product-edc/compare/0.1.0...0.1.1
 
 [0.1.0]: https://github.com/catenax-ng/product-edc/compare/0.0.6...0.1.0
 

diff --git a/deployment/helm/edc-controlplane/Chart.yaml b/deployment/helm/edc-controlplane/Chart.yaml
@@ -5,6 +5,6 @@ description: >-
   EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-controlplane
 type: application
-appVersion: "0.1.0"
-version: 0.1.0
+appVersion: "0.1.1"
+version: 0.1.1
 maintainers: []
diff --git a/deployment/helm/edc-controlplane/README.md b/deployment/helm/edc-controlplane/README.md
@@ -1,6 +1,6 @@
 # edc-controlplane
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.1](https://img.shields.io/badge/AppVersion-0.1.1-informational?style=flat-square)
 
 EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with responsibility of resource management and govern contracts and data transfers
 
@@ -9,7 +9,7 @@ EDC Control-Plane - The Eclipse DataSpaceConnector administration layer with res
 ## TL;DR
 ```shell
 $ helm repo add catenax-ng-product-edc https://catenax-ng.github.io/product-edc
-$ helm install my-release catenax-ng-product-edc/edc-controlplane --version 0.1.0
+$ helm install my-release catenax-ng-product-edc/edc-controlplane --version 0.1.1
 ```
 
 ## Values
@@ -51,15 +51,19 @@ $ helm install my-release catenax-ng-product-edc/edc-controlplane --version 0.1.
 | ingresses[0].enabled | bool | `true` |  |
 | ingresses[0].endpoints | list | `["ids"]` | EDC endpoints exposed by this ingress resource |
 | ingresses[0].hostname | string | `"edc-controlplane.local"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| ingresses[0].tls | bool | `false` | Enables TLS on the ingress resource |
+| ingresses[0].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
 | ingresses[1].annotations | object | `{}` | Additional ingress annotations to add |
 | ingresses[1].certManager.clusterIssuer | string | `""` | If preset enables certificate generation via cert-manager cluster-wide issuer |
 | ingresses[1].certManager.issuer | string | `""` | If preset enables certificate generation via cert-manager namespace scoped issuer |
 | ingresses[1].className | string | `""` | Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use |
 | ingresses[1].enabled | bool | `false` |  |
 | ingresses[1].endpoints | list | `["data","control"]` | EDC endpoints exposed by this ingress resource |
 | ingresses[1].hostname | string | `"edc-controlplane.intranet"` | The hostname to be used to precisely map incoming traffic onto the underlying network service |
-| ingresses[1].tls | bool | `false` | Enables TLS on the ingress resource |
+| ingresses[1].tls | object | `{"enabled":false,"secretName":""}` | TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource |
+| ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
+| ingresses[1].tls.secretName | string | `""` | If present overwrites the default secret name |
 | livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
 | logging.properties | string | `".level=INFO\norg.eclipse.dataspaceconnector.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8) |
 | nameOverride | string | `""` | Overrides the charts name |

diff --git a/deployment/helm/edc-controlplane/templates/ingress.yaml b/deployment/helm/edc-controlplane/templates/ingress.yaml
@@ -42,11 +42,15 @@ spec:
   ingressClassName: {{ .className }}
   {{- end }}
   {{- if .hostname }}
-  {{- if .tls }}
+  {{- if .tls.enabled }}
   tls:
     - hosts:
         - {{ .hostname }}
+      {{- if .tls.secretName }}
+      secretName: {{ .tls.secretName }}
+      {{- else }}
       secretName: {{ $ingressName }}-tls
+      {{- end }}
   {{- end }}
   rules:
     - host: {{ .hostname }}

diff --git a/deployment/helm/edc-controlplane/values.yaml b/deployment/helm/edc-controlplane/values.yaml
@@ -147,8 +147,12 @@ ingresses:
       - ids
     # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
     className: ""
-    # -- Enables TLS on the ingress resource
-    tls: false
+    # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+    tls:
+      # -- Enables TLS on the ingress resource
+      enabled: false
+      # -- If present overwrites the default secret name
+      secretName: ""
     ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
     certManager:
       # -- If preset enables certificate generation via cert-manager namespace scoped issuer
@@ -168,8 +172,12 @@ ingresses:
       - control
     # -- Defines the [ingress class](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class)  to use
     className: ""
-    # -- Enables TLS on the ingress resource
-    tls: false
+    # -- TLS [tls class](https://kubernetes.io/docs/concepts/services-networking/ingress/#tls) applied to the ingress resource
+    tls:
+      # -- Enables TLS on the ingress resource
+      enabled: false
+      # -- If present overwrites the default secret name
+      secretName: ""
     ## Adds [cert-manager](https://cert-manager.io/docs/) annotations to the ingress resource
     certManager:
       # -- If preset enables certificate generation via cert-manager namespace scoped issuer

diff --git a/deployment/helm/edc-dataplane/Chart.yaml b/deployment/helm/edc-dataplane/Chart.yaml
@@ -5,6 +5,6 @@ description: >-
   EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-dataplane
 type: application
-appVersion: "0.1.0"
-version: 0.1.0
+appVersion: "0.1.1"
+version: 0.1.1
 maintainers: []