Skip to content

Commit 2aa7d06

Browse files
authored
Merge pull request #353 from silvestre/master
Replace deprecated `.Capabilities.KubeVersion.GitVersion` references
2 parents 2c505fb + 441ec83 commit 2aa7d06

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Creates the address of the TSA service.
7878
Determine version of Kubernetes cluster
7979
*/}}
8080
{{- define "concourse.kubeVersion" -}}
81-
{{- print (.Capabilities.KubeVersion.GitVersion | replace "v" "") -}}
81+
{{- print (.Capabilities.KubeVersion.Version | replace "v" "") -}}
8282
{{- end -}}
8383

8484
{{/*

templates/worker-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ spec:
171171
- key: worker-additional-certs
172172
path: worker-additional-certs.pem
173173
{{- end }}
174-
{{- if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion }}
174+
{{- if semverCompare "^1.7-0" .Capabilities.KubeVersion.Version }}
175175
strategy:
176176
{{ toYaml .Values.worker.updateStrategy | indent 4 }}
177177
{{- end }}

templates/worker-horizontal-pod-autoscaler.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- if .Values.concourse.worker.autoscaling }}
22
{{- if .Values.concourse.worker.autoscaling.maxReplicas }}
3-
{{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion -}}
3+
{{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.Version -}}
44
apiVersion: autoscaling/v2
55
{{- else -}}
66
apiVersion: autoscaling/v2beta2

templates/worker-policy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- if .Values.worker.enabled -}}
2-
{{- if semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion -}}
2+
{{- if semverCompare ">=1.21-0" .Capabilities.KubeVersion.Version -}}
33
apiVersion: policy/v1
44
{{- else -}}
55
apiVersion: policy/v1beta1

templates/worker-statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ spec:
231231
{{- end }}
232232
{{- end }}
233233
{{- end }}
234-
{{- if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion }}
234+
{{- if semverCompare "^1.7-0" .Capabilities.KubeVersion.Version }}
235235
updateStrategy:
236236
{{ toYaml .Values.worker.updateStrategy | indent 4 }}
237237
{{- end }}

0 commit comments

Comments
 (0)