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 that in Helm config jwtOnly=false will enabled pre-authentication in Ditto #1697

Merged
merged 1 commit into from
Jul 21, 2023
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: 1 addition & 1 deletion deployment/helm/ditto/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ description: |
A digital twin is a virtual, cloud based, representation of his real world counterpart
(real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
type: application
version: 3.3.4 # chart version is effectively set by release-job
version: 3.3.5 # chart version is effectively set by release-job
appVersion: 3.3.4
keywords:
- iot-chart
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/ditto/templates/gateway-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ spec:
value: "{{ .Values.global.prometheus.port }}"
{{- end }}
- name: ENABLE_PRE_AUTHENTICATION
value: "{{ .Values.gateway.config.authentication.enablePreAuthentication }}"
value: "{{ or .Values.gateway.config.authentication.enablePreAuthentication (not .Values.global.jwtOnly) }}"
- name: DEVOPS_SECURED
value: "{{ .Values.gateway.config.authentication.devops.secured }}"
- name: DEVOPS_AUTHENTICATION_METHOD
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/ditto/templates/swaggerui-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ spec:
echo "removing Google auth from ditto-api-2.yml"
sed --in-place "/- Google:/,+1d" /usr/share/nginx/html/openapi/ditto-api-2.yml
sed --in-place "/ Google:/,+9d" /usr/share/nginx/html/openapi/ditto-api-2.yml
{{- if not .Values.gateway.config.authentication.enablePreAuthentication }}
{{- if or (not .Values.gateway.config.authentication.enablePreAuthentication) .Values.global.jwtOnly }}
echo "removing NginxBasic auth from ditto-api-2.yml"
sed --in-place "/- NginxBasic: \[]/d" /usr/share/nginx/html/openapi/ditto-api-2.yml
sed --in-place "/ NginxBasic:/,+3d" /usr/share/nginx/html/openapi/ditto-api-2.yml
Expand Down