From 857fd2e6dc35ee9dc3769e6ea14aef3db600de34 Mon Sep 17 00:00:00 2001
From: kevinschumacher <kevinmichaelschumacher@gmail.com>
Date: Sun, 10 Sep 2017 15:49:42 -0400
Subject: [PATCH] [stable/artifactory] #1785 namespace defined templates with
 chart name (#1977)

* [stable/artifactory] #1785 namespace defined templates with chart name

* Update Chart.yaml

fix version bump
---
 stable/artifactory/Chart.yaml                   | 17 +++++++++--------
 stable/artifactory/templates/NOTES.txt          |  6 +++---
 stable/artifactory/templates/_helpers.tpl       | 16 ++++++++--------
 .../templates/artifactory-deployment.yaml       | 12 ++++++------
 .../artifactory/templates/artifactory-pvc.yaml  |  4 ++--
 .../templates/artifactory-service.yaml          |  6 +++---
 .../artifactory/templates/nginx-deployment.yaml |  8 ++++----
 stable/artifactory/templates/nginx-pvc.yaml     |  4 ++--
 stable/artifactory/templates/nginx-service.yaml |  6 +++---
 .../templates/postgresql-deployment.yaml        | 10 +++++-----
 .../artifactory/templates/postgresql-pvc.yaml   |  4 ++--
 .../templates/postgresql-secret.yaml            |  4 ++--
 .../templates/postgresql-service.yaml           |  6 +++---
 13 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
index 91a81e3ec0..66c2f4345b 100644
--- a/stable/artifactory/Chart.yaml
+++ b/stable/artifactory/Chart.yaml
@@ -1,18 +1,19 @@
 apiVersion: v1
 name: artifactory
 home: https://www.jfrog.com/artifactory/
-version: 5.4.6-3
+version: 6.0.0
 appVersion: 5.4.6
-description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
+description: Universal Repository Manager supporting all major packaging formats,
+  build tools and CI servers.
 keywords:
 - artifactory
 - jfrog
 sources:
-  - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
-  - https://github.com/JFrogDev
+- https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view
+- https://github.com/JFrogDev
 maintainers:
-  - name: jainishshah17
-    email: jainishs@jfrog.com
-  - name: eldada
-    email: eldada@jfrog.com
+- name: jainishshah17
+  email: jainishs@jfrog.com
+- name: eldada
+  email: eldada@jfrog.com
 icon: https://raw.githubusercontent.com/JFrogDev/artifactory-dcos/master/images/jfrog_med.png
diff --git a/stable/artifactory/templates/NOTES.txt b/stable/artifactory/templates/NOTES.txt
index d744ea9a44..cb728e4cb6 100644
--- a/stable/artifactory/templates/NOTES.txt
+++ b/stable/artifactory/templates/NOTES.txt
@@ -3,15 +3,15 @@ Congratulations. You have just deployed JFrog Artifactory Pro!
 1. Get the Artifactory URL by running these commands:
 
    {{- if contains "NodePort" .Values.nginx.service.type }}
-   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "nginx.name" . }})
+   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "artifactory.nginx.name" . }})
    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
    echo http://$NODE_IP:$NODE_PORT/
 
    {{- else if contains "LoadBalancer"  .Values.nginx.service.type }}
 
    NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-         You can watch the status of the service by running 'kubectl get svc -w {{ template "nginx.name" . }}'
-   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "nginx.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+         You can watch the status of the service by running 'kubectl get svc -w {{ template "artifactory.nginx.name" . }}'
+   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "artifactory.nginx.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
    echo http://$SERVICE_IP/
 
    {{- else if contains "ClusterIP" .Values.nginx.service.type }}
diff --git a/stable/artifactory/templates/_helpers.tpl b/stable/artifactory/templates/_helpers.tpl
index fc351b14fe..17eb60feaf 100644
--- a/stable/artifactory/templates/_helpers.tpl
+++ b/stable/artifactory/templates/_helpers.tpl
@@ -2,28 +2,28 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "artifactory.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Expand the name artifactory service.
 */}}
-{{- define "artifactory.name" -}}
+{{- define "artifactory.artifactory.name" -}}
 {{- default .Values.artifactory.name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Expand the name database service.
 */}}
