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

fix(helm charts): Replace all "ids" occurrences in helm charts #586

Merged
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: 0 additions & 2 deletions .github/workflows/run-all-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ on:
types:
- published
pull_request:
paths-ignore:
- 'charts/**'
workflow_dispatch:

concurrency:
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector-azure-vault/README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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 | `{}` | |
Expand Down Expand Up @@ -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 |
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector-azure-vault/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 */}}
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector-azure-vault/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector-legacy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 | `{}` | |
Expand Down Expand Up @@ -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 |
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector-legacy/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 */}}
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector-legacy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector-memory/README.md
Original file line number Diff line number Diff line change
@@ -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!

Expand Down Expand Up @@ -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 |
Expand Down Expand Up @@ -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 |
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector-memory/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 */}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions charts/tractusx-connector-memory/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector/README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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 | `{}` | |
Expand Down Expand Up @@ -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 |
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 */}}
Expand Down
6 changes: 3 additions & 3 deletions charts/tractusx-connector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down