From 74a23f7efbb332ea873df89f09d28654c48f6615 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 3 Apr 2018 10:39:07 -0400 Subject: [PATCH] Include pre-releases in the semver ranges (#4634) 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/cockroachdb/Chart.yaml | 2 +- stable/cockroachdb/templates/_helpers.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/cockroachdb/Chart.yaml b/stable/cockroachdb/Chart.yaml index 09ab7163c7..a467dd51fa 100755 --- a/stable/cockroachdb/Chart.yaml +++ b/stable/cockroachdb/Chart.yaml @@ -1,6 +1,6 @@ name: cockroachdb home: https://www.cockroachlabs.com -version: 1.0.2 +version: 1.0.3 appVersion: 1.1.7 description: CockroachDB is a scalable, survivable, strongly-consistent SQL database. icon: https://raw.githubusercontent.com/cockroachdb/cockroach/master/docs/media/cockroach_db.png diff --git a/stable/cockroachdb/templates/_helpers.tpl b/stable/cockroachdb/templates/_helpers.tpl index 8d828fe9be..86e6c3afee 100644 --- a/stable/cockroachdb/templates/_helpers.tpl +++ b/stable/cockroachdb/templates/_helpers.tpl @@ -2,9 +2,9 @@ Return the appropriate apiVersion for networkpolicy. */}} {{- define "cockroachdb.networkPolicy.apiVersion" -}} -{{- if semverCompare ">=1.4, <=1.6" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.4-0, <=1.7-0" .Capabilities.KubeVersion.GitVersion -}} {{- print "extensions/v1beta1" -}} -{{- else if semverCompare "^1.7" .Capabilities.KubeVersion.GitVersion -}} +{{- else if semverCompare "^1.7-0" .Capabilities.KubeVersion.GitVersion -}} {{- print "networking.k8s.io/v1" -}} {{- end -}} {{- end -}}