Skip to content

Commit 165d4c4

Browse files
fty4fty4
authoredJun 15, 2023
feat(helm): use release.name inside daps dependency (#475)
·
0.9.00.5.0-rc5_rn
1 parent b1be1fe commit 165d4c4

File tree

15 files changed

+22
-25
lines changed

15 files changed

+22
-25
lines changed
 

‎charts/tractusx-connector-azure-vault/subcharts/omejdn/templates/configmap.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data:
3131
3232
omejdn.yml: |-
3333
---
34-
host: http://daps:4567/
34+
host: http://{{ .Release.Name }}-daps:4567/
3535
path_prefix: ''
3636
bind_to: 0.0.0.0
3737
allow_origin: "*"
@@ -41,7 +41,7 @@ data:
4141
- yaml
4242
user_backend_default: yaml
4343
accept_audience: idsc:IDS_CONNECTORS_ALL
44-
issuer: http://daps:4567/
44+
issuer: http://{{ .Release.Name }}-daps:4567/
4545
environment: development
4646
default_audience:
4747
- idsc:IDS_CONNECTORS_ALL

‎charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ spec:
123123
- name: EDC_OAUTH_CLIENT_ID
124124
value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
125125
- name: EDC_OAUTH_PROVIDER_JWKS_URL
126-
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
126+
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
127127
- name: EDC_OAUTH_TOKEN_URL
128-
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
128+
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
129129
- name: EDC_OAUTH_PRIVATE_KEY_ALIAS
130130
value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
131131
- name: EDC_OAUTH_CERTIFICATE_ALIAS

‎charts/tractusx-connector-azure-vault/values.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,7 @@ vault:
523523
dapsPublicKey: daps-public-key
524524

525525
daps:
526-
fullnameOverride: "daps"
527-
url: ""
526+
url: "http://{{ .Release.Name }}-daps:4567"
528527
clientId: ""
529528
paths:
530529
jwks: /jwks.json

‎charts/tractusx-connector-memory/example.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ vault:
6363
secrets:
6464

6565
daps:
66-
url: "http://daps:4567"
66+
url: "http://{{ .Release.Name }}-daps:4567"
6767
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"
6868

6969
backendService:

‎charts/tractusx-connector-memory/subcharts/omejdn/templates/configmap.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data:
3131
3232
omejdn.yml: |-
3333
---
34-
host: http://daps:4567/
34+
host: http://{{ .Release.Name }}-daps:4567/
3535
path_prefix: ''
3636
bind_to: 0.0.0.0
3737
allow_origin: "*"
@@ -41,7 +41,7 @@ data:
4141
- yaml
4242
user_backend_default: yaml
4343
accept_audience: idsc:IDS_CONNECTORS_ALL
44-
issuer: http://daps:4567/
44+
issuer: http://{{ .Release.Name }}-daps:4567/
4545
environment: development
4646
default_audience:
4747
- idsc:IDS_CONNECTORS_ALL

‎charts/tractusx-connector-memory/templates/deployment-runtime.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ spec:
123123
- name: EDC_OAUTH_CLIENT_ID
124124
value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
125125
- name: EDC_OAUTH_PROVIDER_JWKS_URL
126-
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
126+
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
127127
- name: EDC_OAUTH_TOKEN_URL
128-
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
128+
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
129129
- name: EDC_OAUTH_PRIVATE_KEY_ALIAS
130130
value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
131131
- name: EDC_OAUTH_PUBLIC_KEY_ALIAS

‎charts/tractusx-connector-memory/values.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,7 @@ vault:
298298
server:
299299
postStart: |-
300300
daps:
301-
fullnameOverride: "daps"
302-
url: ""
301+
url: "http://{{ .Release.Name }}-daps:4567"
303302
clientId: ""
304303
paths:
305304
jwks: /jwks.json

‎charts/tractusx-connector/subcharts/omejdn/templates/configmap.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data:
3131
3232
omejdn.yml: |-
3333
---
34-
host: http://daps:4567/
34+
host: http://{{ .Release.Name }}-daps:4567/
3535
path_prefix: ''
3636
bind_to: 0.0.0.0
3737
allow_origin: "*"
@@ -41,7 +41,7 @@ data:
4141
- yaml
4242
user_backend_default: yaml
4343
accept_audience: idsc:IDS_CONNECTORS_ALL
44-
issuer: http://daps:4567/
44+
issuer: http://{{ .Release.Name }}-daps:4567/
4545
environment: development
4646
default_audience:
4747
- idsc:IDS_CONNECTORS_ALL

‎charts/tractusx-connector/templates/deployment-controlplane.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ spec:
123123
- name: EDC_OAUTH_CLIENT_ID
124124
value: {{ .Values.daps.clientId | required ".Values.daps.clientId is required" | quote }}
125125
- name: EDC_OAUTH_PROVIDER_JWKS_URL
126-
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.jwks }}
126+
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.jwks }}
127127
- name: EDC_OAUTH_TOKEN_URL
128-
value: {{ printf "%s%s" .Values.daps.url .Values.daps.paths.token }}
128+
value: {{ printf "%s%s" (tpl .Values.daps.url .) .Values.daps.paths.token }}
129129
- name: EDC_OAUTH_PRIVATE_KEY_ALIAS
130130
value: {{ .Values.vault.secretNames.dapsPrivateKey | required ".Values.vault.secretNames.dapsPrivateKey is required" | quote }}
131131
- name: EDC_OAUTH_CERTIFICATE_ALIAS

