Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(trg-2.04): change portal-cd references to portal #273

Merged
merged 1 commit into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}" }}' \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-release_candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}" }}' \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}" }}' \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}" }}' \
Expand Down
2 changes: 1 addition & 1 deletion .tractusx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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:

Expand All @@ -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:
Expand Down Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
Loading