From 68bac2345382f293a0f2a07bc29f8754c4631063 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Wed, 17 Apr 2024 13:42:28 +0200 Subject: [PATCH 1/4] fix(charts): [#xxx] irs-helm rename --- .../templates/configmap-spring-app-config.yaml | 2 +- charts/item-relationship-service/values.yaml | 4 ++-- local/deployment/full-irs/values-dev.yaml | 2 +- local/deployment/full-irs/values.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/item-relationship-service/templates/configmap-spring-app-config.yaml b/charts/item-relationship-service/templates/configmap-spring-app-config.yaml index 7225bd3182..32bd73b6ec 100644 --- a/charts/item-relationship-service/templates/configmap-spring-app-config.yaml +++ b/charts/item-relationship-service/templates/configmap-spring-app-config.yaml @@ -101,7 +101,7 @@ data: irs-edc-client: callback: mapping: {{ .Values.edc.callbackMapping | default "/internal/endpoint-data-reference" | quote }} - callback-url: {{ tpl (.Values.edc.callbackurl | default (printf "http://%s%s" .Release.Name "-irs-helm:8181/internal/endpoint-data-reference")) . | quote }} + callback-url: {{ tpl (.Values.edc.callbackurl | default (printf "http://%s%s" .Release.Name "-item-relationship-service:8181/internal/endpoint-data-reference")) . | quote }} asyncTimeout: {{ tpl .Values.edc.asyncTimeout . | default "PT10M" | quote }} controlplane: request-ttl: {{ .Values.edc.controlplane.request.ttl | default "PT10M" | quote }} diff --git a/charts/item-relationship-service/values.yaml b/charts/item-relationship-service/values.yaml index 653b72b54f..11e51ed895 100644 --- a/charts/item-relationship-service/values.yaml +++ b/charts/item-relationship-service/values.yaml @@ -294,7 +294,7 @@ prometheus: metrics_path: '/actuator/prometheus' scrape_interval: 5s static_configs: - - targets: [ '{{ .Release.Name }}-irs-helm:4004' ] + - targets: [ '{{ .Release.Name }}-item-relationship-service:4004' ] - job_name: 'minio-actuator' metrics_path: /minio/v2/metrics/cluster @@ -316,7 +316,7 @@ grafana: password: # admin: - existingSecret: "{{ .Release.Name }}-irs-helm" + existingSecret: "{{ .Release.Name }}-item-relationship-service" userKey: grafanaUser passwordKey: grafanaPassword diff --git a/local/deployment/full-irs/values-dev.yaml b/local/deployment/full-irs/values-dev.yaml index baede85773..815e29251d 100644 --- a/local/deployment/full-irs/values-dev.yaml +++ b/local/deployment/full-irs/values-dev.yaml @@ -592,7 +592,7 @@ irs: metrics_path: '/actuator/prometheus' scrape_interval: 5s static_configs: - - targets: [ '{{ .Release.Name }}-irs-helm:4004' ] + - targets: [ '{{ .Release.Name }}-item-relationship-service:4004' ] - job_name: 'minio-actuator' metrics_path: /minio/v2/metrics/cluster diff --git a/local/deployment/full-irs/values.yaml b/local/deployment/full-irs/values.yaml index e18558a24a..167958da00 100644 --- a/local/deployment/full-irs/values.yaml +++ b/local/deployment/full-irs/values.yaml @@ -593,7 +593,7 @@ irs: metrics_path: '/actuator/prometheus' scrape_interval: 5s static_configs: - - targets: [ '{{ .Release.Name }}-irs-helm:4004' ] + - targets: [ '{{ .Release.Name }}-item-relationship-service:4004' ] - job_name: 'minio-actuator' metrics_path: /minio/v2/metrics/cluster From f6b97f7e73b27b5d9f577bca6721537ae46b8226 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Wed, 17 Apr 2024 14:01:50 +0200 Subject: [PATCH 2/4] fix(charts): [#xxx] irs-helm rename -- update changelog --- charts/item-relationship-service/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/charts/item-relationship-service/CHANGELOG.md b/charts/item-relationship-service/CHANGELOG.md index 9e0b67d74a..9664a3cb51 100644 --- a/charts/item-relationship-service/CHANGELOG.md +++ b/charts/item-relationship-service/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- Fix for incomplete renaming of Helm chart (see #489) + + ## [7.0.0] - 2024-04-16 From 54a0f6e0e55ffd1252e4c82ac1c2dab7ca6ce545 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Wed, 17 Apr 2024 16:05:51 +0200 Subject: [PATCH 3/4] fix(charts): [#xxx] prepare chart release 7.0.1 --- charts/item-relationship-service/CHANGELOG.md | 7 +++++++ charts/item-relationship-service/Chart.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/item-relationship-service/CHANGELOG.md b/charts/item-relationship-service/CHANGELOG.md index 9e0b67d74a..cbd1d465f8 100644 --- a/charts/item-relationship-service/CHANGELOG.md +++ b/charts/item-relationship-service/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [7.0.1] - 2024-04-17 + +### Fixed + +- Renamed item relationship service Helm chart from "irs-helm" to "item-relationship-service" (Fix). #489 + + ## [7.0.0] - 2024-04-16 ### Changed diff --git a/charts/item-relationship-service/Chart.yaml b/charts/item-relationship-service/Chart.yaml index 0ef5f98bef..4741a6a94d 100644 --- a/charts/item-relationship-service/Chart.yaml +++ b/charts/item-relationship-service/Chart.yaml @@ -35,7 +35,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 7.0.0 +version: 7.0.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. From 2d48c2dba4ad9b84309f0f3aae109ded80dee362 Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Wed, 17 Apr 2024 16:09:47 +0200 Subject: [PATCH 4/4] fix(charts): [#xxx] update CONTRIBUTING.md --- CONTRIBUTING.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d1692a3fa..86bb6fd8d0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -168,6 +168,8 @@ https://github.com/google/google-java-format/blob/master/README.md#intellij-jre- ### Create a Release +#### Full release + 1. Choose a release version using [semantic versioning](https://semver.org/spec/v2.0.0.html) and create a corresponding branch according to the template: `chore/prepare-release-x.x.x`. 2. Add release notes for new version in [CHANGELOG.md](CHANGELOG.md) @@ -196,6 +198,16 @@ https://github.com/google/google-java-format/blob/master/README.md#intellij-jre- _(replace x.x.x with IRS version to release, y.y.y with IRS helm version to release and w.w.w with previous IRS version)_ +#### Release chart only + +1. Choose a release version using [semantic versioning](https://semver.org/spec/v2.0.0.html) + and create a corresponding branch according to the template: `chore/release-chart-x.x.x`. +2. Add new version to [charts/item-relationship-service/CHANGELOG.md](charts/item-relationship-service/CHANGELOG.md) +3. Change chart version in [Chart.yaml](charts/item-relationship-service/Chart.yaml) +4. Create pull request from [release preparation branch to main](https://github.com/eclipse-tractusx/item-relationship-service/compare/chore/release-chart-x.x.x) +5. Merge this pull request to main. +6. Wait for release workflow to complete. + ## Contact