-{{- define "database.name" -}}
+{{- define "artifactory.database.name" -}}
 {{- default .Values.database.name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Expand the name nginx service.
 */}}
-{{- define "nginx.name" -}}
+{{- define "artifactory.nginx.name" -}}
 {{- default .Values.nginx.name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -32,7 +32,7 @@ Expand the name nginx service.
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "fullname" -}}
+{{- define "artifactory.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -41,7 +41,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a default fully qualified application name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "artifactory.fullname" -}}
+{{- define "artifactory.artifactory.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s-%s" .Release.Name $name .Values.artifactory.name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -50,7 +50,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a default fully qualified database name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "database.fullname" -}}
+{{- define "artifactory.database.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s-%s" .Release.Name $name .Values.database.name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -59,7 +59,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a default fully qualified nginx name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "nginx.fullname" -}}
+{{- define "artifactory.nginx.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s-%s" .Release.Name $name .Values.nginx.name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
\ No newline at end of file
diff --git a/stable/artifactory/templates/artifactory-deployment.yaml b/stable/artifactory/templates/artifactory-deployment.yaml
index 6cf8ae2c85..f6e01c1f87 100644
--- a/stable/artifactory/templates/artifactory-deployment.yaml
+++ b/stable/artifactory/templates/artifactory-deployment.yaml
@@ -1,9 +1,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "artifactory.fullname" . }}
+  name: {{ template "artifactory.artifactory.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     component: "{{ .Values.artifactory.name }}"
     heritage: {{ .Release.Service }}
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "artifactory.name" . }}
         component: "{{ .Values.artifactory.name }}"
         release: {{ .Release.Name }}
     spec:
@@ -40,10 +40,10 @@ spec:
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "artifactory.fullname" . }}
               key: artifactory-database-password
         - name: DB_HOST
-          value: {{ template "database.name" . }}
+          value: {{ template "artifactory.database.name" . }}
         ports:
         - containerPort: {{ .Values.artifactory.internalPort }}
         volumeMounts:
@@ -53,7 +53,7 @@ spec:
       - name: artifactory-volume
       {{- if .Values.artifactory.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ template "artifactory.fullname" . }}
+          claimName: {{ template "artifactory.artifactory.fullname" . }}
       {{- else }}
         emptyDir: {}
       {{- end -}}
diff --git a/stable/artifactory/templates/artifactory-pvc.yaml b/stable/artifactory/templates/artifactory-pvc.yaml
index 2d97aca281..58e32df343 100755
--- a/stable/artifactory/templates/artifactory-pvc.yaml
+++ b/stable/artifactory/templates/artifactory-pvc.yaml
@@ -2,9 +2,9 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "artifactory.fullname" . }}
+  name: {{ template "artifactory.artifactory.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/stable/artifactory/templates/artifactory-service.yaml b/stable/artifactory/templates/artifactory-service.yaml
index f925b8819d..e7a70ac245 100644
--- a/stable/artifactory/templates/artifactory-service.yaml
+++ b/stable/artifactory/templates/artifactory-service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "artifactory.name" . }}
+  name: {{ template "artifactory.artifactory.name" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     component: "{{ .Values.artifactory.name }}"
     heritage: {{ .Release.Service }}
@@ -16,6 +16,6 @@ spec:
     protocol: TCP
     name: {{ .Release.Name }}
   selector:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     component: "{{ .Values.artifactory.name }}"
     release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/stable/artifactory/templates/nginx-deployment.yaml b/stable/artifactory/templates/nginx-deployment.yaml
index 18768e075e..28529227fb 100644
--- a/stable/artifactory/templates/nginx-deployment.yaml
+++ b/stable/artifactory/templates/nginx-deployment.yaml
@@ -1,9 +1,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "nginx.fullname" . }}
+  name: {{ template "artifactory.nginx.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     component: "{{ .Values.nginx.name }}"
     heritage: {{ .Release.Service }}
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "artifactory.name" . }}
         component: "{{ .Values.nginx.name }}"
         release: {{ .Release.Name }}
     spec:
