From d5d0637b1ef78f3a58ec48b2a65cfe6fdb75a768 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 3 Apr 2018 10:56:07 -0400 Subject: [PATCH] Fix for version comparisons from strings to semver (#4607) * Fix for version comparisons from strings to semver See #3002 for more detail * Adding appVersion to pass validation * 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) --- stable/spotify-docker-gc/Chart.yaml | 5 +++-- stable/spotify-docker-gc/templates/daemonset.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stable/spotify-docker-gc/Chart.yaml b/stable/spotify-docker-gc/Chart.yaml index 352ef7a846..de045c07a2 100644 --- a/stable/spotify-docker-gc/Chart.yaml +++ b/stable/spotify-docker-gc/Chart.yaml @@ -1,9 +1,10 @@ name: spotify-docker-gc home: https://github.com/spotify/docker-gc -version: 0.1.2 +version: 0.1.3 +appVersion: latest description: A simple Docker container and image garbage collection script. sources: - https://github.com/spotify/docker-gc maintainers: - - name: Vaughn Dice + - name: vdice email: vadice@microsoft.com diff --git a/stable/spotify-docker-gc/templates/daemonset.yaml b/stable/spotify-docker-gc/templates/daemonset.yaml index 99dc2cf94f..388674bf27 100644 --- a/stable/spotify-docker-gc/templates/daemonset.yaml +++ b/stable/spotify-docker-gc/templates/daemonset.yaml @@ -3,7 +3,7 @@ kind: DaemonSet metadata: name: {{ template "name" . }} spec: - {{- if ge .Capabilities.KubeVersion.Minor "6" }} + {{- if semverCompare "^1.6-0" .Capabilities.KubeVersion.GitVersion }} updateStrategy: type: RollingUpdate {{- end }}