Skip to content
This repository was archived by the owner on Feb 22, 2022. It is now read-only.

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

Merged
mgoodness merged 1 commit into from
Sep 10, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions stable/cockroachdb/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion stable/cockroachdb/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" -}}
Expand Down
2 changes: 1 addition & 1 deletion stable/cockroachdb/templates/cockroachdb-networkpolicy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down