@@ -47,7 +47,7 @@ spec:
       - name: nginx-volume
       {{- if .Values.nginx.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ template "nginx.fullname" . }}
+          claimName: {{ template "artifactory.nginx.fullname" . }}
       {{- else }}
         emptyDir: {}
       {{- end -}}
diff --git a/stable/artifactory/templates/nginx-pvc.yaml b/stable/artifactory/templates/nginx-pvc.yaml
index dd34f5fb7f..7428cb1eab 100755
--- a/stable/artifactory/templates/nginx-pvc.yaml
+++ b/stable/artifactory/templates/nginx-pvc.yaml
@@ -2,9 +2,9 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "nginx.fullname" . }}
+  name: {{ template "artifactory.nginx.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/stable/artifactory/templates/nginx-service.yaml b/stable/artifactory/templates/nginx-service.yaml
index a550c15fba..65a579c9be 100644
--- a/stable/artifactory/templates/nginx-service.yaml
+++ b/stable/artifactory/templates/nginx-service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "nginx.name" . }}
+  name: {{ template "artifactory.nginx.name" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     component: "{{ .Values.nginx.name }}"
     heritage: {{ .Release.Service }}
@@ -20,6 +20,6 @@ spec:
     protocol: TCP
     name: {{ .Release.Name }}https
   selector:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     component: "{{ .Values.nginx.name }}"
     release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/stable/artifactory/templates/postgresql-deployment.yaml b/stable/artifactory/templates/postgresql-deployment.yaml
index 7ab13d9b9f..9cae12728e 100644
--- a/stable/artifactory/templates/postgresql-deployment.yaml
+++ b/stable/artifactory/templates/postgresql-deployment.yaml
@@ -1,9 +1,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "database.fullname" . }}
+  name: {{ template "artifactory.database.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     component: "{{ .Values.database.name }}"
     heritage: {{ .Release.Service }}
@@ -13,7 +13,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "artifactory.name" . }}
         component: "{{ .Values.database.name }}"
         release: {{ .Release.Name }}
     spec:
@@ -40,7 +40,7 @@ spec:
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "artifactory.fullname" . }}
               key: artifactory-database-password
         ports:
         - containerPort: {{ .Values.database.internalPort }}
@@ -51,7 +51,7 @@ spec:
       - name: postgresql-volume
       {{- if .Values.database.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ template "database.fullname" . }}
+          claimName: {{ template "artifactory.database.fullname" . }}
       {{- else }}
         emptyDir: {}
       {{- end -}}
diff --git a/stable/artifactory/templates/postgresql-pvc.yaml b/stable/artifactory/templates/postgresql-pvc.yaml
index 96cddcd5bd..4bedb1d4c6 100755
--- a/stable/artifactory/templates/postgresql-pvc.yaml
+++ b/stable/artifactory/templates/postgresql-pvc.yaml
@@ -2,9 +2,9 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "database.fullname" . }}
+  name: {{ template "artifactory.database.fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/stable/artifactory/templates/postgresql-secret.yaml b/stable/artifactory/templates/postgresql-secret.yaml
index 3bd612f0b8..fa5d8b5082 100644
--- a/stable/artifactory/templates/postgresql-secret.yaml
+++ b/stable/artifactory/templates/postgresql-secret.yaml
@@ -2,11 +2,11 @@ apiVersion: v1
 kind: Secret
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "artifactory.fullname" . }}
 type: Opaque
 data:
   {{- if .Values.database.env.pass }}
diff --git a/stable/artifactory/templates/postgresql-service.yaml b/stable/artifactory/templates/postgresql-service.yaml
index b29695521d..ffc17fca44 100644
--- a/stable/artifactory/templates/postgresql-service.yaml
+++ b/stable/artifactory/templates/postgresql-service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "database.name" . }}
+  name: {{ template "artifactory.database.name" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     component: "{{ .Values.database.name }}"
     heritage: {{ .Release.Service }}
@@ -16,6 +16,6 @@ spec:
     protocol: TCP
     name: {{ .Release.Name }}
   selector:
-    app: {{ template "name" . }}
+    app: {{ template "artifactory.name" . }}
     component: "{{ .Values.database.name }}"
     release: {{ .Release.Name }}
\ No newline at end of file