‎charts/tractusx-connector/values.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,7 @@ vault:
528528
dapsPrivateKey: daps-private-key
529529
dapsPublicKey: daps-public-key
530530
daps:
531-
fullnameOverride: "daps"
532-
url: ""
531+
url: "http://{{ .Release.Name }}-daps:4567"
533532
clientId: ""
534533
paths:
535534
jwks: /jwks.json

‎docs/samples/example-dataspace/daps/templates/configmap.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data:
3131
3232
omejdn.yml: |-
3333
---
34-
host: http://daps:4567/
34+
host: http://{{ .Release.Name }}-daps:4567/
3535
path_prefix: ''
3636
bind_to: 0.0.0.0
3737
allow_origin: "*"
@@ -41,7 +41,7 @@ data:
4141
- yaml
4242
user_backend_default: yaml
4343
accept_audience: idsc:IDS_CONNECTORS_ALL
44-
issuer: http://daps:4567/
44+
issuer: http://{{ .Release.Name }}-daps:4567/
4545
environment: development
4646
default_audience:
4747
- idsc:IDS_CONNECTORS_ALL

‎docs/samples/example-dataspace/plato-values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ vault:
7272
secrets:
7373
server:
7474
daps:
75-
url: "http://daps:4567"
75+
url: "http://{{ .Release.Name }}-daps:4567"
7676
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"
7777
backendService:
7878
httpProxyTokenReceiverUrl: "http://backend:8080"

‎docs/samples/example-dataspace/sokrates-values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ vault:
7171
secrets:
7272
server:
7373
daps:
74-
url: "http://daps:4567"
74+
url: "http://{{ .Release.Name }}-daps:4567"
7575
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"
7676
backendService:
7777
httpProxyTokenReceiverUrl: "http://backend:8080"

‎edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ vault:
9696
secrets:
9797

9898
daps:
99-
url: "http://daps:4567"
99+
url: "http://{{ .Release.Name }}-daps:4567"
100100
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"
101101

102102
backendService:

‎edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ vault:
7878
secrets:
7979

8080
daps:
81-
url: "http://daps:4567"
81+
url: "http://{{ .Release.Name }}-daps:4567"
8282
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"
8383

8484
backendService:

0 commit comments

Comments
 (0)
Please sign in to comment.