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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 6 commits into from
Jul 13, 2023
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0021d86
fix: Rename controlplane.url.ids to controlplane.url.protocol in helm…
florianrusch-zf Jul 6, 2023
6bb793a
replace ids with dsp
florianrusch-zf Jul 7, 2023
da8e3c5
Remove paths-ignore from run-all-tests.yml workflow
florianrusch-zf Jul 13, 2023
158d0e0
Regenerate chart README's
florianrusch-zf Jul 13, 2023
e481e47
Merge remote-tracking branch 'origin/main' into florianrusch-zf-patch-2
florianrusch-zf Jul 13, 2023
0993bce
Regenerate chart README's
florianrusch-zf Jul 13, 2023
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
6 changes: 3 additions & 3 deletions charts/tractusx-connector-azure-vault/templates/_helpers.tpl
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,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: {}

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/templates/_helpers.tpl
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,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 @@ -279,8 +279,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/templates/_helpers.tpl
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions charts/tractusx-connector-memory/templates/service-runtime.yaml
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,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 @@ -283,8 +283,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/templates/_helpers.tpl
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,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