diff --git a/.github/workflows/portal-assets-rc-image-update.yml b/.github/workflows/portal-assets-rc-image-update.yml new file mode 100644 index 000000000..41a276ea7 --- /dev/null +++ b/.github/workflows/portal-assets-rc-image-update.yml @@ -0,0 +1,54 @@ +############################################################### +# 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: Portal Assets Release Candidate Auto-image-update + +on: + workflow_dispatch: + inputs: + new-image: + description: 'new available image' + required: true + default: 'no content' + +env: + IMAGE_BEGINN: 'assetstag: ' + IMAGE_FULL_NEW: 'assetstag: ${{ inputs.new-image }}' + +jobs: + update-image-tag: + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Modify image tag in values-rc.yaml + run: | + sed -i 's/${{ env.IMAGE_BEGINN }}.*/${{ env.IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + + - name: Commit and push updated values-rc.yaml + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git add charts/portal/values-rc.yaml + git commit -m "Add new images for RC portal assets" + bash ./scripts/push.sh diff --git a/.github/workflows/portal-assets-int-release-image-update.yml b/.github/workflows/portal-assets-release-image-update.yml similarity index 83% rename from .github/workflows/portal-assets-int-release-image-update.yml rename to .github/workflows/portal-assets-release-image-update.yml index bf9e5b094..e60439101 100644 --- a/.github/workflows/portal-assets-int-release-image-update.yml +++ b/.github/workflows/portal-assets-release-image-update.yml @@ -17,7 +17,7 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -name: Portal Assets INT Release Auto-image-update +name: Portal Assets Release Auto-image-update on: workflow_dispatch: @@ -41,14 +41,14 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Modify image tag in values-int.yaml + - name: Modify image tag in values.yaml run: | - sed -i 's/${{ env.IMAGE_BEGINN }}.*/${{ env.IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml + sed -i 's/${{ env.IMAGE_BEGINN }}.*/${{ env.IMAGE_FULL_NEW }}/' charts/portal/values.yaml - - name: Commit and push updated values-int.yaml + - name: Commit and push updated values.yaml run: | git config user.name github-actions git config user.email github-actions@github.com - git add charts/portal/values-int.yaml - git commit -m "Add new images for portal assets int" + git add charts/portal/values.yaml + git commit -m "Add new images for portal assets" bash ./scripts/push.sh diff --git a/.github/workflows/portal-backend-rc-image-update.yml b/.github/workflows/portal-backend-rc-image-update.yml new file mode 100644 index 000000000..0e3153bfb --- /dev/null +++ b/.github/workflows/portal-backend-rc-image-update.yml @@ -0,0 +1,81 @@ +############################################################### +# 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: Portal Backend Release Candidate Auto-image-update + +on: + workflow_dispatch: + inputs: + new-image: + description: 'new available image' + required: true + default: 'no content' + +env: + ADMINISTRATION_IMAGE_BEGINN: 'administrationservicetag: ' + ADMINISTRATION_IMAGE_FULL_NEW: 'administrationservicetag: ${{ inputs.new-image }}' + PORTALMAINTENANCE_IMAGE_BEGINN: 'portalmaintenancetag: ' + PORTALMAINTENANCE_IMAGE_FULL_NEW: 'portalmaintenancetag: ${{ inputs.new-image }}' + APPMARKETPLACE_IMAGE_BEGINN: 'appmarketplaceservicetag: ' + APPMARKETPLACE_IMAGE_FULL_NEW: 'appmarketplaceservicetag: ${{ inputs.new-image }}' + NOTIFICATION_IMAGE_BEGINN: 'notificationservicetag: ' + NOTIFICATION_IMAGE_FULL_NEW: 'notificationservicetag: ${{ inputs.new-image }}' + PORTALMIGRATIONS_IMAGE_BEGINN: 'portalmigrationstag: ' + PORTALMIGRATIONS_IMAGE_FULL_NEW: 'portalmigrationstag: ${{ inputs.new-image }}' + CHECKLIST_IMAGE_BEGINN: 'checklistworkertag: ' + CHECKLIST_IMAGE_FULL_NEW: 'checklistworkertag: ${{ inputs.new-image }}' + PROVISIONING_IMAGE_BEGINN: 'provisioningservicetag: ' + PROVISIONING_IMAGE_FULL_NEW: 'provisioningservicetag: ${{ inputs.new-image }}' + REGISTRATION_IMAGE_BEGINN: 'registrationservicetag: ' + REGISTRATION_IMAGE_FULL_NEW: 'registrationservicetag: ${{ inputs.new-image }}' + SERVICES_IMAGE_BEGINN: 'servicesservicetag: ' + SERVICES_IMAGE_FULL_NEW: 'servicesservicetag: ${{ inputs.new-image }}' + PROVISIONINGMIGRATIONS_IMAGE_BEGINN: 'provisioningmigrationstag: ' + PROVISIONINGMIGRATIONS_IMAGE_FULL_NEW: 'provisioningmigrationstag: ${{ inputs.new-image }}' + +jobs: + update-image-tag: + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Modify image tag in values-rc.yaml + run: | + sed -i 's/${{ env.ADMINISTRATION_IMAGE_BEGINN }}.*/${{ env.ADMINISTRATION_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + sed -i 's/${{ env.CHECKLIST_IMAGE_BEGINN }}.*/${{ env.CHECKLIST_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + sed -i 's/${{ env.PORTALMAINTENANCE_IMAGE_BEGINN }}.*/${{ env.PORTALMAINTENANCE_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + sed -i 's/${{ env.APPMARKETPLACE_IMAGE_BEGINN }}.*/${{ env.APPMARKETPLACE_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + sed -i 's/${{ env.NOTIFICATION_IMAGE_BEGINN }}.*/${{ env.NOTIFICATION_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + sed -i 's/${{ env.PORTALMIGRATIONS_IMAGE_BEGINN }}.*/${{ env.PORTALMIGRATIONS_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + sed -i 's/${{ env.PROVISIONING_IMAGE_BEGINN }}.*/${{ env.PROVISIONING_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + sed -i 's/${{ env.REGISTRATION_IMAGE_BEGINN }}.*/${{ env.REGISTRATION_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + sed -i 's/${{ env.SERVICES_IMAGE_BEGINN }}.*/${{ env.SERVICES_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + sed -i 's/${{ env.PROVISIONINGMIGRATIONS_IMAGE_BEGINN }}.*/${{ env.PROVISIONINGMIGRATIONS_IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + + - name: Commit and push updated values-rc.yaml + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git add charts/portal/values-rc.yaml + git commit -m "Add new images for RC portal backend" + bash ./scripts/push.sh diff --git a/.github/workflows/portal-backend-int-release-image-update.yml b/.github/workflows/portal-backend-release-image-update.yml similarity index 82% rename from .github/workflows/portal-backend-int-release-image-update.yml rename to .github/workflows/portal-backend-release-image-update.yml index 9eb56cd28..ffacd37df 100644 --- a/.github/workflows/portal-backend-int-release-image-update.yml +++ b/.github/workflows/portal-backend-release-image-update.yml @@ -17,7 +17,7 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -name: Portal Backend INT Release Auto-image-update +name: Portal Backend Release Auto-image-update on: workflow_dispatch: @@ -59,23 +59,23 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Modify image tag in values-int.yaml + - name: Modify image tag in values.yaml run: | - sed -i 's/${{ env.ADMINISTRATION_IMAGE_BEGINN }}.*/${{ env.ADMINISTRATION_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml - sed -i 's/${{ env.CHECKLIST_IMAGE_BEGINN }}.*/${{ env.CHECKLIST_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml - sed -i 's/${{ env.PORTALMAINTENANCE_IMAGE_BEGINN }}.*/${{ env.PORTALMAINTENANCE_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml - sed -i 's/${{ env.APPMARKETPLACE_IMAGE_BEGINN }}.*/${{ env.APPMARKETPLACE_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml - sed -i 's/${{ env.NOTIFICATION_IMAGE_BEGINN }}.*/${{ env.NOTIFICATION_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml - sed -i 's/${{ env.PORTALMIGRATIONS_IMAGE_BEGINN }}.*/${{ env.PORTALMIGRATIONS_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml - sed -i 's/${{ env.PROVISIONING_IMAGE_BEGINN }}.*/${{ env.PROVISIONING_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml - sed -i 's/${{ env.REGISTRATION_IMAGE_BEGINN }}.*/${{ env.REGISTRATION_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml - sed -i 's/${{ env.SERVICES_IMAGE_BEGINN }}.*/${{ env.SERVICES_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml - sed -i 's/${{ env.PROVISIONINGMIGRATIONS_IMAGE_BEGINN }}.*/${{ env.PROVISIONINGMIGRATIONS_IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml + sed -i 's/${{ env.ADMINISTRATION_IMAGE_BEGINN }}.*/${{ env.ADMINISTRATION_IMAGE_FULL_NEW }}/' charts/portal/values.yaml + sed -i 's/${{ env.CHECKLIST_IMAGE_BEGINN }}.*/${{ env.CHECKLIST_IMAGE_FULL_NEW }}/' charts/portal/values.yaml + sed -i 's/${{ env.PORTALMAINTENANCE_IMAGE_BEGINN }}.*/${{ env.PORTALMAINTENANCE_IMAGE_FULL_NEW }}/' charts/portal/values.yaml + sed -i 's/${{ env.APPMARKETPLACE_IMAGE_BEGINN }}.*/${{ env.APPMARKETPLACE_IMAGE_FULL_NEW }}/' charts/portal/values.yaml + sed -i 's/${{ env.NOTIFICATION_IMAGE_BEGINN }}.*/${{ env.NOTIFICATION_IMAGE_FULL_NEW }}/' charts/portal/values.yaml + sed -i 's/${{ env.PORTALMIGRATIONS_IMAGE_BEGINN }}.*/${{ env.PORTALMIGRATIONS_IMAGE_FULL_NEW }}/' charts/portal/values.yaml + sed -i 's/${{ env.PROVISIONING_IMAGE_BEGINN }}.*/${{ env.PROVISIONING_IMAGE_FULL_NEW }}/' charts/portal/values.yaml + sed -i 's/${{ env.REGISTRATION_IMAGE_BEGINN }}.*/${{ env.REGISTRATION_IMAGE_FULL_NEW }}/' charts/portal/values.yaml + sed -i 's/${{ env.SERVICES_IMAGE_BEGINN }}.*/${{ env.SERVICES_IMAGE_FULL_NEW }}/' charts/portal/values.yaml + sed -i 's/${{ env.PROVISIONINGMIGRATIONS_IMAGE_BEGINN }}.*/${{ env.PROVISIONINGMIGRATIONS_IMAGE_FULL_NEW }}/' charts/portal/values.yaml - - name: Commit and push updated values-int.yaml + - name: Commit and push updated values.yaml run: | git config user.name github-actions git config user.email github-actions@github.com - git add charts/portal/values-int.yaml - git commit -m "Add new images for int" + git add charts/portal/values.yaml + git commit -m "Add new images for portal backend" bash ./scripts/push.sh diff --git a/.github/workflows/portal-chart-test.yaml b/.github/workflows/portal-chart-test.yaml index 82e42ff09..8b48659cc 100644 --- a/.github/workflows/portal-chart-test.yaml +++ b/.github/workflows/portal-chart-test.yaml @@ -4,7 +4,7 @@ on: push: paths: - 'charts/portal/**' - branches: [main, helm-environments] + branches: [main, helm-environments, release-candidate] pull_request: paths: - 'charts/portal/**' @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/portal-rc-image-update.yml b/.github/workflows/portal-rc-image-update.yml new file mode 100644 index 000000000..26e9f6dd5 --- /dev/null +++ b/.github/workflows/portal-rc-image-update.yml @@ -0,0 +1,54 @@ +############################################################### +# 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: Portal Release Candidate Auto-image-update + +on: + workflow_dispatch: + inputs: + new-image: + description: 'new available image' + required: true + default: 'no content' + +env: + IMAGE_BEGINN: 'portaltag: ' + IMAGE_FULL_NEW: 'portaltag: ${{ inputs.new-image }}' + +jobs: + update-image-tag: + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Modify image tag in values-rc.yaml + run: | + sed -i 's/${{ env.IMAGE_BEGINN }}.*/${{ env.IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + + - name: Commit and push updated values-rc.yaml + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git add charts/portal/values-rc.yaml + git commit -m "Add new images for RC portal" + bash ./scripts/push.sh diff --git a/.github/workflows/portal-registration-rc-image-update.yml b/.github/workflows/portal-registration-rc-image-update.yml new file mode 100644 index 000000000..0f2d702de --- /dev/null +++ b/.github/workflows/portal-registration-rc-image-update.yml @@ -0,0 +1,54 @@ +############################################################### +# 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: Portal Registration Release Candidate Auto-image-update + +on: + workflow_dispatch: + inputs: + new-image: + description: 'new available image' + required: true + default: 'no content' + +env: + IMAGE_BEGINN: 'registrationtag: ' + IMAGE_FULL_NEW: 'registrationtag: ${{ inputs.new-image }}' + +jobs: + update-image-tag: + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Modify image tag in values-rc.yaml + run: | + sed -i 's/${{ env.IMAGE_BEGINN }}.*/${{ env.IMAGE_FULL_NEW }}/' charts/portal/values-rc.yaml + + - name: Commit and push updated values-rc.yaml + run: | + git config user.name github-actions + git config user.email github-actions@github.com + git add charts/portal/values-rc.yaml + git commit -m "Add new images for RC portal registration" + bash ./scripts/push.sh diff --git a/.github/workflows/portal-registration-int-release-image-update.yml b/.github/workflows/portal-registration-release-image-update.yml similarity index 82% rename from .github/workflows/portal-registration-int-release-image-update.yml rename to .github/workflows/portal-registration-release-image-update.yml index 0826618b2..2a2570ee7 100644 --- a/.github/workflows/portal-registration-int-release-image-update.yml +++ b/.github/workflows/portal-registration-release-image-update.yml @@ -17,7 +17,7 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -name: Portal Registration INT Release Auto-image-update +name: Portal Registration Release Auto-image-update on: workflow_dispatch: @@ -41,14 +41,14 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Modify image tag in values-int.yaml + - name: Modify image tag in values.yaml run: | - sed -i 's/${{ env.IMAGE_BEGINN }}.*/${{ env.IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml + sed -i 's/${{ env.IMAGE_BEGINN }}.*/${{ env.IMAGE_FULL_NEW }}/' charts/portal/values.yaml - - name: Commit and push updated values-int.yaml + - name: Commit and push updated values.yaml run: | git config user.name github-actions git config user.email github-actions@github.com - git add charts/portal/values-int.yaml - git commit -m "Add new images for portal registration int" + git add charts/portal/values.yaml + git commit -m "Add new images for portal registration" bash ./scripts/push.sh diff --git a/.github/workflows/portal-int-release-image-update.yml b/.github/workflows/portal-release-image-update.yml similarity index 83% rename from .github/workflows/portal-int-release-image-update.yml rename to .github/workflows/portal-release-image-update.yml index 132bc3a9c..61297c485 100644 --- a/.github/workflows/portal-int-release-image-update.yml +++ b/.github/workflows/portal-release-image-update.yml @@ -17,7 +17,7 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -name: Portal INT Release Auto-image-update +name: Portal Release Auto-image-update on: workflow_dispatch: @@ -41,14 +41,14 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Modify image tag in values-int.yaml + - name: Modify image tag in values.yaml run: | - sed -i 's/${{ env.IMAGE_BEGINN }}.*/${{ env.IMAGE_FULL_NEW }}/' charts/portal/values-int.yaml + sed -i 's/${{ env.IMAGE_BEGINN }}.*/${{ env.IMAGE_FULL_NEW }}/' charts/portal/values.yaml - - name: Commit and push updated values-int.yaml + - name: Commit and push updated values.yaml run: | git config user.name github-actions git config user.email github-actions@github.com - git add charts/portal/values-int.yaml - git commit -m "Add new images for portal int" + git add charts/portal/values.yaml + git commit -m "Add new images for portal" bash ./scripts/push.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 2597b25cc..155ccc89a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ New features, fixed bugs, known defects and other noteworthy changes to each release of the Catena-X Portal helm chart. +## 1.3.0-RC1 + +### Change + +* changed to v1.3.0-RC1 images +* enabled additional config for portal-backend + +### Technical Support + +* upgraded workflow actions + ## 1.2.1 ### Bugfix @@ -56,4 +67,4 @@ New features, fixed bugs, known defects and other noteworthy changes to each rel ### Change * added product helm chart for portal, combining frontend and backend chart. -* moved repository to eclipse-tractusx. +* moved repository to eclipse-tractusx. \ No newline at end of file diff --git a/README.md b/README.md index 547e0f6b9..e3417cf13 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Helm chart for Catena-X Portal -![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square) ![Tag](https://img.shields.io/static/v1?label=&message=LeadingRepository&color=green&style=flat) +![Version: 1.3.0-RC1](https://img.shields.io/badge/Version-1.3.0--RC1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0-RC1](https://img.shields.io/badge/AppVersion-1.3.0--RC1-informational?style=flat-square) ![Tag](https://img.shields.io/static/v1?label=&message=LeadingRepository&color=green&style=flat) This helm chart installs the Catena-X Portal application which consists of @@ -11,7 +11,7 @@ This helm chart installs the Catena-X Portal application which consists of The Catena-X Portal is designed to work with the [Catena-X IAM](https://github.com/eclipse-tractusx/portal-iam). -For further information please refer to the [technical documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v1.2.0/developer/Technical%20Documentation). +For further information please refer to the [technical documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v1.3.0-RC1/developer/Technical%20Documentation). The referenced container images are for demonstration purposes only. @@ -36,7 +36,7 @@ To use the helm chart as a dependency: dependencies: - name: portal repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.2.1 + version: 1.3.0-RC1 ``` ## Requirements @@ -73,13 +73,13 @@ dependencies: | frontend.ingress.hosts[0] | object | `{"host":"portal.example.org","paths":[{"backend":{"port":8080,"service":"portal"},"path":"/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"registration"},"path":"/registration/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"assets"},"path":"/((assetsORdocumentation)/.*)","pathType":"Prefix"}]}` | Provide default path for the ingress record. | | frontend.portal.name | string | `"portal"` | | | frontend.portal.image.name | string | `"ghcr.io/catenax-ng/tx-portal-frontend"` | | -| frontend.portal.image.portaltag | string | `"v1.2.0"` | | +| frontend.portal.image.portaltag | string | `"v1.3.0-RC1"` | | | frontend.registration.name | string | `"registration"` | | | frontend.registration.image.name | string | `"ghcr.io/catenax-ng/tx-portal-frontend-registration"` | | -| frontend.registration.image.registrationtag | string | `"v1.2.0"` | | +| frontend.registration.image.registrationtag | string | `"v1.3.0-RC1"` | | | frontend.assets.name | string | `"assets"` | | | frontend.assets.image.name | string | `"ghcr.io/catenax-ng/tx-portal-assets"` | | -| frontend.assets.image.assetstag | string | `"v1.2.0"` | | +| frontend.assets.image.assetstag | string | `"v1.3.0-RC1"` | | | frontend.assets.path | string | `"/assets"` | | | frontend.centralidpAuthPath | string | `"/auth"` | | | frontend.bpdmPartnersPoolApiPath | string | `"/api"` | | @@ -125,7 +125,7 @@ dependencies: | backend.interfaces.secret | string | `"secret-backend-interfaces"` | Secret containing the client-secrets for the connection to daps, custodian, bpdm, sdFactory and clearinghouse. | | backend.registration.name | string | `"registration-service"` | | | backend.registration.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_registration-service"` | | -| backend.registration.image.registrationservicetag | string | `"v1.2.0"` | | +| backend.registration.image.registrationservicetag | string | `"v1.3.0-RC1"` | | | backend.registration.logging.registrationServiceBpn | string | `"Information"` | | | backend.registration.portalRegistrationPath | string | `"/registration"` | | | backend.registration.keycloakClientId | string | `"Cl1-CX-Registration"` | | @@ -138,7 +138,7 @@ dependencies: | backend.registration.registrationDocumentTypeIds.type0 | string | `"CX_FRAME_CONTRACT"` | | | backend.administration.name | string | `"administration-service"` | | | backend.administration.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_administration-service"` | | -| backend.administration.image.administrationservicetag | string | `"v1.2.0"` | | +| backend.administration.image.administrationservicetag | string | `"v1.3.0-RC1"` | | | backend.administration.logging.businessLogic | string | `"Information"` | | | backend.administration.logging.sdfactoryLibrary | string | `"Information"` | | | backend.administration.connectors.validCertificationContentTypes.type0 | string | `"application/x-pem-file"` | | @@ -189,11 +189,11 @@ dependencies: | backend.provisioning.sharedRealm.smtpServer.replyTo | string | `"smtp@example.org"` | Provide replyTo. | | backend.provisioning.service.name | string | `"provisioning-service"` | | | backend.provisioning.service.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_provisioning-service"` | | -| backend.provisioning.service.image.provisioningservicetag | string | `"v1.2.0"` | | +| backend.provisioning.service.image.provisioningservicetag | string | `"v1.3.0-RC1"` | | | backend.provisioning.service.swaggerEnabled | bool | `false` | | | backend.appmarketplace.name | string | `"marketplace-app-service"` | | | backend.appmarketplace.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_marketplace-app-service"` | | -| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v1.2.0"` | | +| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v1.3.0-RC1"` | | | backend.appmarketplace.logging.offersLibrary | string | `"Information"` | | | backend.appmarketplace.appOverviewPath | string | `"/appoverview"` | | | backend.appmarketplace.catenaAdminRoles.role0 | string | `"CX Admin"` | | @@ -239,18 +239,18 @@ dependencies: | backend.appmarketplace.swaggerEnabled | bool | `false` | | | backend.portalmigrations.name | string | `"portal-migrations"` | | | backend.portalmigrations.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_portal-migrations"` | | -| backend.portalmigrations.image.portalmigrationstag | string | `"v1.2.0"` | | +| backend.portalmigrations.image.portalmigrationstag | string | `"v1.3.0-RC1"` | | | backend.portalmigrations.seeding.testDataEnvironments | string | `""` | | | backend.portalmaintenance.name | string | `"portal-maintenance"` | | | backend.portalmaintenance.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_maintenance-service"` | | -| backend.portalmaintenance.image.portalmaintenancetag | string | `"v1.2.0"` | | +| backend.portalmaintenance.image.portalmaintenancetag | string | `"v1.3.0-RC1"` | | | backend.notification.name | string | `"notification-service"` | | | backend.notification.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_notification-service"` | | -| backend.notification.image.notificationservicetag | string | `"v1.2.0"` | | +| backend.notification.image.notificationservicetag | string | `"v1.3.0-RC1"` | | | backend.notification.swaggerEnabled | bool | `false` | | | backend.services.name | string | `"services-service"` | | | backend.services.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_services-service"` | | -| backend.services.image.servicesservicetag | string | `"v1.2.0"` | | +| backend.services.image.servicesservicetag | string | `"v1.3.0-RC1"` | | | backend.services.logging.offersLibrary | string | `"Information"` | | | backend.services.serviceMarketplacePath | string | `"/servicemarketplace"` | | | backend.services.catenaAdminRoles.role0 | string | `"CX Admin"` | | @@ -265,12 +265,17 @@ dependencies: | backend.services.submitServiceNotificationTypeIds.type0 | string | `"SERVICE_RELEASE_REQUEST"` | | | backend.services.approveServiceNotificationTypeIds.type0 | string | `"SERVICE_RELEASE_APPROVAL"` | | | backend.services.swaggerEnabled | bool | `false` | | +| backend.services.serviceImageDocumentTypeIds.type0 | string | `"ADDITIONAL_DETAILS"` | | +| backend.services.serviceImageDocumentTypeIds.type1 | string | `"CONFORMITY_APPROVAL_SERVICES"` | | +| backend.services.serviceImageDocumentTypeIds.type2 | string | `"SERVICE_LEADIMAGE"` | | +| backend.services.offerStatusIds.status0 | string | `"IN_REVIEW"` | | +| backend.services.offerStatusIds.status1 | string | `"ACTIVE"` | | | backend.provisioningmigrations.name | string | `"provisioning-migrations"` | | | backend.provisioningmigrations.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_provisioning-migrations"` | | -| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v1.2.0"` | | +| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v1.3.0-RC1"` | | | backend.checklistworker.name | string | `"checklist-worker"` | | | backend.checklistworker.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_checklist-worker"` | | -| backend.checklistworker.image.checklistworkertag | string | `"v1.2.0"` | | +| backend.checklistworker.image.checklistworkertag | string | `"v1.3.0-RC1"` | | | backend.checklistworker.logging.checklistLibrary | string | `"Information"` | | | backend.checklistworker.logging.bpdmLibrary | string | `"Information"` | | | backend.checklistworker.logging.clearinghouseLibrary | string | `"Information"` | | diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml index d38426d38..2ed71ab50 100644 --- a/charts/portal/Chart.yaml +++ b/charts/portal/Chart.yaml @@ -20,8 +20,8 @@ apiVersion: v2 name: portal type: application -version: 1.2.1 -appVersion: 1.2.0 +version: 1.3.0-RC1 +appVersion: 1.3.0-RC1 description: Helm chart for Catena-X Portal home: https://github.com/eclipse-tractusx/portal-cd sources: diff --git a/charts/portal/README.md b/charts/portal/README.md index 547e0f6b9..e3417cf13 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -1,6 +1,6 @@ # Helm chart for Catena-X Portal -![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square) ![Tag](https://img.shields.io/static/v1?label=&message=LeadingRepository&color=green&style=flat) +![Version: 1.3.0-RC1](https://img.shields.io/badge/Version-1.3.0--RC1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.0-RC1](https://img.shields.io/badge/AppVersion-1.3.0--RC1-informational?style=flat-square) ![Tag](https://img.shields.io/static/v1?label=&message=LeadingRepository&color=green&style=flat) This helm chart installs the Catena-X Portal application which consists of @@ -11,7 +11,7 @@ This helm chart installs the Catena-X Portal application which consists of The Catena-X Portal is designed to work with the [Catena-X IAM](https://github.com/eclipse-tractusx/portal-iam). -For further information please refer to the [technical documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v1.2.0/developer/Technical%20Documentation). +For further information please refer to the [technical documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v1.3.0-RC1/developer/Technical%20Documentation). The referenced container images are for demonstration purposes only. @@ -36,7 +36,7 @@ To use the helm chart as a dependency: dependencies: - name: portal repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.2.1 + version: 1.3.0-RC1 ``` ## Requirements @@ -73,13 +73,13 @@ dependencies: | frontend.ingress.hosts[0] | object | `{"host":"portal.example.org","paths":[{"backend":{"port":8080,"service":"portal"},"path":"/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"registration"},"path":"/registration/(.*)","pathType":"Prefix"},{"backend":{"port":8080,"service":"assets"},"path":"/((assetsORdocumentation)/.*)","pathType":"Prefix"}]}` | Provide default path for the ingress record. | | frontend.portal.name | string | `"portal"` | | | frontend.portal.image.name | string | `"ghcr.io/catenax-ng/tx-portal-frontend"` | | -| frontend.portal.image.portaltag | string | `"v1.2.0"` | | +| frontend.portal.image.portaltag | string | `"v1.3.0-RC1"` | | | frontend.registration.name | string | `"registration"` | | | frontend.registration.image.name | string | `"ghcr.io/catenax-ng/tx-portal-frontend-registration"` | | -| frontend.registration.image.registrationtag | string | `"v1.2.0"` | | +| frontend.registration.image.registrationtag | string | `"v1.3.0-RC1"` | | | frontend.assets.name | string | `"assets"` | | | frontend.assets.image.name | string | `"ghcr.io/catenax-ng/tx-portal-assets"` | | -| frontend.assets.image.assetstag | string | `"v1.2.0"` | | +| frontend.assets.image.assetstag | string | `"v1.3.0-RC1"` | | | frontend.assets.path | string | `"/assets"` | | | frontend.centralidpAuthPath | string | `"/auth"` | | | frontend.bpdmPartnersPoolApiPath | string | `"/api"` | | @@ -125,7 +125,7 @@ dependencies: | backend.interfaces.secret | string | `"secret-backend-interfaces"` | Secret containing the client-secrets for the connection to daps, custodian, bpdm, sdFactory and clearinghouse. | | backend.registration.name | string | `"registration-service"` | | | backend.registration.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_registration-service"` | | -| backend.registration.image.registrationservicetag | string | `"v1.2.0"` | | +| backend.registration.image.registrationservicetag | string | `"v1.3.0-RC1"` | | | backend.registration.logging.registrationServiceBpn | string | `"Information"` | | | backend.registration.portalRegistrationPath | string | `"/registration"` | | | backend.registration.keycloakClientId | string | `"Cl1-CX-Registration"` | | @@ -138,7 +138,7 @@ dependencies: | backend.registration.registrationDocumentTypeIds.type0 | string | `"CX_FRAME_CONTRACT"` | | | backend.administration.name | string | `"administration-service"` | | | backend.administration.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_administration-service"` | | -| backend.administration.image.administrationservicetag | string | `"v1.2.0"` | | +| backend.administration.image.administrationservicetag | string | `"v1.3.0-RC1"` | | | backend.administration.logging.businessLogic | string | `"Information"` | | | backend.administration.logging.sdfactoryLibrary | string | `"Information"` | | | backend.administration.connectors.validCertificationContentTypes.type0 | string | `"application/x-pem-file"` | | @@ -189,11 +189,11 @@ dependencies: | backend.provisioning.sharedRealm.smtpServer.replyTo | string | `"smtp@example.org"` | Provide replyTo. | | backend.provisioning.service.name | string | `"provisioning-service"` | | | backend.provisioning.service.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_provisioning-service"` | | -| backend.provisioning.service.image.provisioningservicetag | string | `"v1.2.0"` | | +| backend.provisioning.service.image.provisioningservicetag | string | `"v1.3.0-RC1"` | | | backend.provisioning.service.swaggerEnabled | bool | `false` | | | backend.appmarketplace.name | string | `"marketplace-app-service"` | | | backend.appmarketplace.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_marketplace-app-service"` | | -| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v1.2.0"` | | +| backend.appmarketplace.image.appmarketplaceservicetag | string | `"v1.3.0-RC1"` | | | backend.appmarketplace.logging.offersLibrary | string | `"Information"` | | | backend.appmarketplace.appOverviewPath | string | `"/appoverview"` | | | backend.appmarketplace.catenaAdminRoles.role0 | string | `"CX Admin"` | | @@ -239,18 +239,18 @@ dependencies: | backend.appmarketplace.swaggerEnabled | bool | `false` | | | backend.portalmigrations.name | string | `"portal-migrations"` | | | backend.portalmigrations.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_portal-migrations"` | | -| backend.portalmigrations.image.portalmigrationstag | string | `"v1.2.0"` | | +| backend.portalmigrations.image.portalmigrationstag | string | `"v1.3.0-RC1"` | | | backend.portalmigrations.seeding.testDataEnvironments | string | `""` | | | backend.portalmaintenance.name | string | `"portal-maintenance"` | | | backend.portalmaintenance.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_maintenance-service"` | | -| backend.portalmaintenance.image.portalmaintenancetag | string | `"v1.2.0"` | | +| backend.portalmaintenance.image.portalmaintenancetag | string | `"v1.3.0-RC1"` | | | backend.notification.name | string | `"notification-service"` | | | backend.notification.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_notification-service"` | | -| backend.notification.image.notificationservicetag | string | `"v1.2.0"` | | +| backend.notification.image.notificationservicetag | string | `"v1.3.0-RC1"` | | | backend.notification.swaggerEnabled | bool | `false` | | | backend.services.name | string | `"services-service"` | | | backend.services.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_services-service"` | | -| backend.services.image.servicesservicetag | string | `"v1.2.0"` | | +| backend.services.image.servicesservicetag | string | `"v1.3.0-RC1"` | | | backend.services.logging.offersLibrary | string | `"Information"` | | | backend.services.serviceMarketplacePath | string | `"/servicemarketplace"` | | | backend.services.catenaAdminRoles.role0 | string | `"CX Admin"` | | @@ -265,12 +265,17 @@ dependencies: | backend.services.submitServiceNotificationTypeIds.type0 | string | `"SERVICE_RELEASE_REQUEST"` | | | backend.services.approveServiceNotificationTypeIds.type0 | string | `"SERVICE_RELEASE_APPROVAL"` | | | backend.services.swaggerEnabled | bool | `false` | | +| backend.services.serviceImageDocumentTypeIds.type0 | string | `"ADDITIONAL_DETAILS"` | | +| backend.services.serviceImageDocumentTypeIds.type1 | string | `"CONFORMITY_APPROVAL_SERVICES"` | | +| backend.services.serviceImageDocumentTypeIds.type2 | string | `"SERVICE_LEADIMAGE"` | | +| backend.services.offerStatusIds.status0 | string | `"IN_REVIEW"` | | +| backend.services.offerStatusIds.status1 | string | `"ACTIVE"` | | | backend.provisioningmigrations.name | string | `"provisioning-migrations"` | | | backend.provisioningmigrations.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_provisioning-migrations"` | | -| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v1.2.0"` | | +| backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v1.3.0-RC1"` | | | backend.checklistworker.name | string | `"checklist-worker"` | | | backend.checklistworker.image.name | string | `"ghcr.io/catenax-ng/tx-portal-backend_checklist-worker"` | | -| backend.checklistworker.image.checklistworkertag | string | `"v1.2.0"` | | +| backend.checklistworker.image.checklistworkertag | string | `"v1.3.0-RC1"` | | | backend.checklistworker.logging.checklistLibrary | string | `"Information"` | | | backend.checklistworker.logging.bpdmLibrary | string | `"Information"` | | | backend.checklistworker.logging.clearinghouseLibrary | string | `"Information"` | | diff --git a/charts/portal/templates/deployment-backend-services.yaml b/charts/portal/templates/deployment-backend-services.yaml index 75aa41000..57bb0bea2 100644 --- a/charts/portal/templates/deployment-backend-services.yaml +++ b/charts/portal/templates/deployment-backend-services.yaml @@ -149,6 +149,16 @@ spec: value: "{{ .Values.backend.services.submitServiceNotificationTypeIds.type0 }}" - name: "SWAGGERENABLED" value: "{{ .Values.backend.services.swaggerEnabled }}" + - name: "SERVICES__SERVICEIMAGEDOCUMENTTYPEIDS__0" + value: "{{ .Values.backend.services.serviceImageDocumentTypeIds.type0 }}" + - name: "SERVICES__SERVICEIMAGEDOCUMENTTYPEIDS__1" + value: "{{ .Values.backend.services.serviceImageDocumentTypeIds.type1 }}" + - name: "SERVICES__SERVICEIMAGEDOCUMENTTYPEIDS__2" + value: "{{ .Values.backend.services.serviceImageDocumentTypeIds.type2 }}" + - name: "SERVICES__OFFERSTATUSIDS__0" + value: "{{ .Values.backend.services.offerStatusIds.status0 }}" + - name: "SERVICES__OFFERSTATUSIDS__1" + value: "{{ .Values.backend.services.offerStatusIds.status1 }}" ports: - name: http containerPort: {{ .Values.portContainer }} diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 3c3d72d03..36fee6696 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -95,17 +95,17 @@ frontend: name: "portal" image: name: "ghcr.io/catenax-ng/tx-portal-frontend" - portaltag: v1.2.0 + portaltag: v1.3.0-RC1 registration: name: "registration" image: name: "ghcr.io/catenax-ng/tx-portal-frontend-registration" - registrationtag: v1.2.0 + registrationtag: v1.3.0-RC1 assets: name: "assets" image: name: "ghcr.io/catenax-ng/tx-portal-assets" - assetstag: v1.2.0 + assetstag: v1.3.0-RC1 path: "/assets" centralidpAuthPath: "/auth" bpdmPartnersPoolApiPath: "/api" @@ -218,7 +218,7 @@ backend: name: "registration-service" image: name: "ghcr.io/catenax-ng/tx-portal-backend_registration-service" - registrationservicetag: v1.2.0 + registrationservicetag: v1.3.0-RC1 logging: registrationServiceBpn: "Information" portalRegistrationPath: "/registration" @@ -237,7 +237,7 @@ backend: name: "administration-service" image: name: "ghcr.io/catenax-ng/tx-portal-backend_administration-service" - administrationservicetag: v1.2.0 + administrationservicetag: v1.3.0-RC1 logging: businessLogic: "Information" sdfactoryLibrary: "Information" @@ -319,13 +319,13 @@ backend: name: "provisioning-service" image: name: "ghcr.io/catenax-ng/tx-portal-backend_provisioning-service" - provisioningservicetag: v1.2.0 + provisioningservicetag: v1.3.0-RC1 swaggerEnabled: false appmarketplace: name: "marketplace-app-service" image: name: "ghcr.io/catenax-ng/tx-portal-backend_marketplace-app-service" - appmarketplaceservicetag: v1.2.0 + appmarketplaceservicetag: v1.3.0-RC1 logging: offersLibrary: "Information" appOverviewPath: "/appoverview" @@ -391,25 +391,25 @@ backend: name: "portal-migrations" image: name: "ghcr.io/catenax-ng/tx-portal-backend_portal-migrations" - portalmigrationstag: v1.2.0 + portalmigrationstag: v1.3.0-RC1 seeding: testDataEnvironments: "" portalmaintenance: name: "portal-maintenance" image: name: "ghcr.io/catenax-ng/tx-portal-backend_maintenance-service" - portalmaintenancetag: v1.2.0 + portalmaintenancetag: v1.3.0-RC1 notification: name: "notification-service" image: name: "ghcr.io/catenax-ng/tx-portal-backend_notification-service" - notificationservicetag: v1.2.0 + notificationservicetag: v1.3.0-RC1 swaggerEnabled: false services: name: "services-service" image: name: "ghcr.io/catenax-ng/tx-portal-backend_services-service" - servicesservicetag: v1.2.0 + servicesservicetag: v1.3.0-RC1 logging: offersLibrary: "Information" serviceMarketplacePath: "/servicemarketplace" @@ -435,16 +435,23 @@ backend: approveServiceNotificationTypeIds: type0: "SERVICE_RELEASE_APPROVAL" swaggerEnabled: false + serviceImageDocumentTypeIds: + type0: "ADDITIONAL_DETAILS" + type1: "CONFORMITY_APPROVAL_SERVICES" + type2: "SERVICE_LEADIMAGE" + offerStatusIds: + status0: "IN_REVIEW" + status1: "ACTIVE" provisioningmigrations: name: "provisioning-migrations" image: name: "ghcr.io/catenax-ng/tx-portal-backend_provisioning-migrations" - provisioningmigrationstag: v1.2.0 + provisioningmigrationstag: v1.3.0-RC1 checklistworker: name: "checklist-worker" image: name: "ghcr.io/catenax-ng/tx-portal-backend_checklist-worker" - checklistworkertag: v1.2.0 + checklistworkertag: v1.3.0-RC1 logging: checklistLibrary: "Information" bpdmLibrary: "Information"