Revert pull request #1283

bitnami/consul/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: consul
-version: 4.2.14
+version: 4.2.15
 appVersion: 1.5.2
 description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and configuration easy.
 home: https://www.consul.io/

bitnami/consul/README.md

@@ -58,8 +58,6 @@ The following tables lists the configurable parameters of the HashiCorp Consul c
 | `image.tag`                          | HashiCorp Consul image tag                                       | `{TAG_NAME}`                                               |
 | `image.pullPolicy`                   | Image pull policy                                                | `IfNotPresent`                                             |
 | `image.pullSecrets`                  | Specify docker-registry secret names as an array                 | `[]` (does not add image pull secrets to deployed pods)    |
-| `nameOverride`                       | String to partially override consul.fullname template with a string (will prepend the release name) | `nil`                   |
-| `fullnameOverride`                   | String to fully override consul.fullname template with a string  | `nil`                                                      |
 | `replicas`                           | Number of replicas                                               | `3`                                                        |
 | `port`                               | HashiCorp Consul http listening port                             | `8500`                                                     |
 | `service.rpcPort`                    | HashiCorp Consul rpc listening port                              | `8400`                                                     |

bitnami/consul/templates/_helpers.tpl

@@ -11,17 +11,9 @@ 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 "consul.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-{{- end -}}
-{{- end -}}
 
 {{/*
 Create chart name and version as used by the chart label.

bitnami/consul/templates/statefulset.yaml

@@ -77,7 +77,7 @@ spec:
                   - "{{ template "consul.name" . }}"
       {{- end }}
       containers:
-      - name: consul
+      - name: "{{ template "consul.fullname" . }}"
         image: "{{ template "consul.image" . }}"
         imagePullPolicy: "{{ .Values.image.pullPolicy }}"
         ports:

bitnami/consul/values-production.yaml

@@ -26,14 +26,6 @@ image:
   # pullSecrets:
   #   - myRegistryKeySecretName
 
-## String to partially override consul.fullname template (will maintain the release name)
-##
-# nameOverride:
-
-## String to fully override consul.fullname template
-##
-# fullnameOverride:
-
 ## Consul replicas
 replicas: 3
 

bitnami/consul/values.yaml

@@ -26,14 +26,6 @@ image:
   # pullSecrets:
   #   - myRegistryKeySecretName
 
-## String to partially override consul.fullname template (will maintain the release name)
-##
-# nameOverride:
-
-## String to fully override consul.fullname template
-##
-# fullnameOverride:
-
 ## Consul replicas
 replicas: 3