suitecrm: use name template for app labels

helm · Jul 29, 2017 · b94449e · b94449e
1 parent 095a022
commit b94449e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/stable/suitecrm/templates/_helpers.tpl b/stable/suitecrm/templates/_helpers.tpl
@@ -8,7 +8,7 @@ Expand the name of the chart.
 
 {{/*
 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).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
@@ -17,7 +17,7 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
 
 {{/*
 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).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "mariadb.fullname" -}}
 {{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}

diff --git a/stable/suitecrm/templates/apache-pvc.yaml b/stable/suitecrm/templates/apache-pvc.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 metadata:
  name: {{ template "fullname" . }}-apache
  labels:
- app: {{ template "fullname" . }}
+ app: {{ template "name" . }}
  chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
  release: "{{ .Release.Name }}"
  heritage: "{{ .Release.Service }}"

diff --git a/stable/suitecrm/templates/deployment.yaml b/stable/suitecrm/templates/deployment.yaml
@@ -4,15 +4,15 @@ kind: Deployment
 metadata:
  name: {{ template "fullname" . }}
  labels:
- app: {{ template "fullname" . }}
+ app: {{ template "name" . }}
  chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
  release: "{{ .Release.Name }}"
  heritage: "{{ .Release.Service }}"
 spec:
  template:
  metadata:
  labels:
- app: {{ template "fullname" . }}
+ app: {{ template "name" . }}
  chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
  release: "{{ .Release.Name }}"
  heritage: "{{ .Release.Service }}"

diff --git a/stable/suitecrm/templates/secrets.yaml b/stable/suitecrm/templates/secrets.yaml
@@ -3,7 +3,7 @@ kind: Secret
 metadata:
  name: {{ template "fullname" . }}
  labels:
- app: {{ template "fullname" . }}
+ app: {{ template "name" . }}
  chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
  release: "{{ .Release.Name }}"
  heritage: "{{ .Release.Service }}"

diff --git a/stable/suitecrm/templates/suitecrm-pvc.yaml b/stable/suitecrm/templates/suitecrm-pvc.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 metadata:
  name: {{ template "fullname" . }}-suitecrm
  labels:
- app: {{ template "fullname" . }}
+ app: {{ template "name" . }}
  chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
  release: "{{ .Release.Name }}"
  heritage: "{{ .Release.Service }}"

diff --git a/stable/suitecrm/templates/svc.yaml b/stable/suitecrm/templates/svc.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
  name: {{ template "fullname" . }}
  labels:
- app: {{ template "fullname" . }}
+ app: {{ template "name" . }}
  chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
  release: "{{ .Release.Name }}"
  heritage: "{{ .Release.Service }}"
@@ -22,4 +22,4 @@ spec:
  port: 443
  targetPort: https
  selector:
- app: {{ template "fullname" . }}
+ app: {{ template "name" . }}