Skip to content

Commit

Permalink
feat(helm): use release.name inside daps dependency (#475)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fty4
fty4 authored Jun 15, 2023
1 parent b1be1fe commit 165d4c4
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 25 deletions.
4 changes: 2 additions & 2 deletions charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data:
omejdn.yml: |-
---
host: http://daps:4567/
host: http://{{ .Release.Name }}-daps:4567/
path_prefix: ''
bind_to: 0.0.0.0
allow_origin: "*"
Expand All @@ -41,7 +41,7 @@ data:
- yaml
user_backend_default: yaml
accept_audience: idsc:IDS_CONNECTORS_ALL
issuer: http://daps:4567/
issuer: http://{{ .Release.Name }}-daps:4567/
environment: development
default_audience:
- idsc:IDS_CONNECTORS_ALL
Expand Down
4 changes: 2 additions & 2 deletions charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ spec:
- name: EDC_OAUTH_CLIENT_ID
value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
- name: EDC_OAUTH_PROVIDER_JWKS_URL
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
- name: EDC_OAUTH_TOKEN_URL
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
- name: EDC_OAUTH_PRIVATE_KEY_ALIAS
value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
- name: EDC_OAUTH_CERTIFICATE_ALIAS
Expand Down
3 changes: 1 addition & 2 deletions charts/tractusx-connector-azure-vault/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,7 @@ vault:
dapsPublicKey: daps-public-key

daps:
fullnameOverride: "daps"
url: ""
url: "http://{{ .Release.Name }}-daps:4567"
clientId: ""
paths:
jwks: /jwks.json
Expand Down
2 changes: 1 addition & 1 deletion charts/tractusx-connector-memory/example.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ vault:
secrets:

daps:
url: "http://daps:4567"
url: "http://{{ .Release.Name }}-daps:4567"
clientId: "99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23:keyid:99:83:A7:17:86:FF:98:93:CE:A0:DD:A1:F1:36:FA:F6:0F:75:0A:23"

backendService:
Expand Down
4 changes: 2 additions & 2 deletions charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data:
omejdn.yml: |-
---
host: http://daps:4567/
host: http://{{ .Release.Name }}-daps:4567/
path_prefix: ''
bind_to: 0.0.0.0
allow_origin: "*"
Expand All @@ -41,7 +41,7 @@ data:
- yaml
user_backend_default: yaml
accept_audience: idsc:IDS_CONNECTORS_ALL
issuer: http://daps:4567/
issuer: http://{{ .Release.Name }}-daps:4567/
environment: development
default_audience:
- idsc:IDS_CONNECTORS_ALL
Expand Down
4 changes: 2 additions & 2 deletions charts/tractusx-connector-memory/templates/deployment-runtime.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ spec:
- name: EDC_OAUTH_CLIENT_ID
value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
- name: EDC_OAUTH_PROVIDER_JWKS_URL
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
- name: EDC_OAUTH_TOKEN_URL
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
- name: EDC_OAUTH_PRIVATE_KEY_ALIAS
value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
- name: EDC_OAUTH_PUBLIC_KEY_ALIAS
Expand Down
3 changes: 1 addition & 2 deletions charts/tractusx-connector-memory/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,7 @@ vault:
server:
postStart: |-
daps:
fullnameOverride: "daps"
url: ""
url: "http://{{ .Release.Name }}-daps:4567"
clientId: ""
paths:
jwks: /jwks.json
Expand Down
4 changes: 2 additions & 2 deletions charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data:
omejdn.yml: |-
---
host: http://daps:4567/
host: http://{{ .Release.Name }}-daps:4567/
path_prefix: ''
bind_to: 0.0.0.0
allow_origin: "*"
Expand All @@ -41,7 +41,7 @@ data:
- yaml
user_backend_default: yaml
accept_audience: idsc:IDS_CONNECTORS_ALL
issuer: http://daps:4567/
issuer: http://{{ .Release.Name }}-daps:4567/
environment: development
default_audience:
- idsc:IDS_CONNECTORS_ALL
Expand Down
4 changes: 2 additions & 2 deletions charts/tractusx-connector/templates/deployment-controlplane.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ spec:
- name: EDC_OAUTH_CLIENT_ID
value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
- name: EDC_OAUTH_PROVIDER_JWKS_URL
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
- name: EDC_OAUTH_TOKEN_URL
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
- name: EDC_OAUTH_PRIVATE_KEY_ALIAS
value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
- name: EDC_OAUTH_CERTIFICATE_ALIAS
Expand Down
3 changes: 1 addition & 2 deletions charts/tractusx-connector/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,7 @@ vault:
dapsPrivateKey: daps-private-key
dapsPublicKey: daps-public-key
daps:
fullnameOverride: "daps"
url: ""
url: "http://{{ .Release.Name }}-daps:4567"
clientId: ""
paths:
jwks: /jwks.json
Expand Down
4 changes: 2 additions & 2 deletions docs/samples/example-dataspace/daps/templates/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data:
omejdn.yml: |-
---
host: http://daps:4567/
host: http://{{ .Release.Name }}-daps:4567/
path_prefix: ''
bind_to: 0.0.0.0
allow_origin: "*"
Expand All @@ -41,7 +41,7 @@ data:
- yaml
user_backend_default: yaml
accept_audience: idsc:IDS_CONNECTORS_ALL
issuer: http://daps:4567/
issuer: http://{{ .Release.Name }}-daps:4567/
environment: development
default_audience:
- idsc:IDS_CONNECTORS_ALL
Expand Down
2 changes: 1 addition & 1 deletion docs/samples/example-dataspace/plato-values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ vault:
secrets:
server:
daps:
url: "http://daps:4567"
url: "http://{{ .Release.Name }}-daps:4567"
clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:69"
backendService:
httpProxyTokenReceiverUrl: "http://backend:8080"
2 changes: 1 addition & 1 deletion docs/samples/example-dataspace/sokrates-values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ vault:
secrets:
server:
daps:
url: "http://daps:4567"
url: "http://{{ .Release.Name }}-daps:4567"
clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"
backendService:
httpProxyTokenReceiverUrl: "http://backend:8080"
2 changes: 1 addition & 1 deletion edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ vault:
secrets:

daps:
url: "http://daps:4567"
url: "http://{{ .Release.Name }}-daps:4567"
clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"

backendService:
Expand Down
2 changes: 1 addition & 1 deletion edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ vault:
secrets:

daps:
url: "http://daps:4567"
url: "http://{{ .Release.Name }}-daps:4567"
clientId: "E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65:keyid:E7:07:2D:74:56:66:31:F0:7B:10:EA:B6:03:06:4C:23:7F:ED:A6:65"

backendService:
Expand Down

0 comments on commit 165d4c4

Please sign in to comment.