From b8b39fec43bb68738e9e759a0cef1b84a466af0d Mon Sep 17 00:00:00 2001
From: Kevin Schumacher <kevinschumacher@users.noreply.github.com>
Date: Sun, 17 Sep 2017 16:16:04 -0400
Subject: [PATCH] [stable/openvpn] #1785 namespace defined templates with chart
 name

---
 stable/openvpn/Chart.yaml                     | 31 ++++++++++---------
 stable/openvpn/templates/_helpers.tpl         |  4 +--
 stable/openvpn/templates/certs-pvc.yaml       |  4 +--
 stable/openvpn/templates/config-openvpn.yaml  |  2 +-
 .../openvpn/templates/openvpn-deployment.yaml |  8 ++---
 stable/openvpn/templates/openvpn-service.yaml |  4 +--
 6 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/stable/openvpn/Chart.yaml b/stable/openvpn/Chart.yaml
index d98219eb5d2b..b46d6ffb721e 100755
--- a/stable/openvpn/Chart.yaml
+++ b/stable/openvpn/Chart.yaml
@@ -1,22 +1,23 @@
 apiVersion: v1
-description: A Helm chart to install an openvpn server inside a kubernetes cluster.  Certificate generation is also part of the deployment, and this chart will generate client keys as needed.
+description: A Helm chart to install an openvpn server inside a kubernetes cluster.  Certificate
+  generation is also part of the deployment, and this chart will generate client keys
+  as needed.
 name: openvpn
-version: 1.1.2
+version: 2.0.0
 maintainers:
-  - name: John Felten
-    email: john.felten@gmail.com
+- name: John Felten
+  email: john.felten@gmail.com
 icon: https://forums.openvpn.net/styles/openvpn/theme/images/ovpnlogo.png
 keywords:
-  - openvpn
-  - vpn
-  - tunnel
-  - network
-  - service
-  - connectivity
-  - encryption
+- openvpn
+- vpn
+- tunnel
+- network
+- service
+- connectivity
+- encryption
 home: https://openvpn.net/index.php/open-source.html
 sources:
-  - https://github.com/jfelten/openvpn-docker
-  - https://github.com/kubernetes/charts/tree/master/stable/openvpn
-  - https://github.com/jfelten/helm-charts
-
+- https://github.com/jfelten/openvpn-docker
+- https://github.com/kubernetes/charts/tree/master/stable/openvpn
+- https://github.com/jfelten/helm-charts
diff --git a/stable/openvpn/templates/_helpers.tpl b/stable/openvpn/templates/_helpers.tpl
index 604b85d87b4e..b25d5918a638 100644
--- a/stable/openvpn/templates/_helpers.tpl
+++ b/stable/openvpn/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "openvpn.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
 {{- end -}}
 
@@ -10,7 +10,7 @@ Expand the name of the chart.
 Create a default fully qualified app name.
 Truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "fullname" -}}
+{{- define "openvpn.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
 {{- end -}}
diff --git a/stable/openvpn/templates/certs-pvc.yaml b/stable/openvpn/templates/certs-pvc.yaml
index 049f0b3b377a..42aa04256cce 100644
--- a/stable/openvpn/templates/certs-pvc.yaml
+++ b/stable/openvpn/templates/certs-pvc.yaml
@@ -3,10 +3,10 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "openvpn.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "openvpn.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/stable/openvpn/templates/config-openvpn.yaml b/stable/openvpn/templates/config-openvpn.yaml
index deda66b91c75..46f7f55d2009 100644
--- a/stable/openvpn/templates/config-openvpn.yaml
+++ b/stable/openvpn/templates/config-openvpn.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "openvpn.fullname" . }}
   namespace: {{ .Release.Namespace }}
 data:
   setup-certs.sh: |-
diff --git a/stable/openvpn/templates/openvpn-deployment.yaml b/stable/openvpn/templates/openvpn-deployment.yaml
index 7a1dba07c599..2914eefea3a3 100644
--- a/stable/openvpn/templates/openvpn-deployment.yaml
+++ b/stable/openvpn/templates/openvpn-deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "openvpn.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     heritage: {{ .Release.Service | quote }}
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
+        app: {{ template "openvpn.fullname" . }}
         type: openvpn
         heritage: {{ .Release.Service | quote }}
         release: {{ .Release.Name | quote }}
@@ -48,12 +48,12 @@ spec:
       volumes:
       - name: openvpn
         configMap:
-          name: {{ template "fullname" . }}
+          name: {{ template "openvpn.fullname" . }}
           defaultMode: 0775
       - name: certs
         {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ template "fullname" . }}
+          claimName: {{ template "openvpn.fullname" . }}
         {{- else }}
         emptyDir: {}
         {{- end -}}
diff --git a/stable/openvpn/templates/openvpn-service.yaml b/stable/openvpn/templates/openvpn-service.yaml
index 2c01eb436dd0..9e175cddfd0a 100644
--- a/stable/openvpn/templates/openvpn-service.yaml
+++ b/stable/openvpn/templates/openvpn-service.yaml
@@ -1,7 +1,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "openvpn.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -13,5 +13,5 @@ spec:
       targetPort: {{ .Values.service.internalPort }}
       protocol: {{ .Values.openvpn.OVPN_PROTO | upper }}
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "openvpn.fullname" . }}
   type: {{ .Values.service.type }}