Skip to content

Commit

Permalink
Merge pull request #156 from catenax-ng/main
Browse files Browse the repository at this point in the history
Release 3.3.4 preparation and helmignore
  • Loading branch information
ds-jhartmann authored Aug 24, 2023
2 parents 28ee1d2 + 20d04c7 commit 8bd8e05
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/irs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,10 @@ jobs:
username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}
repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}

trigger-trivy-image-scan:
if: >-
github.event_name != 'pull_request'
needs:
- build_images
uses: ./.github/workflows/trivy-docker-hub-scan.yml
33 changes: 33 additions & 0 deletions .github/workflows/trivy-docker-hub-scan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: "Trivy vulnerability scanner for Docker Hub Image"

on:
workflow_dispatch: # Trigger manually
workflow_call: # Trigger by another workflow
schedule:
- cron: "0 0 * * *"

jobs:
image-scan:
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
image-ref: 'tractusx/irs-api:latest'
format: 'sarif'
output: 'trivy-results.sarif'

- run: cat trivy-results.sarif

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: 'trivy-results.sarif'
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [3.3.4] - 2023-08-24
### Fixed
- Added missing license information to documentation and docker image

## [3.3.3] - 2023-08-11
### Changed
- IRS now calls the entire dataplane URL retrieved from the registry href instead of building it from the URL of the EDC token and the path
Expand Down Expand Up @@ -307,7 +311,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Unresolved
- **Select Aspects you need** You are able to select the needed aspects for which you want to collect the correct endpoint information.

[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.3...HEAD
[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.4...HEAD
[3.3.4]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.3...3.3.4
[3.3.3]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.2...3.3.3
[3.3.2]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.1...3.3.2
[3.3.1]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.0...3.3.1
Expand Down
4 changes: 4 additions & 0 deletions charts/irs-helm/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,7 @@
.idea/
*.tmproj
.vscode/

# Accept only values.yaml
values?*.yaml
values?*.yml
7 changes: 7 additions & 0 deletions charts/irs-helm/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [6.4.2] - 2023-08-11
### Added
- Added entry to .helmignore to only accept values.yaml

### Changed
- Update IRS version to 3.3.4

## [6.4.1] - 2023-08-11
### Changed
- Update IRS version to 3.3.3
Expand Down
4 changes: 2 additions & 2 deletions charts/irs-helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 6.4.1
version: 6.4.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "3.3.3"
appVersion: "3.3.4"
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
Expand Down

0 comments on commit 8bd8e05

Please sign in to comment.