Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

Fixing-parent-child-relations in templates #76

Merged
merged 5 commits into from
Oct 26, 2023
Merged

Fixing-parent-child-relations in templates #76

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b46a9a
.Values.allure.auth.oidc to .Values.allure.auth.oidc.enabled
cheshi-mantu Oct 17, 2023
9f9d2f5
moved Values.allure.auth.oidc.syncRoles to Values.allure.auth.oidc.en…
cheshi-mantu Oct 17, 2023
edb8986
removed Values.allure.auth.oidc.syncRoles from if .Values.allure.auth…
cheshi-mantu Oct 17, 2023
7f56433
moved syncRoles higher
cheshi-mantu Oct 19, 2023
55ce86f
SAML syncRoles
cheshi-mantu Oct 19, 2023
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
12 changes: 6 additions & 6 deletions charts/allure-testops/templates/allure/uaa-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ spec:
value: "{{ .Values.allure.auth.ldap.user.searchFilter }}"
- name: {{ .Values.build }}_LOGIN_LDAP_UIDATTRIBUTE
value: "{{ .Values.allure.auth.ldap.uidAttribute }}"
- name: {{ .Values.build }}_LOGIN_LDAP_SYNCROLES
value: "{{ .Values.allure.auth.ldap.syncRoles }}"
{{- if .Values.allure.auth.ldap.syncRoles }}
- name: {{ .Values.build }}_LOGIN_LDAP_GROUPSEARCHBASE
value: "{{ .Values.allure.auth.ldap.group.searchBase }}"
- name: {{ .Values.build }}_LOGIN_LDAP_GROUPSEARCHFILTER
value: "{{ .Values.allure.auth.ldap.group.searchFilter }}"
- name: {{ .Values.build }}_LOGIN_LDAP_GROUPROLEATTRIBUTE
value: "{{ .Values.allure.auth.ldap.group.roleAttribute }}"
- name: {{ .Values.build }}_LOGIN_LDAP_SYNCROLES
value: "{{ .Values.allure.auth.ldap.syncRoles }}"
- name: {{ .Values.build }}_LOGIN_LDAP_GROUPAUTHORITIES_ROLEUSERGROUPS
value: "{{ .Values.allure.auth.ldap.userGroupName }}"
- name: {{ .Values.build }}_LOGIN_LDAP_GROUPAUTHORITIES_ROLEADMINGROUPS
Expand All @@ -168,14 +168,14 @@ spec:
name: {{ $secret_name }}
key: ldapPass
{{- end }}
{{ if .Values.allure.auth.oidc }}
{{ if .Values.allure.auth.oidc.enabled }}
- name: {{ .Values.build }}_LOGIN_OPENID_DEFAULTROLE
value: {{ .Values.allure.auth.defaultRole }}
- name: {{ .Values.build }}_LOGIN_OPENID_GROUPROLEATTRIBUTE
value: {{ .Values.allure.auth.oidc.roleAttribute }}
{{- if .Values.allure.auth.oidc.syncRoles }}
- name: {{ .Values.build }}_LOGIN_OPENID_SYNCROLES
value: "{{ .Values.allure.auth.oidc.syncRoles }}"
{{- if .Values.allure.auth.oidc.syncRoles }}
- name: {{ .Values.build }}_LOGIN_OPENID_GROUPAUTHORITIES_ROLEUSERGROUPS
value: "{{ .Values.allure.auth.oidc.userGroupName }}"
- name: {{ .Values.build }}_LOGIN_OPENID_GROUPAUTHORITIES_ROLEADMINGROUPS
Expand All @@ -191,17 +191,17 @@ spec:
value: {{ .Values.allure.auth.saml.lastNameAttribute }}
- name: {{ .Values.build }}_LOGIN_SAML2_EMAILATTRIBUTE
value: {{ .Values.allure.auth.saml.emailAttribute }}
{{- end }}
{{- if .Values.allure.auth.saml.syncRoles }}
- name: {{ .Values.build }}_LOGIN_SAML2_SYNCROLES
value: "{{ .Values.allure.auth.saml.syncRoles }}"
{{- if .Values.allure.auth.saml.syncRoles }}
- name: {{ .Values.build }}_LOGIN_SAML2_GROUPROLEATTRIBUTE
value: {{ .Values.allure.auth.saml.groups.groupRoleAttribute }}
- name: {{ .Values.build }}_LOGIN_SAML2_GROUPAUTHORITIES_ROLEUSERGROUPS
value: "{{ .Values.allure.auth.saml.groups.roleUserGroups }}"
- name: {{ .Values.build }}_LOGIN_SAML2_GROUPAUTHORITIES_ROLEADMINGROUPS
value: "{{ .Values.allure.auth.saml.groups.roleAdminGroups }}"
{{- end }}
{{- end }}
{{- if .Values.smtp.enabled }}
- name: SPRING_MAIL_HOST
value: {{ .Values.smtp.host }}
Expand Down
Loading