chore(helmfile): Use string compare instead of nil evaluation

This commit is contained in:
Dominik Kaminski
2025-01-29 19:35:59 +01:00
committed by Thorsten Roßner
parent e23c97430f
commit c51c92536a
8 changed files with 16 additions and 16 deletions

View File

@@ -28,7 +28,7 @@ releases:
version: "{{ .Values.charts.collabora.version }}" version: "{{ .Values.charts.collabora.version }}"
values: values:
- "values.yaml.gotmpl" - "values.yaml.gotmpl"
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
- "values-enterprise.yaml.gotmpl" - "values-enterprise.yaml.gotmpl"
{{- end }} {{- end }}
{{- range .Values.customization.release.collaboraOnline }} {{- range .Values.customization.release.collaboraOnline }}
@@ -39,7 +39,7 @@ releases:
chart: "collabora-controller-repo/{{ .Values.charts.collaboraController.name }}" chart: "collabora-controller-repo/{{ .Values.charts.collaboraController.name }}"
version: "{{ .Values.charts.collaboraController.version }}" version: "{{ .Values.charts.collaboraController.version }}"
values: values:
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
- "values-coco-enterprise.yaml.gotmpl" - "values-coco-enterprise.yaml.gotmpl"
{{- end }} {{- end }}
{{- range .Values.customization.release.collaboraController }} {{- range .Values.customization.release.collaboraController }}

View File

@@ -69,7 +69,7 @@ configuration:
regex: "@.*" regex: "@.*"
url: null url: null
sender_localpart: ox-appsuite sender_localpart: ox-appsuite
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
{{- if .Values.elementAdmin.enabled }} {{- if .Values.elementAdmin.enabled }}
- as_token: {{ .Values.secrets.matrixAdminBot.synapseAsToken | quote }} - as_token: {{ .Values.secrets.matrixAdminBot.synapseAsToken | quote }}
hs_token: {{ .Values.secrets.matrixAdminBot.synapseAsToken | quote }} hs_token: {{ .Values.secrets.matrixAdminBot.synapseAsToken | quote }}

View File

@@ -25,7 +25,7 @@ releases:
version: "{{ .Values.charts.nextcloudManagement.version }}" version: "{{ .Values.charts.nextcloudManagement.version }}"
values: values:
- "values-nextcloud-mgmt.yaml.gotmpl" - "values-nextcloud-mgmt.yaml.gotmpl"
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
- "values-nextcloud-mgmt-enterprise.yaml.gotmpl" - "values-nextcloud-mgmt-enterprise.yaml.gotmpl"
{{- end }} {{- end }}
{{- range .Values.customization.release.opendeskNextcloudManagement }} {{- range .Values.customization.release.opendeskNextcloudManagement }}
@@ -40,7 +40,7 @@ releases:
version: "{{ .Values.charts.nextcloud.version }}" version: "{{ .Values.charts.nextcloud.version }}"
values: values:
- "values-nextcloud.yaml.gotmpl" - "values-nextcloud.yaml.gotmpl"
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
- "values-nextcloud-enterprise.yaml.gotmpl" - "values-nextcloud-enterprise.yaml.gotmpl"
{{- end }} {{- end }}
{{- range .Values.customization.release.opendeskNextcloud }} {{- range .Values.customization.release.opendeskNextcloud }}

View File

@@ -1151,7 +1151,7 @@ nubusStackDataUms:
portaltileGroupNotes: portaltileGroupNotes:
- 'cn=managed-by-attribute-Notes,cn=groups,{{ .Values.ldap.baseDn }}' - 'cn=managed-by-attribute-Notes,cn=groups,{{ .Values.ldap.baseDn }}'
systemInformation: systemInformation:
releaseVersion: "Release: {{ .Values.global.systemInformation.releaseVersion }}{{ if (env "OPENDESK_ENTERPRISE") }}-ee{{ end }}" releaseVersion: "Release: {{ .Values.global.systemInformation.releaseVersion }}{{ if eq (env "OPENDESK_ENTERPRISE") "true" }}-ee{{ end }}"
{{- if .Values.functional.admin.portal.deploymentTimestamp.enabled }} {{- if .Values.functional.admin.portal.deploymentTimestamp.enabled }}
deployDate: "Deployed: {{ now | date "2006-01-02T15:04:05-0700" }}" deployDate: "Deployed: {{ now | date "2006-01-02T15:04:05-0700" }}"
{{- else }} {{- else }}

View File

@@ -57,7 +57,7 @@ releases:
values: values:
- "values-openxchange.yaml.gotmpl" - "values-openxchange.yaml.gotmpl"
- "values-openxchange-contact-picker.yaml.gotmpl" - "values-openxchange-contact-picker.yaml.gotmpl"
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
- "values-openxchange-enterprise.yaml.gotmpl" - "values-openxchange-enterprise.yaml.gotmpl"
{{- end }} {{- end }}
{{- range .Values.customization.release.openxchange }} {{- range .Values.customization.release.openxchange }}

View File

@@ -86,7 +86,7 @@ customConfigs:
xwiki.authentication.ldap.fields_mapping: "last_name=sn,first_name=givenName,email=mailPrimaryAddress" xwiki.authentication.ldap.fields_mapping: "last_name=sn,first_name=givenName,email=mailPrimaryAddress"
xwiki.properties: xwiki.properties:
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
distribution.defaultUI: "com.xwiki.projects.swp:xwiki-swp-flavor-enterprise-main" distribution.defaultUI: "com.xwiki.projects.swp:xwiki-swp-flavor-enterprise-main"
{{- end }} {{- end }}
wikiInitializer.initialRequest.xwiki.url: "https://{{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}/distribution/" wikiInitializer.initialRequest.xwiki.url: "https://{{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}/distribution/"

View File

@@ -5,27 +5,27 @@ environments:
default: default:
values: values:
- "../../environments/default/*.yaml.gotmpl" - "../../environments/default/*.yaml.gotmpl"
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
- "../../environments/default-enterprise-overrides/*.yaml.gotmpl" - "../../environments/default-enterprise-overrides/*.yaml.gotmpl"
{{- end }} {{- end }}
dev: dev:
values: values:
- "../../environments/default/*.yaml.gotmpl" - "../../environments/default/*.yaml.gotmpl"
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
- "../../environments/default-enterprise-overrides/*.yaml.gotmpl" - "../../environments/default-enterprise-overrides/*.yaml.gotmpl"
{{- end }} {{- end }}
- "../../environments/dev/*.yaml.gotmpl" - "../../environments/dev/*.yaml.gotmpl"
test: test:
values: values:
- "../../environments/default/*.yaml.gotmpl" - "../../environments/default/*.yaml.gotmpl"
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
- "../../environments/default-enterprise-overrides/*.yaml.gotmpl" - "../../environments/default-enterprise-overrides/*.yaml.gotmpl"
{{- end }} {{- end }}
- "../../environments/test/*.yaml.gotmpl" - "../../environments/test/*.yaml.gotmpl"
prod: prod:
values: values:
- "../../environments/default/*.yaml.gotmpl" - "../../environments/default/*.yaml.gotmpl"
{{- if (env "OPENDESK_ENTERPRISE") }} {{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
- "../../environments/default-enterprise-overrides/*.yaml.gotmpl" - "../../environments/default-enterprise-overrides/*.yaml.gotmpl"
{{- end }} {{- end }}
- "../../environments/prod/*.yaml.gotmpl" - "../../environments/prod/*.yaml.gotmpl"

View File

@@ -5,7 +5,7 @@
# Note: Currently only single namespace deployments are supported. # Note: Currently only single namespace deployments are supported.
--- ---
cassandra: cassandra:
enabled: {{ if (env "OPENDESK_ENTERPRISE") }}true{{ else }}false{{ end }} enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~ namespace: ~
certificates: certificates:
enabled: true enabled: true
@@ -20,7 +20,7 @@ collabora:
enabled: true enabled: true
namespace: ~ namespace: ~
collaboraController: collaboraController:
enabled: {{ if (env "OPENDESK_ENTERPRISE") }}true{{ else }}false{{ end }} enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~ namespace: ~
cryptpad: cryptpad:
enabled: true enabled: true
@@ -35,10 +35,10 @@ element:
enabled: true enabled: true
namespace: ~ namespace: ~
elementAdmin: elementAdmin:
enabled: {{ if (env "OPENDESK_ENTERPRISE") }}true{{ else }}false{{ end }} enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~ namespace: ~
elementGroupsync: elementGroupsync:
enabled: {{ if (env "OPENDESK_ENTERPRISE") }}true{{ else }}false{{ end }} enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~ namespace: ~
home: home:
enabled: true enabled: true