Skip to content

Commit

Permalink
Merge pull request #1698 from clemenschuaccso/fix_envs
Browse files Browse the repository at this point in the history
fix: http/mqtt keycloak environment values
  • Loading branch information
hylkevds authored Sep 3, 2023
2 parents bee9858 + 3de78c8 commit 052f3e1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions helm/frost-server/templates/http-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,19 +264,19 @@ spec:
value: "{{ .Values.frost.auth.role.read }}"
{{- end }}
{{- if .Values.frost.auth.role.create }}
- name: auth_role_read
- name: auth_role_create
value: "{{ .Values.frost.auth.role.create }}"
{{- end }}
{{- if .Values.frost.auth.role.update }}
- name: auth_role_read
- name: auth_role_update
value: "{{ .Values.frost.auth.role.update }}"
{{- end }}
{{- if .Values.frost.auth.role.delete }}
- name: auth_role_read
- name: auth_role_delete
value: "{{ .Values.frost.auth.role.delete }}"
{{- end }}
{{- if .Values.frost.auth.role.admin }}
- name: auth_role_read
- name: auth_role_admin
value: "{{ .Values.frost.auth.role.admin }}"
{{- end }}
{{- if contains "basic" (lower .Values.frost.auth.provider) }}
Expand Down Expand Up @@ -320,15 +320,15 @@ spec:
value: "{{ .Values.frost.auth.keycloakConfig }}"
{{- end }}
{{- if .Values.frost.auth.keycloakConfigFile }}
- name: auth_keycloakConfig
- name: auth_keycloakConfigFile
value: "{{ .Values.frost.auth.keycloakConfigFile }}"
{{- end }}
{{- if .Values.frost.auth.keycloakConfigUrl }}
- name: auth_keycloakConfig
- name: auth_keycloakConfigUrl
value: "{{ .Values.frost.auth.keycloakConfigUrl }}"
{{- end }}
{{- if .Values.frost.auth.keycloakConfigSecret }}
- name: auth_keycloakConfig
- name: auth_keycloakConfigSecret
value: "{{ .Values.frost.auth.keycloakConfigSecret }}"
{{- end }}
{{- else }}
Expand Down
14 changes: 7 additions & 7 deletions helm/frost-server/templates/mqtt-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -284,19 +284,19 @@ spec:
value: "{{ .Values.frost.auth.role.read }}"
{{- end }}
{{- if .Values.frost.auth.role.create }}
- name: auth_role_read
- name: auth_role_create
value: "{{ .Values.frost.auth.role.create }}"
{{- end }}
{{- if .Values.frost.auth.role.update }}
- name: auth_role_read
- name: auth_role_update
value: "{{ .Values.frost.auth.role.update }}"
{{- end }}
{{- if .Values.frost.auth.role.delete }}
- name: auth_role_read
- name: auth_role_delete
value: "{{ .Values.frost.auth.role.delete }}"
{{- end }}
{{- if .Values.frost.auth.role.admin }}
- name: auth_role_read
- name: auth_role_admin
value: "{{ .Values.frost.auth.role.admin }}"
{{- end }}
{{- if contains "basic" (lower .Values.frost.auth.provider) }}
Expand Down Expand Up @@ -340,15 +340,15 @@ spec:
value: "{{ .Values.frost.auth.keycloakConfig }}"
{{- end }}
{{- if .Values.frost.auth.keycloakConfigFile }}
- name: auth_keycloakConfig
- name: auth_keycloakConfigFile
value: "{{ .Values.frost.auth.keycloakConfigFile }}"
{{- end }}
{{- if .Values.frost.auth.keycloakConfigUrl }}
- name: auth_keycloakConfig
- name: auth_keycloakConfigUrl
value: "{{ .Values.frost.auth.keycloakConfigUrl }}"
{{- end }}
{{- if .Values.frost.auth.keycloakConfigSecret }}
- name: auth_keycloakConfig
- name: auth_keycloakConfigSecret
value: "{{ .Values.frost.auth.keycloakConfigSecret }}"
{{- end }}
{{- else }}
Expand Down

0 comments on commit 052f3e1

Please sign in to comment.