[stable/cockroachdb] #1785 namespace defined templates with chart name (#1984)

This commit is contained in:
kevinschumacher
2017-09-10 11:50:14 -05:00
committed by Michael Goodness
parent 4e2416ec56
commit 34e306e831
3 changed files with 6 additions and 6 deletions
+4 -4
View File
@@ -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
+1 -1
View File
@@ -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" -}}
@@ -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: