Skip to content

Commit 48661d3

Browse files
committed
[library-chart] Gracefully handle the case of missing global Values
1 parent 9967baa commit 48661d3

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

charts/library-chart/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: v2
22
name: library-chart
3-
version: 1.5.44
3+
version: 1.5.45
44
type: library

charts/library-chart/templates/_common.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/}}
44
{{- define "library-chart.capabilities.kubeVersion" -}}
55
{{- if .Values.global }}
6-
{{- if .Values.global.kubeVersion }}
6+
{{- if (.Values.global).kubeVersion }}
77
{{- .Values.global.kubeVersion -}}
88
{{- else }}
99
{{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}

charts/library-chart/templates/_ingress.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ acme.cert-manager.io/http01-ingress-class: {{ .Values.ingress.ingressClassName }
3939
{{/* Template to generate a standard Ingress */}}
4040
{{- define "library-chart.ingress" -}}
4141
{{- if .Values.ingress.enabled -}}
42-
{{- if or .Values.autoscaling.enabled (not .Values.global.suspend) }}
42+
{{- if or .Values.autoscaling.enabled (not (.Values.global).suspend) }}
4343
{{- $fullName := include "library-chart.fullname" . -}}
4444
{{- $svcPort := .Values.networking.service.port -}}
4545
apiVersion: networking.k8s.io/v1
@@ -80,7 +80,7 @@ spec:
8080
{{/* Template to generate a custom Ingress */}}
8181
{{- define "library-chart.ingressUser" -}}
8282
{{- if .Values.ingress.enabled -}}
83-
{{- if or .Values.autoscaling.enabled (not .Values.global.suspend) }}
83+
{{- if or .Values.autoscaling.enabled (not (.Values.global).suspend) }}
8484
{{- if and .Values.networking.user .Values.networking.user.enabled -}}
8585
{{- $userPorts := list -}}
8686
{{- if or .Values.networking.user.ports .Values.networking.user.port -}}

charts/library-chart/templates/_service.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{/* Template to generate a Service */}}
44
{{- define "library-chart.service" -}}
5-
{{- if or .Values.autoscaling.enabled (not .Values.global.suspend) }}
5+
{{- if or .Values.autoscaling.enabled (not (.Values.global).suspend) }}
66
{{- $userPorts := list -}}
77
{{- if and .Values.networking.user .Values.networking.user.enabled (or .Values.networking.user.ports .Values.networking.user.port) -}}
88
{{- $userPorts = .Values.networking.user.ports | default (list .Values.networking.user.port) -}}

0 commit comments

Comments
 (0)