Merge branch 'master' into apacheMount

bitnami/apache/templates/_helpers.tpl

@@ -3,7 +3,11 @@
 Expand the name of the chart.
 */}}
 {{- define "apache.name" -}}
+<<<<<<< HEAD
 {{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
+=======
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+>>>>>>> master
 {{- end -}}
 
 {{/*
@@ -11,8 +15,19 @@ 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 "apache.fullname" -}}
+<<<<<<< HEAD
+=======
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+>>>>>>> master
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
 {{- end -}}
 
 {{/*

bitnami/apache/templates/deployment.yaml

@@ -3,6 +3,7 @@ kind: Deployment
 metadata:
   name: {{ template "apache.fullname" . }}
   labels:
+<<<<<<< HEAD
     app.kubernetes.io/name: {{ template "apache.fullname" . }}
     helm.sh/chart: {{ include "apache.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
@@ -21,6 +22,26 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
       {{- if or .Values.podAnnotations .Values.metrics.enabled }}
+=======
+    app: {{ template "apache.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+spec:
+  selector:
+    matchLabels:
+      app: {{ template "apache.fullname" . }}
+      release: "{{ .Release.Name }}"
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: {{ template "apache.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
+        heritage: "{{ .Release.Service }}"
+{{- if or .Values.podAnnotations .Values.metrics.enabled }}
+>>>>>>> master
       annotations:
         {{- if .Values.podAnnotations }}
           {{- toYaml .Values.podAnnotations | nindent 8 }}
@@ -49,6 +70,7 @@ spec:
         - name: htdocs
           mountPath: /app
       containers:
+<<<<<<< HEAD
       - name: git-repo-syncer
         image: "{{ template "git.image" . }}"
         imagePullPolicy: {{ .Values.git.pullPolicy | quote }}
@@ -67,6 +89,9 @@ spec:
       containers:
       {{- end }}
       - name: "{{ template "apache.fullname" . }}"
+=======
+      - name: apache
+>>>>>>> master
         image: "{{ template "apache.image" . }}"
         imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         ports: