Skip to content

Commit 5c419fb

Browse files
authored
Merge pull request #3357 from SchutteJan/replace-type-check-revision-limit
Fix previously ignored revisionHistoryLimit config
2 parents cd8a724 + 1b1fd35 commit 5c419fb

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

jupyterhub/templates/hub/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
{{- include "jupyterhub.labels" . | nindent 4 }}
77
spec:
8-
{{- if typeIs "int" .Values.hub.revisionHistoryLimit }}
8+
{{- if not (typeIs "<nil>" .Values.hub.revisionHistoryLimit) }}
99
revisionHistoryLimit: {{ .Values.hub.revisionHistoryLimit }}
1010
{{- end }}
1111
replicas: 1

jupyterhub/templates/image-puller/_helpers-daemonset.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
type: RollingUpdate
3535
rollingUpdate:
3636
maxUnavailable: 100%
37-
{{- if typeIs "int" .Values.prePuller.revisionHistoryLimit }}
37+
{{- if not (typeIs "<nil>" .Values.prePuller.revisionHistoryLimit) }}
3838
revisionHistoryLimit: {{ .Values.prePuller.revisionHistoryLimit }}
3939
{{- end }}
4040
template:

jupyterhub/templates/proxy/autohttps/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
{{- include "jupyterhub.labels" . | nindent 4 }}
1010
spec:
11-
{{- if typeIs "int" .Values.proxy.traefik.revisionHistoryLimit }}
11+
{{- if not (typeIs "<nil>" .Values.proxy.traefik.revisionHistoryLimit) }}
1212
revisionHistoryLimit: {{ .Values.proxy.traefik.revisionHistoryLimit }}
1313
{{- end }}
1414
replicas: 1

jupyterhub/templates/proxy/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
{{- include "jupyterhub.labels" . | nindent 4 }}
99
spec:
10-
{{- if typeIs "int" .Values.proxy.chp.revisionHistoryLimit }}
10+
{{- if not (typeIs "<nil>" .Values.proxy.chp.revisionHistoryLimit) }}
1111
revisionHistoryLimit: {{ .Values.proxy.chp.revisionHistoryLimit }}
1212
{{- end }}
1313
replicas: 1

jupyterhub/templates/scheduling/user-placeholder/statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ metadata:
1616
{{- include "jupyterhub.labels" . | nindent 4 }}
1717
spec:
1818
podManagementPolicy: Parallel
19-
{{- if typeIs "int" .Values.scheduling.userPlaceholder.revisionHistoryLimit }}
19+
{{- if not (typeIs "<nil>" .Values.scheduling.userPlaceholder.revisionHistoryLimit) }}
2020
revisionHistoryLimit: {{ .Values.scheduling.userPlaceholder.revisionHistoryLimit }}
2121
{{- end }}
2222
replicas: {{ .Values.scheduling.userPlaceholder.replicas }}

jupyterhub/templates/scheduling/user-scheduler/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
{{- include "jupyterhub.labels" . | nindent 4 }}
88
spec:
9-
{{- if typeIs "int" .Values.scheduling.userScheduler.revisionHistoryLimit }}
9+
{{- if not (typeIs "<nil>" .Values.scheduling.userScheduler.revisionHistoryLimit) }}
1010
revisionHistoryLimit: {{ .Values.scheduling.userScheduler.revisionHistoryLimit }}
1111
{{- end }}
1212
replicas: {{ .Values.scheduling.userScheduler.replicas }}

0 commit comments

Comments
 (0)