Skip to content

Commit

Permalink
Merge pull request #917 from eclipse-tractusx/release/0.6.0-rc2
Browse files Browse the repository at this point in the history
Release version 0.6.0-rc2
  • Loading branch information
paullatzelsperger authored Dec 8, 2023
2 parents f95d1a7 + 9c6d544 commit 227cc17
Show file tree
Hide file tree
Showing 197 changed files with 2,066 additions and 898 deletions.
4 changes: 3 additions & 1 deletion .github/actions/run-deployment-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ runs:

- name: Setup Kubectl
uses: azure/[email protected]
with:
version: 'v1.28.2'

- name: Create k8s Kind Cluster
uses: helm/[email protected]
Expand Down Expand Up @@ -91,4 +93,4 @@ runs:
if: always()
shell: bash
run: >-
kind get clusters | xargs -n1 kind delete cluster --name
kind get clusters | xargs -n1 kind delete cluster --name
8 changes: 6 additions & 2 deletions .github/workflows/deployment-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,12 @@ jobs:
test-azure-vault-postgres:
runs-on: ubuntu-latest
needs: [ test-prepare, secret-presence ]
if: |
needs.secret-presence.outputs.AZURE_KV_CREDS
# if: |
# needs.secret-presence.outputs.AZURE_KV_CREDS

