-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12 from catenax-ng/main
feat: merge upstream v1.3.0 and workflow updates
- Loading branch information
Showing
7 changed files
with
60 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,7 @@ | |
| # SPDX-License-Identifier: Apache-2.0 | ||
| ############################################################### | ||
|
|
||
| name: Checklist-Worker Auto-image-update | ||
| name: Processes-Worker Auto-image-update | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
@@ -28,8 +28,8 @@ on: | |
| default: 'no content' | ||
|
|
||
| env: | ||
| IMAGE_BEGINN: 'checklistworkertag: ' | ||
| IMAGE_FULL_NEW: 'checklistworkertag: ${{ inputs.new-image }}' | ||
| IMAGE_BEGINN: 'processesworkertag: ' | ||
| IMAGE_FULL_NEW: 'processesworkertag: ${{ inputs.new-image }}' | ||
|
|
||
| jobs: | ||
| update-image-tag: | ||
|
|
@@ -50,5 +50,5 @@ jobs: | |
| git config user.name github-actions | ||
| git config user.email [email protected] | ||
| git add charts/portal/values-dev.yaml | ||
| git commit -m "Add new image for checklist worker" | ||
| git commit -m "Add new image for processes worker" | ||
| bash ./scripts/push.sh | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| # Helm chart for Catena-X Portal | ||
|
|
||
|     | ||
|     | ||
|
|
||
| This helm chart installs the Catena-X Portal application which consists of | ||
|
|
||
|
|
@@ -14,7 +14,9 @@ This version is compatible with the 1.1.0 version of the IAM instances: | |
| * [Central Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/centralidp-1.1.0/charts/centralidp/README.md) | ||
| * [Shared Keycloak Instance](https://github.com/eclipse-tractusx/portal-iam/blob/sharedidp-1.1.0/charts/sharedidp/README.md) | ||
|
|
||
| For further information please refer to the [technical documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v1.3.0-RC3/developer/Technical%20Documentation). | ||
| For information on how to upgrade from previous versions please refer to [Version Upgrade](https://github.com/eclipse-tractusx/portal-assets/tree/v1.3.0/developer/Technical%20Documentation/Version%20Upgrade/portal-upgrade-details.md). | ||
|
|
||
| For further information please refer to [Technical Documentation](https://github.com/eclipse-tractusx/portal-assets/tree/v1.3.0/developer/Technical%20Documentation). | ||
|
|
||
| The referenced container images are for demonstration purposes only. | ||
|
|
||
|
|
@@ -39,7 +41,7 @@ To use the helm chart as a dependency: | |
| dependencies: | ||
| - name: portal | ||
| repository: https://eclipse-tractusx.github.io/charts/dev | ||
| version: 1.3.0-RC4 | ||
| version: 1.3.0 | ||
| ``` | ||
| ## Requirements | ||
|
|
@@ -76,13 +78,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.3.0-RC4"` | | | ||
| | frontend.portal.image.portaltag | string | `"v1.3.0"` | | | ||
| | frontend.registration.name | string | `"registration"` | | | ||
| | frontend.registration.image.name | string | `"ghcr.io/catenax-ng/tx-portal-frontend-registration"` | | | ||
| | frontend.registration.image.registrationtag | string | `"v1.3.0-RC2"` | | | ||
| | frontend.registration.image.registrationtag | string | `"v1.3.0"` | | | ||
| | frontend.assets.name | string | `"assets"` | | | ||
| | frontend.assets.image.name | string | `"ghcr.io/catenax-ng/tx-portal-assets"` | | | ||
| | frontend.assets.image.assetstag | string | `"v1.3.0-RC3"` | | | ||
| | frontend.assets.image.assetstag | string | `"v1.3.0"` | | | ||
| | frontend.assets.path | string | `"/assets"` | | | ||
| | frontend.centralidpAuthPath | string | `"/auth"` | | | ||
| | frontend.bpdmPartnersPoolApiPath | string | `"/api"` | | | ||
|
|
@@ -128,7 +130,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.3.0-RC4"` | | | ||
| | backend.registration.image.registrationservicetag | string | `"v1.3.0"` | | | ||
| | backend.registration.logging.registrationServiceBpn | string | `"Information"` | | | ||
| | backend.registration.portalRegistrationPath | string | `"/registration"` | | | ||
| | backend.registration.keycloakClientId | string | `"Cl1-CX-Registration"` | | | ||
|
|
@@ -141,7 +143,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.3.0-RC4"` | | | ||
| | backend.administration.image.administrationservicetag | string | `"v1.3.0"` | | | ||
| | backend.administration.logging.businessLogic | string | `"Information"` | | | ||
| | backend.administration.logging.sdfactoryLibrary | string | `"Information"` | | | ||
| | backend.administration.connectors.validCertificationContentTypes.type0 | string | `"application/x-pem-file"` | | | ||
|
|
@@ -192,11 +194,11 @@ dependencies: | |
| | backend.provisioning.sharedRealm.smtpServer.replyTo | string | `"[email protected]"` | 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.3.0-RC4"` | | | ||
| | backend.provisioning.service.image.provisioningservicetag | string | `"v1.3.0"` | | | ||
| | 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.3.0-RC4"` | | | ||
| | backend.appmarketplace.image.appmarketplaceservicetag | string | `"v1.3.0"` | | | ||
| | backend.appmarketplace.logging.offersLibrary | string | `"Information"` | | | ||
| | backend.appmarketplace.appOverviewPath | string | `"/appoverview"` | | | ||
| | backend.appmarketplace.catenaAdminRoles.role0 | string | `"CX Admin"` | | | ||
|
|
@@ -242,18 +244,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.3.0-RC4"` | | | ||
| | backend.portalmigrations.image.portalmigrationstag | string | `"v1.3.0"` | | | ||
| | 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.3.0-RC4"` | | | ||
| | backend.portalmaintenance.image.portalmaintenancetag | string | `"v1.3.0"` | | | ||
| | 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.3.0-RC4"` | | | ||
| | backend.notification.image.notificationservicetag | string | `"v1.3.0"` | | | ||
| | 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.3.0-RC4"` | | | ||
| | backend.services.image.servicesservicetag | string | `"v1.3.0"` | | | ||
| | backend.services.logging.offersLibrary | string | `"Information"` | | | ||
| | backend.services.serviceMarketplacePath | string | `"/servicemarketplace"` | | | ||
| | backend.services.catenaAdminRoles.role0 | string | `"CX Admin"` | | | ||
|
|
@@ -277,10 +279,10 @@ dependencies: | |
| | backend.services.deleteDocumentTypeIds.type1 | string | `"ADDITIONAL_DETAILS"` | | | ||
| | 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.3.0-RC4"` | | | ||
| | backend.provisioningmigrations.image.provisioningmigrationstag | string | `"v1.3.0"` | | | ||
| | 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.3.0-RC4"` | | | ||
| | backend.checklistworker.image.checklistworkertag | string | `"v1.3.0"` | | | ||
| | backend.checklistworker.logging.checklistLibrary | string | `"Information"` | | | ||
| | backend.checklistworker.logging.bpdmLibrary | string | `"Information"` | | | ||
| | backend.checklistworker.logging.clearinghouseLibrary | string | `"Information"` | | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.