diff --git a/stable/consul/Chart.yaml b/stable/consul/Chart.yaml index 4b68bdbd0584..b8c51c902be4 100755 --- a/stable/consul/Chart.yaml +++ b/stable/consul/Chart.yaml @@ -1,11 +1,13 @@ name: consul home: https://github.com/hashicorp/consul -version: 1.0.0 +version: 1.1.0 appVersion: 1.0.0 -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. +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. icon: https://raw.githubusercontent.com/hashicorp/consul/bce3809dfca37b883828c3715b84143dd71c0f85/website/source/assets/images/favicons/android-chrome-512x512.png sources: - - https://github.com/kelseyhightower/consul-on-kubernetes +- https://github.com/kelseyhightower/consul-on-kubernetes maintainers: - - name: lachie83 - email: lachlan.evenson@microsoft.com +- name: lachie83 + email: lachlan.evenson@microsoft.com diff --git a/stable/consul/templates/_helpers.tpl b/stable/consul/templates/_helpers.tpl index f0d83d2edba6..a37f635e9354 100644 --- a/stable/consul/templates/_helpers.tpl +++ b/stable/consul/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "consul.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -10,7 +10,7 @@ Expand the name of the chart. 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 "fullname" -}} +{{- define "consul.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/stable/consul/templates/consul-test.yaml b/stable/consul/templates/consul-test.yaml index 589553973a43..192a1b63cc7e 100644 --- a/stable/consul/templates/consul-test.yaml +++ b/stable/consul/templates/consul-test.yaml @@ -31,7 +31,7 @@ spec: volumes: - name: tests configMap: - name: {{ template "fullname" . }}-tests + name: {{ template "consul.fullname" . }}-tests - name: tools emptyDir: {} restartPolicy: Never diff --git a/stable/consul/templates/consul.yaml b/stable/consul/templates/consul.yaml index 6bd2e889be40..eebf083cbf3f 100644 --- a/stable/consul/templates/consul.yaml +++ b/stable/consul/templates/consul.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }}-gossip-key + name: {{ template "consul.fullname" . }}-gossip-key type: Opaque data: gossip-key: {{ randAlphaNum 24 | b64enc }} @@ -10,7 +10,7 @@ data: apiVersion: v1 kind: Service metadata: - name: "{{ template "fullname" . }}-ui" + name: "{{ template "consul.fullname" . }}-ui" labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} @@ -29,7 +29,7 @@ spec: apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: "{{ template "fullname" . }}-pdb" + name: "{{ template "consul.fullname" . }}-pdb" spec: maxUnavailable: {{ .Values.maxUnavailable }} selector: @@ -40,7 +40,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: "{{ template "fullname" . }}" + name: "{{ template "consul.fullname" . }}" labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} @@ -80,20 +80,20 @@ spec: apiVersion: apps/v1beta1 kind: StatefulSet metadata: - name: "{{ template "fullname" . }}" + name: "{{ template "consul.fullname" . }}" labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: - serviceName: "{{ template "fullname" . }}" + serviceName: "{{ template "consul.fullname" . }}" replicas: {{ default 3 .Values.Replicas }} updateStrategy: type: RollingUpdate template: metadata: - name: "{{ template "fullname" . }}" + name: "{{ template "consul.fullname" . }}" labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} @@ -128,7 +128,7 @@ spec: - "{{ .Release.Name }}-{{ .Values.Component }}" {{- end }} containers: - - name: "{{ template "fullname" . }}" + - name: "{{ template "consul.fullname" . }}" image: "{{ .Values.Image }}:{{ .Values.ImageTag }}" imagePullPolicy: "{{ .Values.ImagePullPolicy }}" ports: @@ -161,7 +161,7 @@ spec: - name: INITIAL_CLUSTER_SIZE value: {{ default 3 .Values.Replicas | quote }} - name: STATEFULSET_NAME - value: "{{ template "fullname" . }}" + value: "{{ template "consul.fullname" . }}" - name: POD_IP valueFrom: fieldRef: @@ -235,7 +235,7 @@ spec: volumes: - name: gossip-key secret: - secretName: {{ template "fullname" . }}-gossip-key + secretName: {{ template "consul.fullname" . }}-gossip-key volumeClaimTemplates: - metadata: name: datadir diff --git a/stable/consul/templates/test-config.yaml b/stable/consul/templates/test-config.yaml index deb42e05524c..96071d78754c 100644 --- a/stable/consul/templates/test-config.yaml +++ b/stable/consul/templates/test-config.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "fullname" . }}-tests + name: {{ template "consul.fullname" . }}-tests data: run.sh: |- @test "Testing Consul cluster has quorum" {