Skip to content

Commit c42a502

Browse files
authored
Hotfix: error in template (#952)
Resolves regressions introduced in #928 and #929
2 parents 404579c + 6f55a66 commit c42a502

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎packages/core/platform/bundles/paas-full.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ releases:
262262
namespace: cozy-dashboard
263263
values:
264264
{{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }}
265-
{{- $dashboardKCValues := dig "data" "values.yaml" (dict) $dashboardKCconfig | fromYaml }}
265+
{{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig | fromYaml }}
266266
{{- toYaml (deepCopy $dashboardKCValues | mergeOverwrite (fromYaml (include "cozystack.defaultDashboardValues" .))) | nindent 4 }}
267267
dependsOn:
268268
- cilium

‎packages/extra/ingress/templates/nginx-ingress.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
22
{{- $exposeIngress := index $cozyConfig.data "expose-ingress" | default "tenant-root" }}
3-
{{- $exposeExternalIPs := splitList "," ((index $cozyConfig.data "expose-external-ips") | default "") }}
3+
{{- $exposeExternalIPs := (index $cozyConfig.data "expose-external-ips") | default "" }}
44
apiVersion: helm.toolkit.fluxcd.io/v2
55
kind: HelmRelease
66
metadata:
@@ -36,7 +36,7 @@ spec:
3636
service:
3737
{{- if and (eq $exposeIngress .Release.Namespace) $exposeExternalIPs }}
3838
externalIPs:
39-
{{- toYaml $exposeExternalIPs | nindent 12 }}
39+
{{- toYaml (splitList "," $exposeExternalIPs) | nindent 12 }}
4040
type: ClusterIP
4141
externalTrafficPolicy: Cluster
4242
{{- else }}

0 commit comments

Comments
 (0)