From 4fb86b5addd92f04b3315c0c722b69e6f7e7182b Mon Sep 17 00:00:00 2001 From: Dominik Kaminski Date: Tue, 25 Jul 2023 16:41:21 +0200 Subject: [PATCH] feat(helmfile): Remove environment specific values to use cluster defaults --- helmfile/environments/default/global.gotmpl | 2 +- helmfile/environments/default/ingress.gotmpl | 2 +- helmfile/environments/default/istio.gotmpl | 2 +- helmfile/environments/default/persistence.gotmpl | 4 ++-- helmfile/environments/default/turn.gotmpl | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helmfile/environments/default/global.gotmpl b/helmfile/environments/default/global.gotmpl index 38f47d82..8d6ec2cb 100644 --- a/helmfile/environments/default/global.gotmpl +++ b/helmfile/environments/default/global.gotmpl @@ -34,7 +34,7 @@ global: ## Define host # - domain: {{ env "DOMAIN" | default "souvap-univention.de" }} + domain: {{ env "DOMAIN" | default "souvap.cloud" }} ## Define docker registry address. # diff --git a/helmfile/environments/default/ingress.gotmpl b/helmfile/environments/default/ingress.gotmpl index 9062cd66..7a278db9 100644 --- a/helmfile/environments/default/ingress.gotmpl +++ b/helmfile/environments/default/ingress.gotmpl @@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0 --- ingress: enabled: true - ingressClassName: "cilium" + ingressClassName: "" tls: enabled: true secretName: "sovereign-workplace-certificates-tls" diff --git a/helmfile/environments/default/istio.gotmpl b/helmfile/environments/default/istio.gotmpl index c995c9d3..2ddbbe6a 100644 --- a/helmfile/environments/default/istio.gotmpl +++ b/helmfile/environments/default/istio.gotmpl @@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0 --- istio: enabled: true - domain: {{ env "ISTIO_DOMAIN" | default "souvap-univention.de" }} + domain: {{ env "ISTIO_DOMAIN" | default "souvap.cloud" }} virtualService: enabled: false gateway: diff --git a/helmfile/environments/default/persistence.gotmpl b/helmfile/environments/default/persistence.gotmpl index edb6e0bd..357902a6 100644 --- a/helmfile/environments/default/persistence.gotmpl +++ b/helmfile/environments/default/persistence.gotmpl @@ -5,8 +5,8 @@ SPDX-License-Identifier: Apache-2.0 --- persistence: storageClassNames: - RWX: "csi-cephfs-sc" - RWO: "csi-rbd-sc" + RWX: "" + RWO: "" size: clamav: "1Gi" dovecot: "1Gi" diff --git a/helmfile/environments/default/turn.gotmpl b/helmfile/environments/default/turn.gotmpl index 710a9cfb..bf514d6f 100644 --- a/helmfile/environments/default/turn.gotmpl +++ b/helmfile/environments/default/turn.gotmpl @@ -7,10 +7,10 @@ turn: transport: "udp" credentials: "{{ env "TURN_CREDENTIALS" }}" server: - host: "turn.develop.souvap-univention.de" + host: "" port: "3478" tls: - host: "turn.develop.souvap-univention.de" + host: "" port: "5349" ...