From 46b38342d3cb6789e1734cd6eba412bc726c834b Mon Sep 17 00:00:00 2001 From: Thomas Kaltenbrunner Date: Mon, 31 Mar 2025 09:57:29 +0200 Subject: [PATCH] fix(helmfile): Fix Kyverno lint issues for EE components --- .gitlab-ci.yml | 2 +- helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl | 5 +++++ .../default-enterprise-overrides/charts.yaml.gotmpl | 2 +- helmfile/environments/default/repositories.yaml.gotmpl | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be8211e4..dd9ed1a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ include: rules: - if: > $JOB_OPENDESK_LINTER_ENABLED == 'false' || - $CI_PIPELINE_SOURCE =~ 'tags|merge_request_event|web|trigger|api|schedules' + $CI_PIPELINE_SOURCE =~ 'tags|merge_request_event|web|trigger|api' when: "never" - when: "always" diff --git a/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl b/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl index 89ee6005..c5eff620 100644 --- a/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl +++ b/helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl @@ -25,6 +25,7 @@ controller: image: repository: "{{ coalesce .Values.repositories.image.registryOpencodeDeEnterprise .Values.global.imageRegistry .Values.images.collaboraController.registry }}/{{ .Values.images.collaboraController.repository }}" tag: {{ .Values.images.collaboraController.tag | quote }} + pullPolicy: {{ .Values.global.imagePullPolicy | quote }} imagePullSecrets: {{- range .Values.global.imagePullSecrets }} - name: {{ . | quote }} @@ -38,6 +39,10 @@ ingress: paths: - path: "/controller" pathType: "Prefix" + tls: + - secretName: {{ .Values.ingress.tls.secretName | quote }} + hosts: + - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}" podAnnotations: {} diff --git a/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl b/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl index 9976d502..a8f9d537 100644 --- a/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl +++ b/helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl @@ -6,7 +6,7 @@ charts: registry: "registry.opencode.de" repository: "zendis/opendesk-enterprise/components/product-development/charts/opendesk-dovecot-pro" name: "dovecot" - version: "2.0.1" + version: "2.0.2" verify: true oxAppSuite: registry: "registry.opencode.de" diff --git a/helmfile/environments/default/repositories.yaml.gotmpl b/helmfile/environments/default/repositories.yaml.gotmpl index 0bacc09a..438e93d3 100644 --- a/helmfile/environments/default/repositories.yaml.gotmpl +++ b/helmfile/environments/default/repositories.yaml.gotmpl @@ -7,7 +7,7 @@ repositories: image: dockerHub: "" registryOpencodeDe: "" - registryOpencodeDeEnterprise: "registry.opencode.de" + registryOpencodeDeEnterprise: "" # Fine-granular registry settings, useful when you can't use virtual (Artifactory) or group (Nexus) repositories. # Higher precedence than `global.imageRegistry` helm: