Skip to content

Commit

Permalink
Merge pull request #477 from eclipse-tractusx/merge/v2.3.0-RC3
Browse files Browse the repository at this point in the history
build(2.3.0-rc4): merge release into main
  • Loading branch information
evegufy authored Nov 13, 2024
2 parents 6276851 + 3ba3323 commit c6816ea
Show file tree
Hide file tree
Showing 14 changed files with 75 additions and 71 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ jobs:
format: "sarif"
output: "trivy-results1.sarif"
vuln-type: "os,library"
severity: 'CRITICAL,HIGH' # While vulnerabilities of all severities are reported in the SARIF output, the exit code and workflow failure are triggered only by these specified severities (CRITICAL or HIGH).
exit-code: '1' # Trivy exits with code 1 if vulnerabilities are found, causing the workflow step to fail.
limit-severities-for-sarif: true

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart.

## 2.3.0-RC4

### Change

* changed to new container images
* portal-frontend: v2.3.0-RC4
* portal-backend: v2.3.0-RC2
+ portal-assets: v2.3.0-RC1
* portal-backend: changed operator default information [#469](https://github.com/eclipse-tractusx/portal/pull/469)

## 2.3.0-RC1

### Change
Expand Down
6 changes: 3 additions & 3 deletions charts/localdev/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ dependencies:
- condition: portal.enabled
name: portal
repository: file://../portal
version: 2.3.0-RC1
version: 2.3.0-RC4
- condition: centralidp.enabled
name: centralidp
repository: https://eclipse-tractusx.github.io/charts/dev
version: 4.0.0-alpha.1
version: 4.0.0-rc.1
- condition: sharedidp.enabled
name: sharedidp
repository: https://eclipse-tractusx.github.io/charts/dev
version: 4.0.0-alpha.1
version: 4.0.0-rc.1
- condition: pgadmin4.enabled
name: pgadmin4
repository: https://helm.runix.net
Expand Down
8 changes: 3 additions & 5 deletions charts/localdev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -574,10 +574,10 @@ See [cert-manager self-signed](https://cert-manager.io/docs/configuration/selfsi

| Repository | Name | Version |
|------------|------|---------|
| file://../portal | portal | 2.3.0-alpha.3 |
| file://../portal | portal | 2.3.0-RC4 |
| https://charts.bitnami.com/bitnami | postgresportal(postgresql) | 12.12.x |
| https://eclipse-tractusx.github.io/charts/dev | centralidp | 4.0.0-alpha.1 |
| https://eclipse-tractusx.github.io/charts/dev | sharedidp | 4.0.0-alpha.1 |
| https://eclipse-tractusx.github.io/charts/dev | centralidp | 4.0.0-rc.1 |
| https://eclipse-tractusx.github.io/charts/dev | sharedidp | 4.0.0-rc.1 |
| https://helm.runix.net | pgadmin4 | 1.17.x |

## Values
Expand Down Expand Up @@ -709,7 +709,6 @@ See [cert-manager self-signed](https://cert-manager.io/docs/configuration/selfsi
| centralidp.keycloak.postgresql.nameOverride | string | `"centralidp-postgresql"` | |
| centralidp.keycloak.postgresql.auth.password | string | `"dbpasswordcentralidp"` | |
| centralidp.keycloak.postgresql.auth.postgresPassword | string | `"dbpasswordcentralidp"` | |
| centralidp.keycloak.proxy | string | `"edge"` | |
| centralidp.keycloak.ingress.enabled | bool | `true` | |
| centralidp.keycloak.ingress.ingressClassName | string | `"nginx"` | |
| centralidp.keycloak.ingress.hostname | string | `"centralidp.tx.test"` | |
Expand Down Expand Up @@ -781,7 +780,6 @@ See [cert-manager self-signed](https://cert-manager.io/docs/configuration/selfsi
| sharedidp.keycloak.postgresql.nameOverride | string | `"sharedidp-postgresql"` | |
| sharedidp.keycloak.postgresql.auth.password | string | `"dbpasswordsharedidp"` | |
| sharedidp.keycloak.postgresql.auth.postgresPassword | string | `"dbpasswordsharedidp"` | |
| sharedidp.keycloak.proxy | string | `"edge"` | |
| sharedidp.keycloak.ingress.enabled | bool | `true` | |
| sharedidp.keycloak.ingress.ingressClassName | string | `"nginx"` | |
| sharedidp.keycloak.ingress.hostname | string | `"sharedidp.tx.test"` | |
Expand Down
8 changes: 4 additions & 4 deletions charts/localdev/values-tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ centralidp:
keycloak:
initContainers:
- name: import
image: docker.io/tractusx/portal-iam:v4.0.0-alpha.1
image: docker.io/tractusx/portal-iam:v4.0.0-rc.1
imagePullPolicy: IfNotPresent
command:
- sh
Expand All @@ -145,7 +145,7 @@ centralidp:
- name: themes
mountPath: /themes
- name: init-certs
image: docker.io/bitnami/keycloak:23.0.7-debian-12-r1
image: docker.io/bitnami/keycloak:25.0.6-debian-12-r0
imagePullPolicy: IfNotPresent
command: ["/bin/bash"]
args:
Expand Down Expand Up @@ -233,7 +233,7 @@ sharedidp:
keycloak:
initContainers:
- name: import
image: docker.io/tractusx/portal-iam:v4.0.0-alpha.1
image: docker.io/tractusx/portal-iam:v4.0.0-rc.1
imagePullPolicy: IfNotPresent
command:
- sh
Expand All @@ -250,7 +250,7 @@ sharedidp:
- name: themes-catenax-shared-portal
mountPath: /themes-catenax-shared-portal
- name: init-certs
image: docker.io/bitnami/keycloak:23.0.7-debian-12-r1
image: docker.io/bitnami/keycloak:25.0.6-debian-12-r0
imagePullPolicy: IfNotPresent
command: ["/bin/bash"]
args:
Expand Down
3 changes: 0 additions & 3 deletions charts/localdev/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ portal:
clientId: "sa-cl5-custodian-2"
clientSecret: "changeme"
sdfactory:
issuerBpn: "BPNL00000003CRHK"
clientId: "sa-cl8-cx-1"
clientSecret: "changeme"
offerprovider:
Expand Down Expand Up @@ -295,7 +294,6 @@ centralidp:
auth:
password: "dbpasswordcentralidp"
postgresPassword: "dbpasswordcentralidp"
proxy: edge
ingress:
enabled: true
ingressClassName: "nginx"
Expand Down Expand Up @@ -392,7 +390,6 @@ sharedidp:
auth:
password: "dbpasswordsharedidp"
postgresPassword: "dbpasswordsharedidp"
proxy: edge
ingress:
enabled: true
ingressClassName: "nginx"
Expand Down
4 changes: 2 additions & 2 deletions charts/portal/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
apiVersion: v2
name: portal
type: application
version: 2.3.0-RC1
appVersion: 2.3.0-RC1
version: 2.3.0-RC4
appVersion: 2.3.0-RC4
description: Helm chart for Catena-X Portal
home: https://github.com/eclipse-tractusx/portal
sources:
Expand Down
Loading

0 comments on commit c6816ea

Please sign in to comment.