[stable/nginx-lego] #1785 namespace defined templates with chart name

stable/nginx-lego/Chart.yaml

@@ -1,5 +1,5 @@
 name: nginx-lego
-version: 0.2.2
+version: 0.3.0
 deprecated: true
 description: Chart for nginx-ingress-controller and kube-lego
 keywords:

stable/nginx-lego/templates/_helpers.tpl

@@ -2,15 +2,15 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "nginx-lego.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified app name.
 We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "fullname" -}}
+{{- define "nginx-lego.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
 {{- end -}}

stable/nginx-lego/templates/default-deployment.yaml

@@ -1,18 +1,18 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}-default-backend
+  name: {{ template "nginx-lego.fullname" . }}-default-backend
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
   replicas: {{ .Values.default.replicaCount }}
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}-default-backend
+        app: {{ template "nginx-lego.fullname" . }}-default-backend
     spec:
       containers:
-      - name: {{ template "fullname" . }}-default-backend
+      - name: {{ template "nginx-lego.fullname" . }}-default-backend
         image: "{{ .Values.default.image.repository }}:{{ .Values.default.image.tag }}"
         imagePullPolicy: {{ .Values.default.image.pullPolicy | quote }}
         ports:

stable/nginx-lego/templates/default-service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}-default-backend
+  name: {{ template "nginx-lego.fullname" . }}-default-backend
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
@@ -10,4 +10,4 @@ spec:
   - port: 80
     targetPort: 8080
   selector:
-    app: {{ template "fullname" . }}-default-backend
+    app: {{ template "nginx-lego.fullname" . }}-default-backend

stable/nginx-lego/templates/lego-configmap.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.lego.enabled }}
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}-lego
+  name: {{ template "nginx-lego.fullname" . }}-lego
 data:
   # modify this to specify your address
   lego.email: {{ .Values.lego.configmap.email | quote }}

stable/nginx-lego/templates/lego-deployment.yaml

@@ -2,7 +2,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}-lego
+  name: {{ template "nginx-lego.fullname" . }}-lego
 spec:
   replicas: {{ .Values.lego.replicaCount }}
   template:
@@ -20,12 +20,12 @@ spec:
         - name: LEGO_EMAIL
           valueFrom:
             configMapKeyRef:
-              name: {{ template "fullname" . }}-lego
+              name: {{ template "nginx-lego.fullname" . }}-lego
               key: lego.email
         - name: LEGO_URL
           valueFrom:
             configMapKeyRef:
-              name: {{ template "fullname" . }}-lego
+              name: {{ template "nginx-lego.fullname" . }}-lego
               key: lego.url
         - name: LEGO_NAMESPACE
           valueFrom:

stable/nginx-lego/templates/nginx-configmap.yaml

@@ -9,4 +9,4 @@ data:
   enable-vts-status: {{ .Values.nginx.configmap.enable_vts_status | quote }}
 kind: ConfigMap
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "nginx-lego.fullname" . }}

stable/nginx-lego/templates/nginx-deployment.yaml

@@ -1,15 +1,15 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "nginx-lego.fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
   replicas: {{ .Values.nginx.replicaCount }}
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
+        app: {{ template "nginx-lego.fullname" . }}
     spec:
       containers:
       - name: {{ .Chart.Name }}
@@ -34,5 +34,5 @@ spec:
 {{ toYaml .Values.nginx.resources | indent 10 }}
         args:
         - /nginx-ingress-controller
-        - --default-backend-service={{ .Release.Namespace }}/{{ template "fullname" . }}-default-backend
-        - --nginx-configmap={{ .Release.Namespace }}/{{ template "fullname" . }}
+        - --default-backend-service={{ .Release.Namespace }}/{{ template "nginx-lego.fullname" . }}-default-backend
+        - --nginx-configmap={{ .Release.Namespace }}/{{ template "nginx-lego.fullname" . }}

stable/nginx-lego/templates/nginx-monitoring.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}-monitoring
+  name: {{ template "nginx-lego.fullname" . }}-monitoring
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
@@ -11,5 +11,5 @@ spec:
   - port: 18080
     name: vts-stats
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "nginx-lego.fullname" . }}
 {{- end }}

stable/nginx-lego/templates/nginx-service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "nginx-lego.fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
@@ -12,4 +12,4 @@ spec:
   - port: 443
     name: https
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "nginx-lego.fullname" . }}