From 1873aea4e5a2ec399ce7f2dd8a2b1752947ee0a7 Mon Sep 17 00:00:00 2001 From: "Florian Rusch (ZF Friedrichshafen AG)" Date: Thu, 13 Jul 2023 10:29:23 +0200 Subject: [PATCH] fix(helm charts): Replace all "ids" occurrences in helm charts (#586) --- .github/workflows/run-all-tests.yml | 2 -- charts/tractusx-connector-azure-vault/README.md | 6 +++--- .../tractusx-connector-azure-vault/templates/_helpers.tpl | 6 +++--- charts/tractusx-connector-azure-vault/values.yaml | 6 +++--- charts/tractusx-connector-legacy/README.md | 6 +++--- charts/tractusx-connector-legacy/templates/_helpers.tpl | 6 +++--- charts/tractusx-connector-legacy/values.yaml | 6 +++--- charts/tractusx-connector-memory/README.md | 6 +++--- charts/tractusx-connector-memory/templates/_helpers.tpl | 6 +++--- .../templates/service-runtime.yaml | 4 ++-- charts/tractusx-connector-memory/values.yaml | 6 +++--- charts/tractusx-connector/README.md | 6 +++--- charts/tractusx-connector/templates/_helpers.tpl | 6 +++--- charts/tractusx-connector/values.yaml | 6 +++--- 14 files changed, 38 insertions(+), 40 deletions(-) diff --git a/.github/workflows/run-all-tests.yml b/.github/workflows/run-all-tests.yml index 8378e44af..2cfadff55 100644 --- a/.github/workflows/run-all-tests.yml +++ b/.github/workflows/run-all-tests.yml @@ -34,8 +34,6 @@ on: types: - published pull_request: - paths-ignore: - - 'charts/**' workflow_dispatch: concurrency: diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md index b0221e59d..2c421f910 100644 --- a/charts/tractusx-connector-azure-vault/README.md +++ b/charts/tractusx-connector-azure-vault/README.md @@ -1,6 +1,6 @@ # tractusx-connector-azure-vault -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) +![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and Azure KeyVault are included. @@ -92,7 +92,7 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing | | controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls | | controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls | -| controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | ids api, used for inter connector communication and must be internet facing | +| controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | dsp api, used for inter connector communication and must be internet facing | | controlplane.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls | | controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls | | controlplane.env | object | `{}` | | @@ -161,7 +161,7 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | controlplane.ssi.oauth.client.secretAlias | string | `"client-secret"` | The alias under which the client secret is stored in the vault. | | controlplane.ssi.oauth.tokenurl | string | `""` | The URL (of KeyCloak), where access tokens can be obtained | | controlplane.tolerations | list | `[]` | | -| controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) | +| controlplane.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) | | controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | | controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | | customLabels | object | `{}` | To add some custom labels | diff --git a/charts/tractusx-connector-azure-vault/templates/_helpers.tpl b/charts/tractusx-connector-azure-vault/templates/_helpers.tpl index 701e6fc75..c579ca6d6 100644 --- a/charts/tractusx-connector-azure-vault/templates/_helpers.tpl +++ b/charts/tractusx-connector-azure-vault/templates/_helpers.tpl @@ -108,12 +108,12 @@ Create the name of the service account to use {{- end }} {{/* -Control IDS URL +Control DSP URL */}} {{- define "txdc.controlplane.url.protocol" -}} -{{- if .Values.controlplane.url.protocol }}{{/* if ids api url has been specified explicitly */}} +{{- if .Values.controlplane.url.protocol }}{{/* if dsp api url has been specified explicitly */}} {{- .Values.controlplane.url.protocol }} -{{- else }}{{/* else when ids api url has not been specified explicitly */}} +{{- else }}{{/* else when dsp api url has not been specified explicitly */}} {{- with (index .Values.controlplane.ingresses 0) }} {{- if .enabled }}{{/* if ingress enabled */}} {{- if .tls.enabled }}{{/* if TLS enabled */}} diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml index 44b9ed01c..4207bb4ff 100644 --- a/charts/tractusx-connector-azure-vault/values.yaml +++ b/charts/tractusx-connector-azure-vault/values.yaml @@ -101,7 +101,7 @@ controlplane: port: 8083 # -- path for incoming api calls path: /control - # -- ids api, used for inter connector communication and must be internet facing + # -- dsp api, used for inter connector communication and must be internet facing protocol: # -- port for incoming api calls port: 8084 @@ -292,8 +292,8 @@ controlplane: affinity: {} url: - # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used) - ids: "" + # -- Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) + protocol: "" dataplane: image: diff --git a/charts/tractusx-connector-legacy/README.md b/charts/tractusx-connector-legacy/README.md index fe26f9529..f3a1498b2 100644 --- a/charts/tractusx-connector-legacy/README.md +++ b/charts/tractusx-connector-legacy/README.md @@ -2,7 +2,7 @@ > **:exclamation: This Helm Chart is deprecated!** -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) +![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included. @@ -87,7 +87,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0 \ | controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing | | controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls | | controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls | -| controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | ids api, used for inter connector communication and must be internet facing | +| controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | dsp api, used for inter connector communication and must be internet facing | | controlplane.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls | | controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls | | controlplane.env | object | `{}` | | @@ -151,7 +151,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0 \ | controlplane.service.annotations | object | `{}` | | | controlplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. | | controlplane.tolerations | list | `[]` | | -| controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) | +| controlplane.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) | | controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | | controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | | customLabels | object | `{}` | To add some custom labels | diff --git a/charts/tractusx-connector-legacy/templates/_helpers.tpl b/charts/tractusx-connector-legacy/templates/_helpers.tpl index 701e6fc75..c579ca6d6 100644 --- a/charts/tractusx-connector-legacy/templates/_helpers.tpl +++ b/charts/tractusx-connector-legacy/templates/_helpers.tpl @@ -108,12 +108,12 @@ Create the name of the service account to use {{- end }} {{/* -Control IDS URL +Control DSP URL */}} {{- define "txdc.controlplane.url.protocol" -}} -{{- if .Values.controlplane.url.protocol }}{{/* if ids api url has been specified explicitly */}} +{{- if .Values.controlplane.url.protocol }}{{/* if dsp api url has been specified explicitly */}} {{- .Values.controlplane.url.protocol }} -{{- else }}{{/* else when ids api url has not been specified explicitly */}} +{{- else }}{{/* else when dsp api url has not been specified explicitly */}} {{- with (index .Values.controlplane.ingresses 0) }} {{- if .enabled }}{{/* if ingress enabled */}} {{- if .tls.enabled }}{{/* if TLS enabled */}} diff --git a/charts/tractusx-connector-legacy/values.yaml b/charts/tractusx-connector-legacy/values.yaml index 642b84663..c48183a82 100644 --- a/charts/tractusx-connector-legacy/values.yaml +++ b/charts/tractusx-connector-legacy/values.yaml @@ -102,7 +102,7 @@ controlplane: port: 8083 # -- path for incoming api calls path: /control - # -- ids api, used for inter connector communication and must be internet facing + # -- dsp api, used for inter connector communication and must be internet facing protocol: # -- port for incoming api calls port: 8084 @@ -274,8 +274,8 @@ controlplane: # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on affinity: {} url: - # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used) - ids: "" + # -- Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) + protocol: "" dataplane: image: # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md index 00ebeb847..ec427a0ac 100644 --- a/charts/tractusx-connector-memory/README.md +++ b/charts/tractusx-connector-memory/README.md @@ -1,6 +1,6 @@ # tractusx-connector-memory -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) +![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector based on memory. Please only use this for development or testing purposes, never in production workloads! @@ -87,7 +87,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.5.0 \ | runtime.endpoints.management.authKey | string | `""` | authentication key, must be attached to each 'X-Api-Key' request header | | runtime.endpoints.management.path | string | `"/management"` | path for incoming api calls | | runtime.endpoints.management.port | int | `8081` | port for incoming api calls | -| runtime.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | ids api, used for inter connector communication and must be internet facing | +| runtime.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | dsp api, used for inter connector communication and must be internet facing | | runtime.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls | | runtime.endpoints.protocol.port | int | `8084` | port for incoming api calls | | runtime.endpoints.validation | object | `{"path":"/validation","port":8082}` | validation api, only used by the data plane and should not be added to any ingress | @@ -158,7 +158,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.5.0 \ | runtime.ssi.oauth.client.secretAlias | string | `"client-secret"` | The alias under which the client secret is stored in the vault. | | runtime.ssi.oauth.tokenurl | string | `""` | The URL (of KeyCloak), where access tokens can be obtained | | runtime.tolerations | list | `[]` | | -| runtime.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) | +| runtime.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) | | runtime.url.public | string | `""` | | | runtime.url.readiness | string | `""` | | | runtime.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | diff --git a/charts/tractusx-connector-memory/templates/_helpers.tpl b/charts/tractusx-connector-memory/templates/_helpers.tpl index bbe52eb41..9788b6641 100644 --- a/charts/tractusx-connector-memory/templates/_helpers.tpl +++ b/charts/tractusx-connector-memory/templates/_helpers.tpl @@ -83,12 +83,12 @@ Create the name of the service account to use {{- end }} {{/* -Control IDS URL +Control DSP URL */}} {{- define "txdc.runtime.url.protocol" -}} -{{- if .Values.runtime.url.protocol }}{{/* if ids api url has been specified explicitly */}} +{{- if .Values.runtime.url.protocol }}{{/* if dsp api url has been specified explicitly */}} {{- .Values.runtime.url.protocol }} -{{- else }}{{/* else when ids api url has not been specified explicitly */}} +{{- else }}{{/* else when dsp api url has not been specified explicitly */}} {{- with (index .Values.runtime.ingresses 0) }} {{- if .enabled }}{{/* if ingress enabled */}} {{- if .tls.enabled }}{{/* if TLS enabled */}} diff --git a/charts/tractusx-connector-memory/templates/service-runtime.yaml b/charts/tractusx-connector-memory/templates/service-runtime.yaml index 572e51068..1739eb938 100644 --- a/charts/tractusx-connector-memory/templates/service-runtime.yaml +++ b/charts/tractusx-connector-memory/templates/service-runtime.yaml @@ -48,8 +48,8 @@ spec: protocol: TCP name: validation - port: {{ .Values.runtime.endpoints.protocol.port }} - targetPort: ids + targetPort: protocol protocol: TCP - name: ids + name: protocol selector: {{- include "txdc.runtime.selectorLabels" . | nindent 4 }} diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml index 4c64287a6..b5d61140e 100644 --- a/charts/tractusx-connector-memory/values.yaml +++ b/charts/tractusx-connector-memory/values.yaml @@ -100,7 +100,7 @@ runtime: port: 8083 # -- path for incoming api calls path: /control - # -- ids api, used for inter connector communication and must be internet facing + # -- dsp api, used for inter connector communication and must be internet facing protocol: # -- port for incoming api calls port: 8084 @@ -284,8 +284,8 @@ runtime: # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on affinity: {} url: - # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used) - ids: "" + # -- Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) + protocol: "" public: "" readiness: "" vault: diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md index 98e087d49..a7e237bb4 100644 --- a/charts/tractusx-connector/README.md +++ b/charts/tractusx-connector/README.md @@ -1,6 +1,6 @@ # tractusx-connector -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) +![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) A Helm chart for Tractus-X Eclipse Data Space Connector. The connector deployment consists of two runtime consists of a Control Plane and a Data Plane. Note that _no_ external dependencies such as a PostgreSQL database and HashiCorp Vault are included. @@ -86,7 +86,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0 \ | controlplane.endpoints.metrics | object | `{"path":"/metrics","port":9090}` | metrics api, used for application metrics, must not be internet facing | | controlplane.endpoints.metrics.path | string | `"/metrics"` | path for incoming api calls | | controlplane.endpoints.metrics.port | int | `9090` | port for incoming api calls | -| controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | ids api, used for inter connector communication and must be internet facing | +| controlplane.endpoints.protocol | object | `{"path":"/api/v1/dsp","port":8084}` | dsp api, used for inter connector communication and must be internet facing | | controlplane.endpoints.protocol.path | string | `"/api/v1/dsp"` | path for incoming api calls | | controlplane.endpoints.protocol.port | int | `8084` | port for incoming api calls | | controlplane.env | object | `{}` | | @@ -155,7 +155,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.5.0 \ | controlplane.ssi.oauth.client.secretAlias | string | `"client-secret"` | The alias under which the client secret is stored in the vault. | | controlplane.ssi.oauth.tokenurl | string | `""` | The URL (of KeyCloak), where access tokens can be obtained | | controlplane.tolerations | list | `[]` | | -| controlplane.url.ids | string | `""` | Explicitly declared url for reaching the ids api (e.g. if ingresses not used) | +| controlplane.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) | | controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | | controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | | customLabels | object | `{}` | To add some custom labels | diff --git a/charts/tractusx-connector/templates/_helpers.tpl b/charts/tractusx-connector/templates/_helpers.tpl index 701e6fc75..c579ca6d6 100644 --- a/charts/tractusx-connector/templates/_helpers.tpl +++ b/charts/tractusx-connector/templates/_helpers.tpl @@ -108,12 +108,12 @@ Create the name of the service account to use {{- end }} {{/* -Control IDS URL +Control DSP URL */}} {{- define "txdc.controlplane.url.protocol" -}} -{{- if .Values.controlplane.url.protocol }}{{/* if ids api url has been specified explicitly */}} +{{- if .Values.controlplane.url.protocol }}{{/* if dsp api url has been specified explicitly */}} {{- .Values.controlplane.url.protocol }} -{{- else }}{{/* else when ids api url has not been specified explicitly */}} +{{- else }}{{/* else when dsp api url has not been specified explicitly */}} {{- with (index .Values.controlplane.ingresses 0) }} {{- if .enabled }}{{/* if ingress enabled */}} {{- if .tls.enabled }}{{/* if TLS enabled */}} diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml index 617c48a05..aedf8c299 100644 --- a/charts/tractusx-connector/values.yaml +++ b/charts/tractusx-connector/values.yaml @@ -101,7 +101,7 @@ controlplane: port: 8083 # -- path for incoming api calls path: /control - # -- ids api, used for inter connector communication and must be internet facing + # -- dsp api, used for inter connector communication and must be internet facing protocol: # -- port for incoming api calls port: 8084 @@ -290,8 +290,8 @@ controlplane: # [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) to configure which nodes the pods can be scheduled on affinity: {} url: - # -- Explicitly declared url for reaching the ids api (e.g. if ingresses not used) - ids: "" + # -- Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) + protocol: "" dataplane: image: # -- Which derivate of the data plane to use. when left empty the deployment will select the correct image automatically