From 1d03a6e11f368fd81dd10b91b0d9d7fc29c0cb24 Mon Sep 17 00:00:00 2001 From: Dominik Kaminski Date: Thu, 9 Nov 2023 16:33:30 -0600 Subject: [PATCH] fix(helmfile): Eliminate some yamllint errors --- helmfile/apps/univention-management-stack/helmfile.yaml | 6 +++--- helmfile/apps/xwiki/values.yaml | 9 ++++++--- helmfile/environments/default/images.yaml | 7 +++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/helmfile/apps/univention-management-stack/helmfile.yaml b/helmfile/apps/univention-management-stack/helmfile.yaml index acd775ab..44b4f8db 100644 --- a/helmfile/apps/univention-management-stack/helmfile.yaml +++ b/helmfile/apps/univention-management-stack/helmfile.yaml @@ -23,14 +23,14 @@ repositories: releases: # TODO: Interim, until the UMS stack has a stack umbrella chart and provides a solution - {{- if eq .Values.ingress.ingressClassName "dedicated-haproxy-external" }} + # {{- if eq .Values.ingress.ingressClassName "dedicated-haproxy-external" }} - name: "ums-stack-gateway" chart: "bitnami-repo/nginx" version: "15.3.5" values: - "values-ums-stack-gateway.gotmpl" - condition: "univentionManagementStack.enabled" - {{- end }} + installed: {{ .Values.univentionManagementStack.enabled }} + # {{- end }} - name: "ums-store-dav" chart: "ums-repo/store-dav" version: "0.5.2" diff --git a/helmfile/apps/xwiki/values.yaml b/helmfile/apps/xwiki/values.yaml index 5d43c218..b22fea30 100644 --- a/helmfile/apps/xwiki/values.yaml +++ b/helmfile/apps/xwiki/values.yaml @@ -67,15 +67,18 @@ properties: "property:xwiki:XWiki.AuthService.Configuration^XWiki.AuthService.ConfigurationClass.authService": "oidc" ## Fields to search in when importing users from the administration UI (not completely in scope for now) - "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapUserAttributes": "sn,givenname,uid" + "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapUserAttributes": + "sn,givenname,uid" ## Restrict user import in the UI to global administrators "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.usersAllowedToImport": "globalAdmin" ## Enable group and user synchronization "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.triggerGroupsUpdate": 1 "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.triggerGroupImport": 1 - "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.forceXWikiUsersGroupMembershipUpdate": 1 + "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.forceXWikiUsersGroupMembershipUpdate": + 1 ## Base DN under which groups should be searched for - "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchDN": "dc=swp-ldap,dc=internal" + "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchDN": + "dc=swp-ldap,dc=internal" ## LDAP filter to only synchronize some groups "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchFilter": "(&(objectClass=opendeskKnowledgemanagementGroup)(opendeskKnowledgemanagementEnabled=TRUE))" diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index fd522c19..21f6fc0f 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -173,11 +173,10 @@ images: tag: "2.1.0@sha256:ed56730add8afdb08bef8b43a114aba406fd86d83c7fd7af93dc16bb002fa233" # @supplier: "Open-Xchange" oxConnector: - repository: "souvap/tooling/images/ox-connector/ox-connector-standalone" - tag: - "branch-jconde-listener-entrypoint-chaining\ - @sha256:54748d49e37d52529d4a857ff834d1217bd2cb8c89c7eed25c0873159ed6853c" # @supplier: "Univention" + repository: "souvap/tooling/images/ox-connector/ox-connector-standalone" + tag: "branch-jconde-listener-entrypoint-chaining\ + @sha256:54748d49e37d52529d4a857ff834d1217bd2cb8c89c7eed25c0873159ed6853c" postfix: repository: "souvap/tooling/images/postfix" tag: "1.0.0@sha256:69e0c53ade77ffb89673672f5c8183ec2edfc81d4e990aca3ec594f33c55a7ac"