Skip to content

Commit 57760f9

Browse files
authored
minor helm cleanup (#550)
1 parent f94df73 commit 57760f9

12 files changed

Lines changed: 34 additions & 26 deletions

File tree

charts/plgd-hub/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,19 @@ global:
3838
# -- clientSecret or clientSecretFile
3939
clientSecret:
4040
#clientSecretFile:
41+
# -- OAuth2.0 Scopes
42+
scopes: []
43+
# -- OAuth2.0 token audience
44+
audience:
4145
# -- Redirect URL. In case you are using mobile app, redirectURL should be in format cloud.plgd.mobile://login-callback
4246
redirectURL:
4347
# -- Use in httpgateway.ui.webConfiguration.deviceOAuthClient configuration. Default first item in list
4448
useInUi: true
4549
web:
4650
# -- ClientID used by Web UI
4751
clientID:
52+
# -- OAuth2.0 token audience
53+
audience:
4854
```
4955
5056
### Setup with OAuth Mock server:
Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
{{ .Chart.Description }}
22

3-
For more information about plgd-hub, follow: https://github.com/plgd-dev/hub/
3+
For more information about plgd hub, follow: https://github.com/plgd-dev/hub/
4+
If you would like to chat with us, join gitter: https://gitter.im/ocfcloud/Lobby
45

56
PARAMETERS:
67
----------------------------------------------------------
78
{{- if $.Values.coapgateway.enabled }}
8-
coap-gateway uri: {{ printf "coap+tcp://%s:%v" ( required "global.domain is required" ( $.Values.coapgateway.apis.coap.externalAddress | default $.Values.global.domain )) $.Values.coapgateway.port }}
9+
CoAP Gateway: {{ printf "coap+tcp://%s:%v" ( required "global.domain is required" ( $.Values.coapgateway.apis.coap.externalAddress | default $.Values.global.domain )) $.Values.coapgateway.port }}
910
{{- end }}
1011
{{- if $.Values.httpgateway.enabled }}
11-
Web UI uri: {{ printf "https://%s" ( include "plgd-hub.httpgateway.uiDomain" . ) }}
12-
http-gateway uri: {{ printf "https://%s" ( include "plgd-hub.httpgateway.apiDomain" . ) }}
12+
HTTP Gateway - UI: {{ printf "https://%s" ( include "plgd-hub.httpgateway.uiDomain" . ) }}
13+
HTTP Gateway - API: {{ printf "https://%s" ( include "plgd-hub.httpgateway.apiDomain" . ) }}
1314
{{- end }}
1415
{{- if $.Values.mockoauthserver.enabled }}
1516
------- Mock OAuth server enabled !!!!! ------------------
16-
You enabled mocked version of OAuth Server used only for test/development purpose. Use with extra care. Could not
17-
be used for production environment !!!
18-
Mock OAuth server: {{ include "plgd-hub.mockoauthserver.uri" . }}
17+
You enabled mocked version of the OAuth Server used only for test/development purposes. Use with extra care.
18+
Do not use in production !!!
19+
Mock OAuth Server: {{ include "plgd-hub.mockoauthserver.uri" . }}
1920
----------------------------------------------------------
2021
{{- else }}
2122
OAuth server: {{ $.Values.global.authority }}
2223
{{- end }}
24+
25+
Thank you for using plgd hub!

charts/plgd-hub/templates/certificate-authority/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ spec:
7979
{{- toYaml . | nindent 12 }}
8080
{{- end }}
8181
volumeMounts:
82-
- mountPath: {{ .Values.certificateauthority.config.mountPath }}
83-
name: {{ .Values.certificateauthority.config.volume }}
82+
- name: {{ .Values.certificateauthority.config.volume }}
83+
mountPath: {{ .Values.certificateauthority.config.mountPath }}
8484
{{- if ( include "plgd-hub.certificateauthority.createServiceCertByCm" . ) }}
8585
- name: service-crt
8686
mountPath: {{ $cert }}

charts/plgd-hub/templates/coap-gateway/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ spec:
7878
{{- toYaml . | nindent 12 }}
7979
{{- end }}
8080
volumeMounts:
81-
- mountPath: {{ .Values.coapgateway.config.mountPath }}
82-
name: {{ .Values.coapgateway.config.volume }}
81+
- name: {{ .Values.coapgateway.config.volume }}
82+
mountPath: {{ .Values.coapgateway.config.mountPath }}
8383
{{- if ( include "plgd-hub.coapgateway.createServiceCertByCm" . ) }}
8484
- name: service-crt
8585
mountPath: {{ $rdServiceCert }}

charts/plgd-hub/templates/grpc-gateway/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ spec:
7878
{{- toYaml . | nindent 12 }}
7979
{{- end }}
8080
volumeMounts:
81-
- mountPath: {{ .Values.grpcgateway.config.mountPath }}
82-
name: {{ .Values.grpcgateway.config.volume }}
81+
- name: {{ .Values.grpcgateway.config.volume }}
82+
mountPath: {{ .Values.grpcgateway.config.mountPath }}
8383
{{- if ( include "plgd-hub.grpcgateway.createServiceCertByCm" . ) }}
8484
- name: service-crt
8585
mountPath: {{ $cert }}

charts/plgd-hub/templates/http-gateway/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ spec:
7878
{{- toYaml . | nindent 12 }}
7979
{{- end }}
8080
volumeMounts:
81-
- mountPath: {{ .Values.httpgateway.config.mountPath }}
82-
name: {{ .Values.httpgateway.config.volume }}
81+
- name: {{ .Values.httpgateway.config.volume }}
82+
mountPath: {{ .Values.httpgateway.config.mountPath }}
8383
{{- if ( include "plgd-hub.httpgateway.createServiceCertByCm" . ) }}
8484
- name: service-crt
8585
mountPath: {{ $rdServiceCert }}

charts/plgd-hub/templates/identity-store/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ spec:
7878
{{- toYaml . | nindent 12 }}
7979
{{- end }}
8080
volumeMounts:
81-
- mountPath: {{ .Values.identitystore.config.mountPath }}
82-
name: {{ .Values.identitystore.config.volume }}
81+
- name: {{ .Values.identitystore.config.volume }}
82+
mountPath: {{ .Values.identitystore.config.mountPath }}
8383
{{- if ( include "plgd-hub.identitystore.createServiceCertByCm" . ) }}
8484
- name: service-crt
8585
mountPath: {{ $cert }}

charts/plgd-hub/templates/mock-oauth-server/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ spec:
9090
{{- toYaml . | nindent 12 }}
9191
{{- end }}
9292
volumeMounts:
93-
- mountPath: {{ .Values.mockoauthserver.config.mountPath }}
94-
name: {{ .Values.mockoauthserver.config.volume }}
93+
- name: {{ .Values.mockoauthserver.config.volume }}
94+
mountPath: {{ .Values.mockoauthserver.config.mountPath }}
9595
{{- if ( include "plgd-hub.mockoauthserver.createServiceCertByCm" . ) }}
9696
- name: service-crt
9797
mountPath: {{ $rdServiceCert }}

charts/plgd-hub/templates/resource-aggregate/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ spec:
7878
{{- toYaml . | nindent 12 }}
7979
{{- end }}
8080
volumeMounts:
81-
- mountPath: {{ .Values.resourceaggregate.config.mountPath }}
82-
name: {{ .Values.resourceaggregate.config.volume }}
81+
- name: {{ .Values.resourceaggregate.config.volume }}
82+
mountPath: {{ .Values.resourceaggregate.config.mountPath }}
8383
{{- if ( include "plgd-hub.resourceaggregate.createServiceCertByCm" . ) }}
8484
- name: service-crt
8585
mountPath: {{ $rdServiceCert }}

charts/plgd-hub/templates/resource-directory/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ spec:
7878
{{- toYaml . | nindent 12 }}
7979
{{- end }}
8080
volumeMounts:
81-
- mountPath: {{ .Values.resourcedirectory.config.mountPath }}
82-
name: {{ .Values.resourcedirectory.config.volume }}
81+
- name: {{ .Values.resourcedirectory.config.volume }}
82+
mountPath: {{ .Values.resourcedirectory.config.mountPath }}
8383
{{- if ( include "plgd-hub.resourcedirectory.createServiceCertByCm" . ) }}
8484
- name: service-crt
8585
mountPath: {{ $rdServiceCert }}

0 commit comments

Comments
 (0)