From fb96d3f6e36415c377b26cbfa4d3bee4a208b20c Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 3 Apr 2018 12:17:07 -0400 Subject: [PATCH] Fix for version handling with stringe vs semver (#4597) * Fix for version handling with stringe vs semver See #3002 for more details * Include pre-releases in the semver ranges This is important when testing against alpha and beta builds of Kubernetes along with environments that use pre-releases to denote things other than pre-releases (e.g., gke denotes the environment with a pre-releases) * Incrementing the chart version --- stable/concourse/Chart.yaml | 2 +- stable/concourse/templates/worker-statefulset.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml index 4a2c7bef7d..5b7ad71532 100644 --- a/stable/concourse/Chart.yaml +++ b/stable/concourse/Chart.yaml @@ -1,5 +1,5 @@ name: concourse -version: 1.1.3 +version: 1.1.4 appVersion: 3.9.0 description: Concourse is a simple and scalable CI system. icon: https://avatars1.githubusercontent.com/u/7809479 diff --git a/stable/concourse/templates/worker-statefulset.yaml b/stable/concourse/templates/worker-statefulset.yaml index 748fd012fd..15b8095abd 100644 --- a/stable/concourse/templates/worker-statefulset.yaml +++ b/stable/concourse/templates/worker-statefulset.yaml @@ -153,7 +153,7 @@ spec: - name: concourse-work-dir emptyDir: {} {{- end }} -{{- if and (eq .Capabilities.KubeVersion.Major "1") (ge .Capabilities.KubeVersion.Minor "7") }} +{{- if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion }} updateStrategy: type: {{ .Values.worker.updateStrategy }} {{- end }}