Skip to content

Commit

Permalink
Merge pull request #1328 from eclipse-tractusx/release/0.7.2
Browse files Browse the repository at this point in the history
Release version 0.7.2
  • Loading branch information
paullatzelsperger authored May 23, 2024
2 parents 9513bfc + 8899023 commit 314b28b
Show file tree
Hide file tree
Showing 89 changed files with 1,544 additions and 880 deletions.
19 changes: 13 additions & 6 deletions .github/actions/run-deployment-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ inputs:
required: true
description: "The directory that contains the docker file, e.g. edc-controlplane/edc-runtime-memory"

k8sversion:
required: false
description: "Version of Kubernetes to use"
default: "v1.30.0"

runs:
using: "composite"
steps:
- uses: actions/[email protected]
- 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:
Expand All @@ -62,7 +62,14 @@ runs:
version: 'v1.28.2'

- name: Create k8s Kind Cluster
uses: helm/[email protected]
uses: helm/[email protected]
with:
node_image: kindest/node:${{ inputs.k8sversion }}

- name: Build docker images
shell: bash
run: |-
./gradlew -p ${{ inputs.rootDir }} dockerize
- name: Load images into KinD
shell: bash
Expand Down
30 changes: 24 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#################################################################################
# Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
Expand All @@ -21,7 +21,8 @@
---
version: 2
updates:
# Maven

# Gradle
-
package-ecosystem: "gradle"
target-branch: main
Expand All @@ -44,6 +45,14 @@ updates:
interval: "weekly"

# Docker
- package-ecosystem: "docker"
target-branch: main
directory: ./edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/
labels:
- "dependabot"
- "docker"
schedule:
interval: "weekly"
-
package-ecosystem: "docker"
target-branch: main
Expand All @@ -56,7 +65,7 @@ updates:
-
package-ecosystem: "docker"
target-branch: main
directory: ./edc-controlplane/edc-controlplane-postgresql-azure-vault/src/main/docker/
directory: ./edc-controlplane/edc-runtime-memory/src/main/docker/
labels:
- "dependabot"
- "docker"
Expand All @@ -65,7 +74,7 @@ updates:
-
package-ecosystem: "docker"
target-branch: main
directory: ./edc-controlplane/edc-controlplane-memory/src/main/docker/
directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/
labels:
- "dependabot"
- "docker"
Expand All @@ -74,7 +83,7 @@ updates:
-
package-ecosystem: "docker"
target-branch: main
directory: ./edc-dataplane/edc-dataplane-azure-vault/src/main/docker/
directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/
labels:
- "dependabot"
- "docker"
Expand All @@ -83,7 +92,16 @@ updates:
-
package-ecosystem: "docker"
target-branch: main
directory: ./edc-dataplane/edc-dataplane-hashicorp-vault/src/main/docker/
directory: ./edc-tests/runtime/mock-connector/src/main/docker/
labels:
- "dependabot"
- "docker"
schedule:
interval: "weekly"
-
package-ecosystem: "docker"
target-branch: main
directory: ./samples/edc-dast/edc-dast-runtime/src/main/docker/
labels:
- "dependabot"
- "docker"
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/deployment-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ jobs:
test-hashicorp-postgres:
runs-on: ubuntu-latest
needs: test-prepare
strategy:
fail-fast: false
# this will verify that the official distribution of the Tractus-X EDC Helm chart runs on the last 3 Kubernetes versions
matrix:
k8s-version: ["v1.30.0",
"v1.29.4",
"v1.28.9"]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -85,6 +92,7 @@ jobs:
with:
imagename: "edc-controlplane-postgresql-hashicorp-vault edc-dataplane-hashicorp-vault"
rootDir: "."
k8sversion: ${{ matrix.k8s-version }}
helm_command: |-
helm install tx-prod charts/tractusx-connector \
-f edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/draft-new-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
- name: Bump version in /charts
uses: mikefarah/yq@v4.43.1
uses: mikefarah/yq@v4.44.1
with:
cmd: |-
find charts -name Chart.yaml -maxdepth 3 | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'
Expand All @@ -75,7 +75,7 @@ jobs:
- name: Push new branch
run: git push origin release/${{ github.event.inputs.version }}
- name: Create pull request
uses: thomaseizinger/create-pull-request@1.3.1
uses: thomaseizinger/create-pull-request@1.4.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-swaggerhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ jobs:
./gradlew resolve
- name: Download upstream API specs
run: |
curl -X GET https://api.swaggerhub.com/apis/eclipse-edc-bot/management-api/${{ env.UPSTREAM_VERSION }}/swagger.yaml > resources/openapi/yaml/upstream-management-api.yaml
curl -X GET https://api.swaggerhub.com/apis/eclipse-edc-bot/control-api/${{ env.UPSTREAM_VERSION }}/swagger.yaml > resources/openapi/yaml/upstream-control-api.yaml
run: |
curl -X GET https://eclipse-edc.github.io/Connector/openapi/management-api/${{ env.UPSTREAM_VERSION }}/management-api.yaml > resources/openapi/yaml/upstream-management-api.yaml
curl -X GET https://eclipse-edc.github.io/Connector/openapi/control-api/${{ env.UPSTREAM_VERSION }}/control-api.yaml > resources/openapi/yaml/upstream-control-api.yaml
- name: Merge API specs
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ jobs:
{ dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault },
{ dir: edc-controlplane, img: edc-controlplane-postgresql-azure-vault },
{ dir: edc-dataplane, img: edc-dataplane-azure-vault },
{ dir: edc-dataplane, img: edc-dataplane-hashicorp-vault } ]
{ dir: edc-dataplane, img: edc-dataplane-hashicorp-vault },
{ dir: edc-tests/runtime, img: mock-connector }]
permissions:
contents: write
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@0.19.0
uses: aquasecurity/trivy-action@0.20.0
with:
scan-type: "config"
# ignore-unfixed: true
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
## the next two steps will only execute if the image exists check was successful
- name: Run Trivy vulnerability scanner
if: success() && steps.imageCheck.outcome != 'failure'
uses: aquasecurity/trivy-action@0.19.0
uses: aquasecurity/trivy-action@0.20.0
with:
image-ref: "tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
format: "sarif"
Expand Down
Loading

0 comments on commit 314b28b

Please sign in to comment.