From fbb387198798d75f8cb6761bc9295535be6aa6f1 Mon Sep 17 00:00:00 2001 From: RHJ5FE Date: Tue, 14 Nov 2023 15:55:22 +0100 Subject: [PATCH 1/5] initial revision --- .github/workflows/helm-test.yml | 14 ++++++++++++++ CHANGELOG.md | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml index b8258fa..e855129 100644 --- a/.github/workflows/helm-test.yml +++ b/.github/workflows/helm-test.yml @@ -29,6 +29,11 @@ on: default: 'kindest/node:v1.24.6' required: false type: string + upgrade_from: + description: 'chart version to upgrade from' + default: '0.1.13' + required: false + type: string jobs: lint-test: @@ -72,4 +77,13 @@ jobs: - name: Run chart-testing (install) run: ct install --charts charts/bpndiscovery --config charts/chart-testing-config.yaml + if: steps.list-changed.outputs.changed == 'true' + + - name: Run helm upgrade + run: | + helm repo add bitnami https://charts.bitnami.com/bitnami + helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev + helm install bpndiscovery tractusx-dev/bpndiscovery --version ${{ github.event.inputs.upgrade_from || '0.1.13' }} + helm dependency update charts/bpndiscovery + helm upgrade bpndiscovery charts/bpndiscovery if: steps.list-changed.outputs.changed == 'true' \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index a141d9f..96534e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.2.7 +### Added +- Added helm upgrade feature into helm test + +## fixed + ## 0.2.6 ### Added - Introduced versioning of the APIs of the Discovery Services.First version of this API is 1.0 From 5c44b2572535637df2e730dc7ebf6d7cbf1c6e9e Mon Sep 17 00:00:00 2001 From: RHJ5FE Date: Wed, 15 Nov 2023 08:37:04 +0100 Subject: [PATCH 2/5] testing helm upgrade --- charts/bpndiscovery/Chart.yaml | 2 +- charts/bpndiscovery/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/bpndiscovery/Chart.yaml b/charts/bpndiscovery/Chart.yaml index 5335f5c..9475c6b 100644 --- a/charts/bpndiscovery/Chart.yaml +++ b/charts/bpndiscovery/Chart.yaml @@ -24,7 +24,7 @@ sources: - https://github.com/eclipse-tractusx/sldt-bpn-discovery type: application -version: 0.1.13 +version: 0.1.14 appVersion: 0.2.6 dependencies: diff --git a/charts/bpndiscovery/values.yaml b/charts/bpndiscovery/values.yaml index 62fb4be..a929ddd 100644 --- a/charts/bpndiscovery/values.yaml +++ b/charts/bpndiscovery/values.yaml @@ -32,7 +32,7 @@ bpndiscovery: authentication: false idp: issuerUri: "https://idp-url" - publicClientId: idpClientID + publicClientId: idpClientID1 bpnIdClaimName: bpn ## Needed for the self-registration on discovery-finder bpndiscoveryEndpoint: From 8d634cd553867cf80322569508331f2e77ad73d6 Mon Sep 17 00:00:00 2001 From: RHJ5FE Date: Wed, 15 Nov 2023 08:45:08 +0100 Subject: [PATCH 3/5] reverted testing helm upgrade configuration --- charts/bpndiscovery/Chart.yaml | 2 +- charts/bpndiscovery/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/bpndiscovery/Chart.yaml b/charts/bpndiscovery/Chart.yaml index 9475c6b..5335f5c 100644 --- a/charts/bpndiscovery/Chart.yaml +++ b/charts/bpndiscovery/Chart.yaml @@ -24,7 +24,7 @@ sources: - https://github.com/eclipse-tractusx/sldt-bpn-discovery type: application -version: 0.1.14 +version: 0.1.13 appVersion: 0.2.6 dependencies: diff --git a/charts/bpndiscovery/values.yaml b/charts/bpndiscovery/values.yaml index a929ddd..62fb4be 100644 --- a/charts/bpndiscovery/values.yaml +++ b/charts/bpndiscovery/values.yaml @@ -32,7 +32,7 @@ bpndiscovery: authentication: false idp: issuerUri: "https://idp-url" - publicClientId: idpClientID1 + publicClientId: idpClientID bpnIdClaimName: bpn ## Needed for the self-registration on discovery-finder bpndiscoveryEndpoint: From 5d6a15c37a55697b861afc40d14875ed76107d9e Mon Sep 17 00:00:00 2001 From: RHJ5FE Date: Wed, 22 Nov 2023 11:33:01 +0100 Subject: [PATCH 4/5] updated helm-test.yml --- .github/workflows/helm-test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml index e855129..a59a9b3 100644 --- a/.github/workflows/helm-test.yml +++ b/.github/workflows/helm-test.yml @@ -26,7 +26,7 @@ on: node_image: description: 'kindest/node image for k8s kind cluster' # k8s version from 3.1 release as default - default: 'kindest/node:v1.24.6' + default: 'kindest/node:v1.27.3' required: false type: string upgrade_from: @@ -48,9 +48,9 @@ jobs: uses: container-tools/kind-action@v1 with: # upgrade version, default (v0.17.0) uses node image v1.21.1 and doesn't work with more recent node image versions - version: v0.19.0 + version: v0.20.0 # default value for event_name != workflow_dispatch - node_image: ${{ github.event.inputs.node_image || 'kindest/node:v1.24.6' }} + node_image: ${{ github.event.inputs.node_image || 'kindest/node:v1.27.3' }} - name: Set up Helm uses: azure/setup-helm@v3 @@ -77,7 +77,7 @@ jobs: - name: Run chart-testing (install) run: ct install --charts charts/bpndiscovery --config charts/chart-testing-config.yaml - if: steps.list-changed.outputs.changed == 'true' + if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true' - name: Run helm upgrade run: | @@ -86,4 +86,4 @@ jobs: helm install bpndiscovery tractusx-dev/bpndiscovery --version ${{ github.event.inputs.upgrade_from || '0.1.13' }} helm dependency update charts/bpndiscovery helm upgrade bpndiscovery charts/bpndiscovery - if: steps.list-changed.outputs.changed == 'true' \ No newline at end of file + if: github.event_name != 'pull_request' || steps.list-changed.outputs.changed == 'true' \ No newline at end of file From 127797372db650d89166dd4297fee28b9b3f11d7 Mon Sep 17 00:00:00 2001 From: RHJ5FE Date: Wed, 22 Nov 2023 11:53:11 +0100 Subject: [PATCH 5/5] updated CHANGELOG.md --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96534e1..a141d9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,6 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## 0.2.7 -### Added -- Added helm upgrade feature into helm test - -## fixed - ## 0.2.6 ### Added - Introduced versioning of the APIs of the Discovery Services.First version of this API is 1.0