# DEACTIVATE this job for now because our Azure Credentials are expired
# TODO: reactivate once we have refreshed Azure Credentials
if: false
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
- name: Bump version in /charts
uses: mikefarah/yq@v4.35.2
uses: mikefarah/yq@v4.40.4
with:
cmd: |-
find charts -name Chart.yaml -maxdepth 3 | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
with:
python-version: 3.7
- name: chart-testing (setup)
uses: helm/chart-testing-action@v2.4.0
uses: helm/chart-testing-action@v2.6.1
#####################
### Chart Testing ###
#####################
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ jobs:
fail-fast: false
matrix:
variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
{ dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
{ 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 },
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-docusaurus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,6 @@ jobs:
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
overwrite: true
file: ${{ runner.temp }}/tractusx-edc-docusaurus-${{ steps.extract_version.outputs.DOWNSTREAM_VERSION }}.zip
tag: ${{ steps.extract_version.outputs.DOWNSTREAM_VERSION }}
1 change: 0 additions & 1 deletion .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ jobs:
fail-fast: false
matrix:
variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
{ dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
{ 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 },
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-swaggerhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- uses: ./.github/actions/setup-java

- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4

- name: Install Swagger CLI
run: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
fail-fast: false
matrix:
variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
{ dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
{ 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 },
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/run-all-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ jobs:
uses: ./.github/workflows/deployment-test.yaml
secrets: inherit

upgradeability-test:
uses: ./.github/workflows/upgradeability-test.yaml
secrets: inherit

# this job really serves no other purpose than waiting for the other two test workflows
# in future iterations, this could be used as a choke point to collect test data, etc.
summary:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/stale-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
name: Close Inactive Issues

on:
workflow_call:
secrets:
envGH:
required: true
schedule:
- cron: "30 1 * * *" # once a day (1:30 UTC)
workflow_dispatch: # allow manual trigger

jobs:
close-issues-in-triage:
runs-on: ubuntu-latest
permissions:
issues: write

steps:
- uses: actions/stale@v8
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Run Trivy vulnerability scanner in repo mode
uses: aquasecurity/trivy-action@master
uses: aquasecurity/trivy-action@0.12.0
with:
scan-type: "config"
# ignore-unfixed: true
Expand All @@ -84,7 +84,6 @@ jobs:
matrix:
image:
- edc-runtime-memory
- edc-controlplane-memory-hashicorp-vault
- edc-controlplane-postgresql-azure-vault
- edc-controlplane-postgresql-hashicorp-vault
- edc-dataplane-azure-vault
Expand All @@ -102,7 +101,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@master
uses: aquasecurity/trivy-action@0.12.0
with:
image-ref: "tractusx/${{ matrix.image }}:sha-${{ needs.git-sha7.outputs.value }}"
format: "sarif"
Expand Down
125 changes: 125 additions & 0 deletions .github/workflows/upgradeability-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
#
# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
# Copyright (c) 2021, 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: "Upgradeability Tests"

on:
workflow_call:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:

test-prepare:
runs-on: ubuntu-latest
steps:
- 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

test-upgradeability:
runs-on: ubuntu-latest
needs: [ test-prepare ]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: "Setup Helm"
uses: azure/[email protected]
with:
version: v3.8.1

- name: "Setup Kubectl"
uses: azure/[email protected]
with:
version: 'v1.28.2'

- name: Create k8s Kind Cluster
uses: helm/[email protected]

- name: "Update helm repo"
run: |
helm repo add tractusx https://eclipse-tractusx.github.io/charts/dev
helm repo update tractusx
- name: "Get latest released version"
id: get-version
run: |
RELEASED_VERSION=$(helm search repo tractusx/tractusx-connector -o json | jq -r '.[0].version')
echo "Last official release is $RELEASED_VERSION"
echo "RELEASE=$RELEASED_VERSION" >> $GITHUB_ENV
exit 0
- name: "Install latest release"
run: |
sh -c "edc-tests/deployment/src/main/resources/prepare-test.sh \
edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml"
helm upgrade --install tx-prod tractusx/tractusx-connector \
-f edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml \
--set "controlplane.image.tag=$RELEASE" \
--set "controlplane.image.pullPolicy=Always" \
--set "controlplane.image.repository=tractusx/edc-controlplane-postgresql-hashicorp-vault" \
--set "dataplane.image.tag=$RELEASE" \
--set "dataplane.image.pullPolicy=Always" \
--set "dataplane.image.repository=tractusx/edc-dataplane-hashicorp-vault" \
--dependency-update \
--wait-for-jobs --timeout=120s \
--version $RELEASE
# wait for the pod to become ready
kubectl rollout status deployment tx-prod-controlplane
kubectl rollout status deployment tx-prod-dataplane
- uses: ./.github/actions/setup-java

- name: "Build docker images"
shell: bash
run: |-
./gradlew :edc-controlplane:edc-controlplane-postgresql-hashicorp-vault:dockerize
./gradlew :edc-dataplane:edc-dataplane-hashicorp-vault:dockerize
- name: "Load images into KinD"
shell: bash
run: |
kind get clusters | xargs -n1 kind load docker-image edc-controlplane-postgresql-hashicorp-vault edc-dataplane-hashicorp-vault --name
- name: "Install new chart"
run: |
helm upgrade --install tx-prod charts/tractusx-connector \
-f edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml \
--dependency-update \
--wait-for-jobs --timeout=120s
# wait for the pod to become ready
kubectl rollout status deployment tx-prod-controlplane
kubectl rollout status deployment tx-prod-dataplane
# execute the helm test
helm test tx-prod
- name: Destroy the kind cluster
if: always()
shell: bash
run: >-
kind get clusters | xargs -n1 kind delete cluster --name
1 change: 0 additions & 1 deletion .github/workflows/veracode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
fail-fast: false
matrix:
variant: [ { dir: edc-controlplane, name: edc-runtime-memory },
{ dir: edc-controlplane, name: edc-controlplane-memory-hashicorp-vault },
{ dir: edc-controlplane, name: edc-controlplane-postgresql-hashicorp-vault },
{ dir: edc-controlplane, name: edc-controlplane-postgresql-azure-vault },
{ dir: edc-dataplane, name: edc-dataplane-azure-vault },
Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,20 @@

All notable changes to this project will be documented in this file.

## [0.5.3] - 2023-11-10

What's Changed

- chore: backport [autovacuum fix](https://github.com/eclipse-edc/Connector/pull/3479) by @wolf4ood in[#871]( https://github.com/eclipse-tractusx/tractusx-edc/pull/871)

## [0.5.2] - 2023-11-08

What's Changed

- chore: backport [autovacuum fix](https://github.com/eclipse-edc/Connector/pull/3479) by @wolf4ood in [#866](https://github.com/eclipse-tractusx/tractusx-edc/pull/866)

## [0.5.1] - 2023-08-22

0.5.1 Latest
What's Changed

- chore: Improve Helm Chart documentation by @tuncaytunc-zf in [#607](https://github.com/eclipse-tractusx/tractusx-edc/pull/607)
Expand Down
Loading

0 comments on commit 227cc17

Please sign in to comment.