From af26c69e9f2cd54249ddf5c80dcae8f3f52ad301 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Thu, 29 Feb 2024 11:47:50 +0100 Subject: [PATCH] chore(trg-2.04): change portal-cd references to portal ref: https://github.com/eclipse-tractusx/portal-cd/issues/131 --- .github/workflows/build.yml | 2 +- .github/workflows/release-release_candidate.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/release_candidate.yml | 2 +- .tractusx | 2 +- NOTICE.md | 4 ++-- README.md | 2 +- .../Dev Process/Dev-flow_deploy-dev-env.md | 4 ++-- .../Operations/Release-Process.md | 10 +++++----- .../Version Upgrade/portal-upgrade-details.md | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb51000de..2498fb41c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,7 +113,7 @@ jobs: run: | curl -v \ --request POST \ - --url https://api.github.com/repos/eclipse-tractusx/portal-cd/actions/workflows/portal-assets-image-update.yml/dispatches \ + --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-assets-image-update.yml/dispatches \ --header "authorization: Bearer $TOKEN" \ --header "Accept: application/vnd.github.v3+json" \ --data '{"ref":"dev", "inputs": { "new-image":"${{ github.sha }}" }}' \ diff --git a/.github/workflows/release-release_candidate.yml b/.github/workflows/release-release_candidate.yml index b4a99e2b4..c91b22d25 100644 --- a/.github/workflows/release-release_candidate.yml +++ b/.github/workflows/release-release_candidate.yml @@ -140,7 +140,7 @@ jobs: run: | curl -v \ --request POST \ - --url https://api.github.com/repos/eclipse-tractusx/portal-cd/actions/workflows/portal-assets-image-update.yml/dispatches \ + --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-assets-image-update.yml/dispatches \ --header "authorization: Bearer $TOKEN" \ --header "Accept: application/vnd.github.v3+json" \ --data '{"ref":"release-candidate", "inputs": { "new-image":"${{ env.REF_NAME }}" }}' \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57c4e09fa..61462bbdb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -155,7 +155,7 @@ jobs: fi if: steps.hf-check.outputs.hf == 'false' - - name: Determine branch to update in portal-cd + - name: Determine branch to update in portal repository id: cd-branch run: | if [[ ${{ steps.rc-check.outputs.rc }} == 'true' ]]; then @@ -180,7 +180,7 @@ jobs: run: | curl -v \ --request POST \ - --url https://api.github.com/repos/eclipse-tractusx/portal-cd/actions/workflows/portal-assets-image-update.yml/dispatches \ + --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-assets-image-update.yml/dispatches \ --header "authorization: Bearer $TOKEN" \ --header "Accept: application/vnd.github.v3+json" \ --data '{"ref":"${{ steps.cd-branch.outputs.branch }}", "inputs": { "new-image":"${{ env.REF_NAME }}" }}' \ diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml index 737614fd7..276f89c3c 100644 --- a/.github/workflows/release_candidate.yml +++ b/.github/workflows/release_candidate.yml @@ -113,7 +113,7 @@ jobs: run: | curl -v \ --request POST \ - --url https://api.github.com/repos/eclipse-tractusx/portal-cd/actions/workflows/portal-assets-image-update.yml/dispatches \ + --url https://api.github.com/repos/eclipse-tractusx/portal/actions/workflows/portal-assets-image-update.yml/dispatches \ --header "authorization: Bearer $TOKEN" \ --header "Accept: application/vnd.github.v3+json" \ --data '{"ref":"release-candidate", "inputs": { "new-image":"${{ github.sha }}" }}' \ diff --git a/.tractusx b/.tractusx index b52629dca..b21a984fc 100644 --- a/.tractusx +++ b/.tractusx @@ -17,4 +17,4 @@ # SPDX-License-Identifier: Apache-2.0 ############################################################### -leadingRepository: "https://github.com/eclipse-tractusx/portal-cd" +leadingRepository: "https://github.com/eclipse-tractusx/portal" diff --git a/NOTICE.md b/NOTICE.md index 92e0eec80..a5be784a0 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -22,12 +22,12 @@ SPDX-License-Identifier: Apache-2.0 The project maintains the following source code repositories in the GitHub organization https://github.com/eclipse-tractusx: -- https://github.com/eclipse-tractusx/portal-frontend-registration +- https://github.com/eclipse-tractusx/portal - https://github.com/eclipse-tractusx/portal-frontend +- https://github.com/eclipse-tractusx/portal-frontend-registration - https://github.com/eclipse-tractusx/portal-shared-components - https://github.com/eclipse-tractusx/portal-backend - https://github.com/eclipse-tractusx/portal-assets -- https://github.com/eclipse-tractusx/portal-cd - https://github.com/eclipse-tractusx/portal-iam ## Third-party Content diff --git a/README.md b/README.md index 00338eb9f..96bdadd32 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Catena-X Portal application consists of - [portal-assets](https://github.com/eclipse-tractusx/portal-assets) and - [portal-backend](https://github.com/eclipse-tractusx/portal-backend). -![Tag](https://img.shields.io/static/v1?label=&message=LeadingRepository&color=green&style=flat) The helm chart for installing the Catena-X Portal is available in [portal-cd](https://github.com/eclipse-tractusx/portal-cd). +![Tag](https://img.shields.io/static/v1?label=&message=LeadingRepository&color=green&style=flat) The helm chart for installing the Catena-X Portal is available in the [portal](https://github.com/eclipse-tractusx/portal) repository. The Catena-X Portal is designed to work with the [Catena-X IAM](https://github.com/eclipse-tractusx/portal-iam) for further information you can read the [documentation](https://github.com/eclipse-tractusx/portal-iam/tree/main/docs). diff --git a/docs/developer/Technical Documentation/Dev Process/Dev-flow_deploy-dev-env.md b/docs/developer/Technical Documentation/Dev Process/Dev-flow_deploy-dev-env.md index e1bad4937..277180e91 100644 --- a/docs/developer/Technical Documentation/Dev Process/Dev-flow_deploy-dev-env.md +++ b/docs/developer/Technical Documentation/Dev Process/Dev-flow_deploy-dev-env.md @@ -25,12 +25,12 @@ flowchart LR end subgraph CD repo for auto-deploy to dev direction LR - PF --> CD(portal-cd***** -b dev) + PF --> CD(portal***** -b dev) PR --> CD PB --> CD PA --> CD D -- PR* to -b dev for chart --> CD - click CD "https://github.com/eclipse-tractusx/portal-cd" + click CD "https://github.com/eclipse-tractusx/portal" end end subgraph Argo CD - sync to k8s cluster diff --git a/docs/developer/Technical Documentation/Operations/Release-Process.md b/docs/developer/Technical Documentation/Operations/Release-Process.md index 0597f0c25..d6e7f4515 100644 --- a/docs/developer/Technical Documentation/Operations/Release-Process.md +++ b/docs/developer/Technical Documentation/Operations/Release-Process.md @@ -24,7 +24,7 @@ Backend repository: Continuous Deployment / CD repository (containing the portal helm chart) -- [Portal CD](https://github.com/eclipse-tractusx/portal-cd) +- [Portal](https://github.com/eclipse-tractusx/portal) For assigning and incrementing **version** numbers [Semantic Versioning](https://semver.org) is followed. @@ -75,14 +75,14 @@ Be aware that migrations coming release branches for release candidates or from ## RC: checkout release-candidate branch -If starting into a release candidate phase, make sure to checkout the release-candidate branch from dev branch of [Portal CD](https://github.com/eclipse-tractusx/portal-cd). +If starting into a release candidate phase, make sure to checkout the release-candidate branch from dev branch of [Portal](https://github.com/eclipse-tractusx/portal). ## Tag and build of versioned images It's important to pull the latest state of the release branch locally in every repository. Then create and push a tag for the released version. The push of the tag triggers the release workflow action (available in every repository) which creates the versioned image/s. -The push also triggers the image tags to be updated in the helm chart: in the dev branch or respectively the release-candidate branch of the [Portal CD](https://github.com/eclipse-tractusx/portal-cd) repository. +The push also triggers the image tags to be updated in the helm chart: in the dev branch or respectively the release-candidate branch of the [Portal](https://github.com/eclipse-tractusx/portal) repository. Example for tag: @@ -101,7 +101,7 @@ _Version 1.1.0: Backend for the Catena-X Portal_ ## Release new helm chart version Once the versioned images are available, a new version of the chart can be released. -The helm chart is released from [Portal CD](https://github.com/eclipse-tractusx/portal-cd). +The helm chart is released from [Portal](https://github.com/eclipse-tractusx/portal). Check out a release branch from the dev branch or from the release-candidate branch respectively. On the release branch the following steps are executed: @@ -145,7 +145,7 @@ Example: git checkout tags/v1.2.0-RC2 -b release/v1.2.0-RC3 ``` -Technically this step is already possible after [Tag and build of versioned images](#tag-and-build-of-versioned-images), but it's recommended to execute this step after [Release new helm chart version](#release-new-helm-chart-version), so that the image tag for the release in the release-candidate of [Portal CD](https://github.com/eclipse-tractusx/portal-cd) isn't overwritten by the push of the successive 'RC' branch. +Technically this step is already possible after [Tag and build of versioned images](#tag-and-build-of-versioned-images), but it's recommended to execute this step after [Release new helm chart version](#release-new-helm-chart-version), so that the image tag for the release in the release-candidate of [Portal](https://github.com/eclipse-tractusx/portal) isn't overwritten by the push of the successive 'RC' branch. Also make sure to change the base of all open pull requests still pointing to the previous 'RC' branch to the newly pushed 'RC' branch. diff --git a/docs/developer/Technical Documentation/Version Upgrade/portal-upgrade-details.md b/docs/developer/Technical Documentation/Version Upgrade/portal-upgrade-details.md index 1770b78ed..ff1179e7b 100644 --- a/docs/developer/Technical Documentation/Version Upgrade/portal-upgrade-details.md +++ b/docs/developer/Technical Documentation/Version Upgrade/portal-upgrade-details.md @@ -32,7 +32,7 @@ Each section includes the respective change details, impact on existing data and #### PostgreSQL - Upgrade -Please be aware that the PostgreSQL version of the subchart by Bitnami of the [portal helm chart](https://github.com/eclipse-tractusx/portal-cd) is upgraded from 14.5.0 to 15.4.x (dependency updated from version 11.9.13 to 12.12.x). +Please be aware that the PostgreSQL version of the subchart by Bitnami of the [portal helm chart](https://github.com/eclipse-tractusx/portal) is upgraded from 14.5.0 to 15.4.x (dependency updated from version 11.9.13 to 12.12.x). In case you are using an external PostgreSQL instance and would like to upgrade to 15.x, please follow the [official instructions](https://www.postgresql.org/docs/user/15/upgrading.html).