From c3ce00c8d3112c75c8af75549a06383b36ab92fd Mon Sep 17 00:00:00 2001 From: Kevin Schumacher Date: Mon, 4 Sep 2017 17:38:37 -0400 Subject: [PATCH] [stable/cockroachdb] #1785 namespace defined templates with chart name --- stable/cockroachdb/Chart.yaml | 8 ++++---- stable/cockroachdb/templates/_helpers.tpl | 2 +- .../cockroachdb/templates/cockroachdb-networkpolicy.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stable/cockroachdb/Chart.yaml b/stable/cockroachdb/Chart.yaml index 6a63680923db..7b7a812158af 100755 --- a/stable/cockroachdb/Chart.yaml +++ b/stable/cockroachdb/Chart.yaml @@ -1,11 +1,11 @@ name: cockroachdb home: https://www.cockroachlabs.com -version: 0.4.2 +version: 0.5.0 appVersion: 1.0.5 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 +- https://github.com/cockroachdb/cockroach maintainers: - - name: Alex Robinson - email: alex@cockroachlabs.com +- name: Alex Robinson + email: alex@cockroachlabs.com diff --git a/stable/cockroachdb/templates/_helpers.tpl b/stable/cockroachdb/templates/_helpers.tpl index 2ee6409fefea..0feb1ca12b8d 100644 --- a/stable/cockroachdb/templates/_helpers.tpl +++ b/stable/cockroachdb/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Return the appropriate apiVersion for networkpolicy. */}} -{{- define "networkPolicy.apiVersion" -}} +{{- define "cockroachdb.networkPolicy.apiVersion" -}} {{- if and (ge .Capabilities.KubeVersion.Minor "4") (le .Capabilities.KubeVersion.Minor "6") -}} {{- print "extensions/v1beta1" -}} {{- else if ge .Capabilities.KubeVersion.Minor "7" -}} diff --git a/stable/cockroachdb/templates/cockroachdb-networkpolicy.yaml b/stable/cockroachdb/templates/cockroachdb-networkpolicy.yaml index 6aa04f6c9112..0e9e09b87ea2 100644 --- a/stable/cockroachdb/templates/cockroachdb-networkpolicy.yaml +++ b/stable/cockroachdb/templates/cockroachdb-networkpolicy.yaml @@ -1,7 +1,7 @@ {{- if .Values.NetworkPolicy.Enabled }} --- kind: NetworkPolicy -apiVersion: {{ template "networkPolicy.apiVersion" . }} +apiVersion: {{ template "cockroachdb.networkPolicy.apiVersion" . }} metadata: name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}" labels: