From 256eb4f6826dbe8137cdcf24dc9431100afa7a6a Mon Sep 17 00:00:00 2001 From: Muhammad Saud Khan Date: Thu, 19 Oct 2023 11:59:05 +0200 Subject: [PATCH 1/3] fix: resolve postgres database credentials in edc configuration --- deployment/helm/edc-consumer/README.md | 4 ++-- deployment/helm/edc-consumer/values-beta.yaml | 4 ++-- deployment/helm/edc-provider/README.md | 4 ++-- deployment/helm/edc-provider/values-beta.yaml | 4 ++-- deployment/helm/edc-provider/values-int.yaml | 4 ++-- deployment/helm/edc-provider/values.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deployment/helm/edc-consumer/README.md b/deployment/helm/edc-consumer/README.md index 89bad7e28..cb9e3251c 100644 --- a/deployment/helm/edc-consumer/README.md +++ b/deployment/helm/edc-consumer/README.md @@ -253,11 +253,11 @@ A Helm chart for Tractus-X Eclipse Data Space Connector. This chart is a test mo | tractusx-connector.nameOverride | string | `""` | | | tractusx-connector.participant.id | string | `""` | | | tractusx-connector.postgresql.auth.database | string | `"edc"` | | -| tractusx-connector.postgresql.auth.password | string | `""` | | +| tractusx-connector.postgresql.auth.password | string | `""` | | | tractusx-connector.postgresql.auth.username | string | `""` | | | tractusx-connector.postgresql.fullnameOverride | string | `"postgresql"` | | | tractusx-connector.postgresql.jdbcUrl | string | `"jdbc:postgresql://postgresql:5432/edc"` | | -| tractusx-connector.postgresql.password | string | `""` | | +| tractusx-connector.postgresql.password | string | `""` | | | tractusx-connector.postgresql.username | string | `""` | | | tractusx-connector.serviceAccount.annotations | object | `{}` | | | tractusx-connector.serviceAccount.create | bool | `true` | | diff --git a/deployment/helm/edc-consumer/values-beta.yaml b/deployment/helm/edc-consumer/values-beta.yaml index 4eee14db4..5d4fd62f8 100644 --- a/deployment/helm/edc-consumer/values-beta.yaml +++ b/deployment/helm/edc-consumer/values-beta.yaml @@ -169,10 +169,10 @@ tractusx-connector: postgresql: username: - password: + password: auth: username: - password: + password: vault: diff --git a/deployment/helm/edc-provider/README.md b/deployment/helm/edc-provider/README.md index 3601fbd62..c4874cf46 100644 --- a/deployment/helm/edc-provider/README.md +++ b/deployment/helm/edc-provider/README.md @@ -253,11 +253,11 @@ A Helm chart for Tractus-X Eclipse Data Space Connector. This chart is a test mo | tractusx-connector.nameOverride | string | `""` | | | tractusx-connector.participant.id | string | `""` | | | tractusx-connector.postgresql.auth.database | string | `"edc"` | | -| tractusx-connector.postgresql.auth.password | string | `""` | | +| tractusx-connector.postgresql.auth.password | string | `""` | | | tractusx-connector.postgresql.auth.username | string | `""` | | | tractusx-connector.postgresql.fullnameOverride | string | `"postgresql"` | | | tractusx-connector.postgresql.jdbcUrl | string | `"jdbc:postgresql://postgresqlprovider:5432/edc"` | | -| tractusx-connector.postgresql.password | string | `""` | | +| tractusx-connector.postgresql.password | string | `""` | | | tractusx-connector.postgresql.username | string | `""` | | | tractusx-connector.serviceAccount.annotations | object | `{}` | | | tractusx-connector.serviceAccount.create | bool | `true` | | diff --git a/deployment/helm/edc-provider/values-beta.yaml b/deployment/helm/edc-provider/values-beta.yaml index 797d473fd..480bb48c0 100644 --- a/deployment/helm/edc-provider/values-beta.yaml +++ b/deployment/helm/edc-provider/values-beta.yaml @@ -163,10 +163,10 @@ tractusx-connector: clusterIssuer: "" postgresql: username: - password: + password: auth: username: - password: + password: vault: fullnameOverride: "vault" diff --git a/deployment/helm/edc-provider/values-int.yaml b/deployment/helm/edc-provider/values-int.yaml index 37202c5d4..bbbf8e24e 100644 --- a/deployment/helm/edc-provider/values-int.yaml +++ b/deployment/helm/edc-provider/values-int.yaml @@ -163,10 +163,10 @@ tractusx-connector: clusterIssuer: "" postgresql: username: - password: + password: auth: username: - password: + password: vault: fullnameOverride: "vault" diff --git a/deployment/helm/edc-provider/values.yaml b/deployment/helm/edc-provider/values.yaml index 4a1675cf8..214b8ef91 100644 --- a/deployment/helm/edc-provider/values.yaml +++ b/deployment/helm/edc-provider/values.yaml @@ -515,11 +515,11 @@ tractusx-connector: jdbcUrl: "jdbc:postgresql://postgresqlprovider:5432/edc" fullnameOverride: "postgresql" username: - password: + password: auth: database: "edc" username: - password: + password: vault: fullnameOverride: "vault" From 66d4827b6fbd4ffbbfd3994a8a5320896c35c102 Mon Sep 17 00:00:00 2001 From: Muhammad Saud Khan Date: Fri, 20 Oct 2023 12:12:49 +0200 Subject: [PATCH 2/3] chore: add condition to the dpp backend workflow --- .github/workflows/publish-dpp-backend-docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish-dpp-backend-docker-image.yml b/.github/workflows/publish-dpp-backend-docker-image.yml index ba3c00e6c..04d260da6 100644 --- a/.github/workflows/publish-dpp-backend-docker-image.yml +++ b/.github/workflows/publish-dpp-backend-docker-image.yml @@ -139,6 +139,7 @@ jobs: # Build Java code with Maven - name: Build dpp backend with maven for Docker Hub + if: ${{ github.repository == 'eclipse-tractusx/digital-product-pass' }} run: | cd consumer-backend/productpass mvn -B clean install From 0ad6e36c8c443cad56d65a51d6c9d541989750c8 Mon Sep 17 00:00:00 2001 From: Muhammad Saud Khan Date: Fri, 3 Nov 2023 15:50:02 +0100 Subject: [PATCH 3/3] chore: update changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d423266d..85835e1c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,7 +49,9 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e - Fix IRS job tracker to one single job. - Fix bug related to the broadcast search of digital twin registry - Fix minor bugs related to the digital twin search and the caching mechanism -- Implemented check for transfer complete and passport received fixing bug related to the passport retrieval +- Fix bug related to the passport retrieval by implementing check for transfer complete +- Fix database credentials in the edc postgres configuration +- Fix the condition to the publish dpp backend workflow ## [released]