Rename

vfarcic · Dec 29, 2018 · f3bd062 · f3bd062
1 parent 4405281
commit f3bd062
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/charts-orig/go-demo-6/templates/rbac.yaml b/charts-orig/go-demo-6/templates/rbac.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -14,7 +14,7 @@ metadata:
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -30,7 +30,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -39,8 +39,8 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
 subjects:
 - kind: ServiceAccount
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
 {{- end -}}
diff --git a/charts-orig/go-demo-6/templates/service.yaml b/charts-orig/go-demo-6/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/charts-orig/go-demo-6/templates/sts.yaml b/charts-orig/go-demo-6/templates/sts.yaml
@@ -1,14 +1,14 @@
 apiVersion: apps/v1beta2
 kind: StatefulSet
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  serviceName: {{ template "helm.fullname" . }}-db
+  serviceName: {{ template "fullname" . }}-db
   replicas: 3
   selector:
     matchLabels:
@@ -21,7 +21,7 @@ spec:
         release: {{ .Release.Name }}
     spec:
       {{- if .Values.rbac.enabled }}
-      serviceAccountName: {{ template "helm.fullname" . }}-db
+      serviceAccountName: {{ template "fullname" . }}-db
       {{- end }}
       terminationGracePeriodSeconds: 10
       containers:
@@ -43,7 +43,7 @@ spec:
             memory: 100Mi
             cpu: 10m
         volumeMounts:
-        - name: {{ template "helm.fullname" . }}-db
+        - name: {{ template "fullname" . }}-db
           mountPath: /data/db
       - name: db-sidecar
         image: cvallance/mongo-k8s-sidecar
@@ -53,10 +53,10 @@ spec:
         - name: KUBE_NAMESPACE
           value: {{ .Release.Namespace }}
         - name: KUBERNETES_MONGO_SERVICE_NAME
-          value: {{ template "helm.fullname" . }}-db
+          value: {{ template "fullname" . }}-db
   volumeClaimTemplates:
   - metadata:
-      name: {{ template "helm.fullname" . }}-db
+      name: {{ template "fullname" . }}-db
       labels:
         app: {{ template "helm.name" . }}-db
         chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/charts/go-demo-6/templates/deployment.yaml b/charts/go-demo-6/templates/deployment.yaml
@@ -23,7 +23,7 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
         - name: DB
-          value: {{ template "helm.fullname" . }}-db
+          value: {{ template "fullname" . }}-db
         ports:
         - containerPort: {{ .Values.service.internalPort }}
         livenessProbe:

diff --git a/charts/go-demo-6/templates/rbac.yaml b/charts/go-demo-6/templates/rbac.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -14,7 +14,7 @@ metadata:
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -30,7 +30,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -39,8 +39,8 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
 subjects:
 - kind: ServiceAccount
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
 {{- end -}}
diff --git a/charts/go-demo-6/templates/service.yaml b/charts/go-demo-6/templates/service.yaml
@@ -27,7 +27,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/charts/go-demo-6/templates/sts.yaml b/charts/go-demo-6/templates/sts.yaml
@@ -1,14 +1,14 @@
 apiVersion: apps/v1beta2
 kind: StatefulSet
 metadata:
-  name: {{ template "helm.fullname" . }}-db
+  name: {{ template "fullname" . }}-db
   labels:
     app: {{ template "helm.name" . }}-db
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
-  serviceName: {{ template "helm.fullname" . }}-db
+  serviceName: {{ template "fullname" . }}-db
   replicas: 3
   selector:
     matchLabels:
@@ -21,7 +21,7 @@ spec:
         release: {{ .Release.Name }}
     spec:
       {{- if .Values.rbac.enabled }}
-      serviceAccountName: {{ template "helm.fullname" . }}-db
+      serviceAccountName: {{ template "fullname" . }}-db
       {{- end }}
       terminationGracePeriodSeconds: 10
       containers:
@@ -43,7 +43,7 @@ spec:
             memory: 100Mi
             cpu: 10m
         volumeMounts:
-        - name: {{ template "helm.fullname" . }}-db
+        - name: {{ template "fullname" . }}-db
           mountPath: /data/db
       - name: db-sidecar
         image: cvallance/mongo-k8s-sidecar
@@ -53,10 +53,10 @@ spec:
         - name: KUBE_NAMESPACE
           value: {{ .Release.Namespace }}
         - name: KUBERNETES_MONGO_SERVICE_NAME
-          value: {{ template "helm.fullname" . }}-db
+          value: {{ template "fullname" . }}-db
   volumeClaimTemplates:
   - metadata:
-      name: {{ template "helm.fullname" . }}-db
+      name: {{ template "fullname" . }}-db
       labels:
         app: {{ template "helm.name" . }}-db
         chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}