diff --git a/stable/cockroachdb/Chart.yaml b/stable/cockroachdb/Chart.yaml index a83b1c440d..09ab7163c7 100755 --- a/stable/cockroachdb/Chart.yaml +++ b/stable/cockroachdb/Chart.yaml @@ -1,11 +1,11 @@ name: cockroachdb home: https://www.cockroachlabs.com -version: 1.0.1 +version: 1.0.2 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 sources: - https://github.com/cockroachdb/cockroach maintainers: -- name: Alex Robinson +- name: a-robinson email: alex@cockroachlabs.com diff --git a/stable/cockroachdb/templates/_helpers.tpl b/stable/cockroachdb/templates/_helpers.tpl index 1aa6bbc9b5..8d828fe9be 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 and (ge .Capabilities.KubeVersion.Minor "4") (le .Capabilities.KubeVersion.Minor "6") -}} +{{- if semverCompare ">=1.4, <=1.6" .Capabilities.KubeVersion.GitVersion -}} {{- print "extensions/v1beta1" -}} -{{- else if ge .Capabilities.KubeVersion.Minor "7" -}} +{{- else if semverCompare "^1.7" .Capabilities.KubeVersion.GitVersion -}} {{- print "networking.k8s.io/v1" -}} {{- end -}} {{- end -}}