From 912f50c7165383834fc4706ffbe162dd7068b9dd Mon Sep 17 00:00:00 2001 From: Frederic Hemberger Date: Sun, 9 Jul 2017 21:11:24 +0200 Subject: [PATCH] Use consistent whitespace in template placeholders (#1437) Use consistent whitespace in template placeholders --- .../etcd/templates/etcd-statefulset.yaml | 48 +++++------ .../templates/addons-grafana-deployment.yaml | 2 +- .../istio/templates/addons-grafana-svc.yaml | 2 +- .../templates/addons-servicegraph-svc.yaml | 2 +- incubator/kafka/templates/kafka-ss.yaml | 44 +++++----- incubator/patroni/templates/ep-patroni.yaml | 2 +- incubator/patroni/templates/sec-patroni.yaml | 2 +- .../templates/statefulset-patroni.yaml | 10 +-- incubator/patroni/templates/svc-patroni.yaml | 2 +- .../templates/_helpers.tpl | 4 +- .../templates/tensorflow-inception.yaml | 48 +++++------ incubator/zookeeper/templates/NOTES.txt | 38 ++++---- incubator/zookeeper/templates/csvc.yaml | 10 +-- incubator/zookeeper/templates/pdb.yaml | 18 ++-- incubator/zookeeper/templates/ss.yaml | 70 +++++++-------- incubator/zookeeper/templates/svc.yaml | 12 +-- stable/chaoskube/templates/deployment.yaml | 2 +- stable/chronograf/templates/deployment.yaml | 6 +- .../templates/cockroachdb-statefulset.yaml | 78 ++++++++--------- stable/consul/templates/consul-test.yaml | 6 +- stable/consul/templates/consul.yaml | 86 +++++++++---------- stable/consul/templates/test-config.yaml | 8 +- stable/factorio/templates/deployment.yaml | 6 +- stable/fluent-bit/templates/daemonset.yaml | 2 +- stable/ghost/templates/NOTES.txt | 2 +- stable/grafana/templates/deployment.yaml | 2 +- stable/grafana/templates/job.yaml | 2 +- stable/grafana/templates/svc.yaml | 2 +- stable/jenkins/templates/NOTES.txt | 2 +- stable/jenkins/templates/config.yaml | 16 ++-- .../jenkins/templates/jenkins-agent-svc.yaml | 12 +-- .../templates/jenkins-master-deployment.yaml | 36 ++++---- .../jenkins-master-networkpolicy.yaml | 14 +-- .../jenkins/templates/jenkins-master-svc.yaml | 2 +- stable/jenkins/templates/jenkins-test.yaml | 6 +- stable/jenkins/templates/test-config.yaml | 4 +- stable/kapacitor/templates/deployment.yaml | 2 +- stable/kube-ops-view/templates/ingress.yaml | 4 +- stable/kube-ops-view/templates/service.yaml | 4 +- stable/kube2iam/templates/daemonset.yaml | 2 +- stable/linkerd/templates/config.yaml | 2 +- stable/linkerd/templates/daemonset.yaml | 4 +- stable/locust/templates/NOTES.txt | 2 +- stable/locust/templates/master-deploy.yaml | 6 +- stable/locust/templates/master-svc.yaml | 4 +- stable/locust/templates/worker-deploy.yaml | 8 +- stable/magento/templates/NOTES.txt | 2 +- stable/mailhog/templates/service.yaml | 2 +- stable/minecraft/templates/deployment.yaml | 4 +- stable/minio/templates/minio_statefulset.yaml | 2 +- .../templates/mongodb-statefulset.yaml | 2 +- .../templates/controller-daemonset.yaml | 4 +- .../templates/controller-deployment.yaml | 4 +- .../templates/controller-service.yaml | 2 +- .../templates/default-backend-deployment.yaml | 2 +- stable/opencart/templates/NOTES.txt | 2 +- stable/openvpn/templates/config-openvpn.yaml | 28 +++--- .../openvpn/templates/openvpn-deployment.yaml | 20 ++--- stable/osclass/templates/NOTES.txt | 2 +- stable/owncloud/templates/NOTES.txt | 2 +- stable/phabricator/templates/NOTES.txt | 2 +- stable/prestashop/templates/NOTES.txt | 2 +- .../templates/alertmanager-ingress.yaml | 2 +- .../templates/alertmanager-service.yaml | 4 +- .../templates/kube-state-metrics-svc.yaml | 4 +- .../templates/node-exporter-service.yaml | 4 +- .../prometheus/templates/server-ingress.yaml | 2 +- .../prometheus/templates/server-service.yaml | 4 +- stable/redmine/templates/NOTES.txt | 2 +- stable/redmine/templates/svc.yaml | 6 +- .../rethinkdb-cluster-stateful-set.yaml | 8 +- .../templates/rethinkdb-proxy-deployment.yaml | 8 +- stable/sensu/templates/deployment.yaml | 42 ++++----- stable/sensu/templates/svc.yaml | 6 +- stable/sentry/templates/cron-deployment.yaml | 4 +- .../sentry/templates/hooks/db-init.job.yaml | 8 +- .../templates/hooks/user-create.job.yaml | 8 +- stable/sentry/templates/web-deployment.yaml | 4 +- .../sentry/templates/workers-deployment.yaml | 4 +- .../templates/spark-master-deployment.yaml | 60 ++++++------- .../templates/spark-worker-deployment.yaml | 30 +++---- .../templates/spark-zeppelin-deployment.yaml | 42 ++++----- stable/spartakus/templates/deployment.yaml | 2 +- .../templates/configmap/jenkins-config.yaml | 8 +- .../templates/configmap/s3-config.yaml | 2 +- .../templates/configmap/spinnaker-config.yaml | 28 +++--- .../spinnaker/templates/deployments/igor.yaml | 16 ++-- .../templates/hooks/create-bucket.yaml | 6 +- .../templates/hooks/delete-jobs.yaml | 6 +- .../templates/hooks/upload-build-image.yaml | 4 +- .../templates/hooks/upload-run-script.yaml | 4 +- stable/sumokube/templates/config.yaml | 2 +- stable/sumokube/templates/secrets.yaml | 2 +- stable/traefik/templates/deployment.yaml | 8 +- stable/uchiwa/templates/deployment.yaml | 2 +- stable/uchiwa/templates/svc.yaml | 6 +- stable/weave-cloud/templates/NOTES.txt | 2 +- stable/weave-cloud/templates/cortex.yaml | 2 +- stable/weave-cloud/templates/flux.yaml | 2 +- stable/weave-cloud/templates/scope.yaml | 2 +- 100 files changed, 542 insertions(+), 542 deletions(-) diff --git a/incubator/etcd/templates/etcd-statefulset.yaml b/incubator/etcd/templates/etcd-statefulset.yaml index 7b311198ff05..eb928dc774a6 100644 --- a/incubator/etcd/templates/etcd-statefulset.yaml +++ b/incubator/etcd/templates/etcd-statefulset.yaml @@ -6,59 +6,59 @@ metadata: metadata: name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: ports: - - port: {{.Values.PeerPort}} + - port: {{ .Values.PeerPort }} name: etcd-server - - port: {{.Values.ClientPort}} + - port: {{ .Values.ClientPort }} name: etcd-client clusterIP: None selector: - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" --- apiVersion: apps/v1beta1 kind: StatefulSet metadata: name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: serviceName: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}" - replicas: {{default 3 .Values.Replicas}} + replicas: {{ default 3 .Values.Replicas }} template: metadata: name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: pod.alpha.kubernetes.io/initialized: "true" spec: containers: - name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}" - image: "{{.Values.Image}}:{{.Values.ImageTag}}" - imagePullPolicy: "{{.Values.ImagePullPolicy}}" + image: "{{ .Values.Image }}:{{ .Values.ImageTag }}" + imagePullPolicy: "{{ .Values.ImagePullPolicy }}" ports: - - containerPort: {{.Values.PeerPort}} + - containerPort: {{ .Values.PeerPort }} name: peer - - containerPort: {{.Values.ClientPort}} + - containerPort: {{ .Values.ClientPort }} name: client resources: requests: - cpu: "{{.Values.Cpu}}" - memory: "{{.Values.Memory}}" + cpu: "{{ .Values.Cpu }}" + memory: "{{ .Values.Memory }}" env: - name: INITIAL_CLUSTER_SIZE - value: {{default 3 .Values.Replicas | quote }} + value: {{ default 3 .Values.Replicas | quote }} - name: SET_NAME value: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 24 }}" volumeMounts: @@ -204,4 +204,4 @@ spec: resources: requests: # upstream recommended max is 700M - storage: "{{.Values.Storage}}" + storage: "{{ .Values.Storage }}" diff --git a/incubator/istio/templates/addons-grafana-deployment.yaml b/incubator/istio/templates/addons-grafana-deployment.yaml index c5a8ce61e441..ad0980082ce6 100644 --- a/incubator/istio/templates/addons-grafana-deployment.yaml +++ b/incubator/istio/templates/addons-grafana-deployment.yaml @@ -42,4 +42,4 @@ spec: volumes: - name: grafana-data emptyDir: {} -{{end}} \ No newline at end of file +{{ end }} diff --git a/incubator/istio/templates/addons-grafana-svc.yaml b/incubator/istio/templates/addons-grafana-svc.yaml index d3851b126c09..2176176acb7e 100644 --- a/incubator/istio/templates/addons-grafana-svc.yaml +++ b/incubator/istio/templates/addons-grafana-svc.yaml @@ -16,4 +16,4 @@ spec: app: {{ include "name" . }} component: {{ $serviceName }}-{{ .Values.addons.grafana.deployment.name }} release: {{ .Release.Name }} -{{end}} \ No newline at end of file +{{ end }} diff --git a/incubator/istio/templates/addons-servicegraph-svc.yaml b/incubator/istio/templates/addons-servicegraph-svc.yaml index 446535550188..c477540ab5b0 100644 --- a/incubator/istio/templates/addons-servicegraph-svc.yaml +++ b/incubator/istio/templates/addons-servicegraph-svc.yaml @@ -15,4 +15,4 @@ spec: app: {{ include "name" . }} component: {{ $serviceName }}-{{ .Values.addons.servicegraph.deployment.name }} release: {{ .Release.Name }} -{{end}} \ No newline at end of file +{{ end }} diff --git a/incubator/kafka/templates/kafka-ss.yaml b/incubator/kafka/templates/kafka-ss.yaml index 721d871823ca..a38645aa453b 100644 --- a/incubator/kafka/templates/kafka-ss.yaml +++ b/incubator/kafka/templates/kafka-ss.yaml @@ -8,7 +8,7 @@ spec: - port: 2181 name: client selector: - component: "{{.Release.Name}}" + component: "{{ .Release.Name }}" # A headless service to create DNS records --- @@ -17,19 +17,19 @@ kind: Service metadata: name: "{{ printf "%s-broker-%s" .Release.Name .Values.Name | trunc 63 }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: - "helm.sh/created": {{.Release.Time.Seconds | quote }} + "helm.sh/created": {{ .Release.Time.Seconds | quote }} service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" spec: ports: - port: 9092 clusterIP: None selector: - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" app: kafka --- apiVersion: v1 @@ -37,17 +37,17 @@ kind: Service metadata: name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 63 }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: - "helm.sh/created": {{.Release.Time.Seconds | quote }} + "helm.sh/created": {{ .Release.Time.Seconds | quote }} spec: ports: - port: 9092 selector: - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" app: kafka --- apiVersion: apps/v1beta1 @@ -56,12 +56,12 @@ metadata: name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 63 }}" labels: app: kafka - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: - "helm.sh/created": {{.Release.Time.Seconds | quote }} + "helm.sh/created": {{ .Release.Time.Seconds | quote }} spec: serviceName: "{{ printf "%s-broker-%s" .Release.Name .Values.Name | trunc 63 }}" replicas: {{ default 3 .Values.Replicas }} @@ -69,7 +69,7 @@ spec: metadata: labels: app: kafka - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: pod.alpha.kubernetes.io/initialized: "true" pod.alpha.kubernetes.io/init-containers: '[ @@ -77,8 +77,8 @@ spec: spec: containers: - name: "{{ printf "%s-broker-%s" .Release.Name .Values.Name | trunc 63 }}" - image: "{{.Values.Image}}:{{.Values.ImageTag}}" - imagePullPolicy: "{{.Values.ImagePullPolicy}}" + image: "{{ .Values.Image }}:{{ .Values.ImageTag }}" + imagePullPolicy: "{{ .Values.ImagePullPolicy }}" livenessProbe: exec: command: @@ -125,4 +125,4 @@ spec: accessModes: [ "ReadWriteOnce" ] resources: requests: - storage: {{.Values.Storage}} + storage: {{ .Values.Storage }} diff --git a/incubator/patroni/templates/ep-patroni.yaml b/incubator/patroni/templates/ep-patroni.yaml index a170b096a4ec..ca84ac34dbc6 100644 --- a/incubator/patroni/templates/ep-patroni.yaml +++ b/incubator/patroni/templates/ep-patroni.yaml @@ -6,5 +6,5 @@ metadata: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" subsets: [] diff --git a/incubator/patroni/templates/sec-patroni.yaml b/incubator/patroni/templates/sec-patroni.yaml index 38a0210aebe8..770ed7b4aa9b 100644 --- a/incubator/patroni/templates/sec-patroni.yaml +++ b/incubator/patroni/templates/sec-patroni.yaml @@ -6,7 +6,7 @@ metadata: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" type: Opaque data: password-superuser: {{ .Values.Credentials.Superuser | b64enc }} diff --git a/incubator/patroni/templates/statefulset-patroni.yaml b/incubator/patroni/templates/statefulset-patroni.yaml index 96d2be1339ce..d4d8552fbb9a 100644 --- a/incubator/patroni/templates/statefulset-patroni.yaml +++ b/incubator/patroni/templates/statefulset-patroni.yaml @@ -19,12 +19,12 @@ spec: chart: "{{.Chart.Name}}-{{.Chart.Version}}" component: "{{.Release.Name}}-{{.Values.Component}}" spec: - {{if .Values.NodeSelector }} + {{ if .Values.NodeSelector }} nodeSelector: - {{range $key, $value := .Values.NodeSelector}} + {{ range $key, $value := .Values.NodeSelector }} {{ $key }}: {{ $value | quote }} - {{end}} - {{end}} + {{ end }} + {{ end }} containers: - name: spilo image: "{{ .Values.Spilo.Image }}:{{ .Values.Spilo.Version }}" @@ -97,7 +97,7 @@ spec: heritage: {{.Release.Service | quote }} release: {{.Release.Name | quote }} chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: accessModes: {{ toYaml .Values.persistentVolume.accessModes | indent 8 }} diff --git a/incubator/patroni/templates/svc-patroni.yaml b/incubator/patroni/templates/svc-patroni.yaml index 8bbd672f07a0..9dc55793603a 100644 --- a/incubator/patroni/templates/svc-patroni.yaml +++ b/incubator/patroni/templates/svc-patroni.yaml @@ -6,7 +6,7 @@ metadata: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: type: ClusterIP ports: diff --git a/incubator/tensorflow-inception/templates/_helpers.tpl b/incubator/tensorflow-inception/templates/_helpers.tpl index 92c9f2080705..2a9bbaad2339 100644 --- a/incubator/tensorflow-inception/templates/_helpers.tpl +++ b/incubator/tensorflow-inception/templates/_helpers.tpl @@ -12,5 +12,5 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this */}} {{- define "fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} -{{- end -}} \ No newline at end of file +{{- printf "%s-%s" .Release.Name $name | trunc 24 | trimSuffix "-" -}} +{{- end -}} diff --git a/incubator/tensorflow-inception/templates/tensorflow-inception.yaml b/incubator/tensorflow-inception/templates/tensorflow-inception.yaml index 98b17165ad4f..6955a160e323 100644 --- a/incubator/tensorflow-inception/templates/tensorflow-inception.yaml +++ b/incubator/tensorflow-inception/templates/tensorflow-inception.yaml @@ -3,19 +3,19 @@ kind: Service metadata: name: {{ template "fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: - "helm.sh/created": {{.Release.Time.Seconds | quote }} + "helm.sh/created": {{ .Release.Time.Seconds | quote }} spec: ports: - - port: {{.Values.ServicePort}} - targetPort: {{.Values.ContainerPort}} + - port: {{ .Values.ServicePort }} + targetPort: {{ .Values.ContainerPort }} selector: - component: "{{.Release.Name}}-{{.Values.Component}}" - type: {{.Values.ServiceType}} + component: "{{ .Release.Name }}-{{ .Values.Component }}" + type: {{ .Values.ServiceType }} --- apiVersion: extensions/v1beta1 @@ -23,41 +23,41 @@ kind: Deployment metadata: name: {{ template "fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: - "helm.sh/created": {{.Release.Time.Seconds | quote }} + "helm.sh/created": {{ .Release.Time.Seconds | quote }} spec: replicas: {{ default 1 .Values.Replicas }} strategy: type: RollingUpdate selector: matchLabels: - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" template: metadata: labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: containers: - name: {{ template "fullname" . }} - image: "{{.Values.Image}}:{{.Values.ImageTag}}" - imagePullPolicy: "{{.Values.ImagePullPolicy}}" + image: "{{ .Values.Image }}:{{ .Values.ImageTag }}" + imagePullPolicy: "{{ .Values.ImagePullPolicy }}" command: - "/bin/sh" - "-c" args: - - "/serving/bazel-bin/tensorflow_serving/model_servers/tensorflow_model_server --port={{.Values.ContainerPort}} --model_name=inception --model_base_path=/serving/inception-export" + - "/serving/bazel-bin/tensorflow_serving/model_servers/tensorflow_model_server --port={{ .Values.ContainerPort }} --model_name=inception --model_base_path=/serving/inception-export" ports: - - containerPort: {{.Values.ContainerPort}} + - containerPort: {{ .Values.ContainerPort }} readinessProbe: tcpSocket: - port: {{.Values.ContainerPort}} + port: {{ .Values.ContainerPort }} initialDelaySeconds: 15 timeoutSeconds: 1 resources: diff --git a/incubator/zookeeper/templates/NOTES.txt b/incubator/zookeeper/templates/NOTES.txt index e68b38c5e03a..0cfe82ed2725 100644 --- a/incubator/zookeeper/templates/NOTES.txt +++ b/incubator/zookeeper/templates/NOTES.txt @@ -1,24 +1,24 @@ Thank you for installing ZooKeeper on your Kubernetes cluster. More information about ZooKeeper can be found at https://zookeeper.apache.org/doc/current/ -1. ZooKeeper is not accessible outside of the Kubernetes cluster. Its purpose is -to provide coordination for distributed systems running inside the cluster. As -ZooKeeper uses a TCP based protocol with an internal wire format, you will -probably want to use an existing client library for communication with the -ensemble. -2. The officially maintained clients are written in C and Java, and these can be -obtained with ZooKeeper release from -http://www-us.apache.org/dist/zookeeper/zookeeper-3.4.9/. -A list of language specific bindings and higher level libraries is available +1. ZooKeeper is not accessible outside of the Kubernetes cluster. Its purpose is +to provide coordination for distributed systems running inside the cluster. As +ZooKeeper uses a TCP based protocol with an internal wire format, you will +probably want to use an existing client library for communication with the +ensemble. +2. The officially maintained clients are written in C and Java, and these can be +obtained with ZooKeeper release from +http://www-us.apache.org/dist/zookeeper/zookeeper-3.4.9/. +A list of language specific bindings and higher level libraries is available here https://cwiki.apache.org/confluence/display/ZOOKEEPER/ZKClientBindings. -3. Most ZooKeeper clients require a connection string when instantiating an -instance of the client library, or when first connecting the client to the +3. Most ZooKeeper clients require a connection string when instantiating an +instance of the client library, or when first connecting the client to the ensemble. The connection string takes the form -:,:,... . If your ensemble has greater than 1 -server, you should provide multiple servers in the connection string to allow -for the client to continue to function in the presence of individual server -failures. It is important that you do not use IP addresses and instead use the -DNS entries for the domain established by the StatefulSet's HeadlessService. -Your connection string should look like zk-{{.Release.Name | trunc 24 }}-0.{{ printf "zk-hsvc-%s" .Release.Name | trunc 24 }}:{{.Values.ClientPort}},zk-{{.Release.Name | trunc 24 }}-1.{{ printf "zk-hsvc-%s" .Release.Name | trunc 24 }}:{{.Values.ClientPort}},... . -You can also use the client Service zk-csvc:{{.Values.ClientPort}} to -connect to an available ZooKeeper server. \ No newline at end of file +:,:,... . If your ensemble has greater than 1 +server, you should provide multiple servers in the connection string to allow +for the client to continue to function in the presence of individual server +failures. It is important that you do not use IP addresses and instead use the +DNS entries for the domain established by the StatefulSet's HeadlessService. +Your connection string should look like zk-{{ .Release.Name | trunc 24 }}-0.{{ printf "zk-hsvc-%s" .Release.Name | trunc 24 }}:{{ .Values.ClientPort }},zk-{{ .Release.Name | trunc 24 }}-1.{{ printf "zk-hsvc-%s" .Release.Name | trunc 24 }}:{{ .Values.ClientPort }},... . +You can also use the client Service zk-csvc:{{ .Values.ClientPort }} to +connect to an available ZooKeeper server. diff --git a/incubator/zookeeper/templates/csvc.yaml b/incubator/zookeeper/templates/csvc.yaml index d51f80cac31c..692977ba7c72 100644 --- a/incubator/zookeeper/templates/csvc.yaml +++ b/incubator/zookeeper/templates/csvc.yaml @@ -3,13 +3,13 @@ kind: Service metadata: name: "{{ printf "zk-csvc-%s" .Release.Name | trunc 24 }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" spec: ports: - - port: {{.Values.ClientPort}} + - port: {{ .Values.ClientPort }} name: client selector: - component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" \ No newline at end of file + component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" diff --git a/incubator/zookeeper/templates/pdb.yaml b/incubator/zookeeper/templates/pdb.yaml index 4a2ab1ef4c65..bd1af2da4e59 100644 --- a/incubator/zookeeper/templates/pdb.yaml +++ b/incubator/zookeeper/templates/pdb.yaml @@ -3,18 +3,18 @@ kind: PodDisruptionBudget metadata: name: "{{ printf "zk-pdb-%s" .Release.Name | trunc 24 }}" annotations: - helm.sh/created: {{.Release.Time.Seconds | quote }} + helm.sh/created: {{ .Release.Time.Seconds | quote }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" spec: selector: matchLabels: component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" - {{- if .Values.MinAvailable}} - minAvailable: {{.Values.MinAvailable}} - {{- else}} - minAvailable: {{sub .Values.Servers 1}} - {{- end}} \ No newline at end of file + {{- if .Values.MinAvailable }} + minAvailable: {{ .Values.MinAvailable }} + {{- else }} + minAvailable: {{ sub .Values.Servers 1 }} + {{- end }} diff --git a/incubator/zookeeper/templates/ss.yaml b/incubator/zookeeper/templates/ss.yaml index d4bc8929fe2e..b2366028a8f5 100644 --- a/incubator/zookeeper/templates/ss.yaml +++ b/incubator/zookeeper/templates/ss.yaml @@ -3,21 +3,21 @@ kind: StatefulSet metadata: name: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" annotations: - helm.sh/created: {{.Release.Time.Seconds | quote }} + helm.sh/created: {{ .Release.Time.Seconds | quote }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" spec: serviceName: "{{ printf "zk-hsvc-%s" .Release.Name | trunc 24 }}" - replicas: {{.Values.Servers}} + replicas: {{ .Values.Servers }} template: metadata: labels: component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" spec: - {{- if eq .Values.AntiAffinity "hard"}} + {{- if eq .Values.AntiAffinity "hard" }} affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -28,7 +28,7 @@ spec: values: - "{{ printf "zk-%s" .Release.Name | trunc 24 }}" topologyKey: "kubernetes.io/hostname" - {{- else if eq .Values.AntiAffinity "soft"}} + {{- else if eq .Values.AntiAffinity "soft" }} affinity: preferredDuringSchedulingIgnoredDuringExecution: - weight: 1 @@ -37,50 +37,50 @@ spec: matchExpressions: - key: "component" operator: In - values: + values: - "{{ printf "zk-%s" .Release.Name | trunc 24 }}" topologyKey: "kubernetes.io/hostname" - {{- end}} + {{- end }} containers: - name: k8szk - imagePullPolicy: {{.Values.ImagePullPolicy}} + imagePullPolicy: {{ .Values.ImagePullPolicy }} image: gcr.io/google_samples/k8szk:v2 resources: requests: - memory: {{.Values.Memory}} - cpu: {{.Values.Cpu}} + memory: {{ .Values.Memory }} + cpu: {{ .Values.Cpu }} ports: - - containerPort: {{.Values.ClientPort}} + - containerPort: {{ .Values.ClientPort }} name: client - - containerPort: {{.Values.ServerPort}} + - containerPort: {{ .Values.ServerPort }} name: server - - containerPort: {{.Values.LeaderElectionPort}} + - containerPort: {{ .Values.LeaderElectionPort }} name: leader-election env: - name : ZK_REPLICAS - value: "{{.Values.Servers}}" + value: "{{ .Values.Servers }}" - name : ZK_HEAP_SIZE - value: "{{.Values.Heap}}" + value: "{{ .Values.Heap }}" - name : ZK_TICK_TIME - value: "{{.Values.TickTimeMs}}" + value: "{{ .Values.TickTimeMs }}" - name : ZK_INIT_LIMIT - value: "{{.Values.InitTicks}}" + value: "{{ .Values.InitTicks }}" - name : ZK_SYNC_LIMIT - value: "{{.Values.SyncTicks}}" + value: "{{ .Values.SyncTicks }}" - name : ZK_MAX_CLIENT_CNXNS - value: "{{.Values.ClientCnxns}}" + value: "{{ .Values.ClientCnxns }}" - name: ZK_SNAP_RETAIN_COUNT - value: "{{.Values.SnapRetain}}" + value: "{{ .Values.SnapRetain }}" - name: ZK_PURGE_INTERVAL - value: "{{.Values.PurgeHours}}" + value: "{{ .Values.PurgeHours }}" - name: ZK_LOG_LEVEL - value: {{.Values.LogLevel}} + value: {{ .Values.LogLevel }} - name: ZK_CLIENT_PORT - value: "{{.Values.ClientPort}}" + value: "{{ .Values.ClientPort }}" - name: ZK_SERVER_PORT - value: "{{.Values.ServerPort}}" + value: "{{ .Values.ServerPort }}" - name: ZK_ELECTION_PORT - value: "{{.Values.LeaderElectionPort}}" + value: "{{ .Values.LeaderElectionPort }}" command: - sh - -c @@ -89,14 +89,14 @@ spec: exec: command: - "zkOk.sh" - initialDelaySeconds: {{.Values.ProbeInitialDelaySeconds}} - timeoutSeconds: {{.Values.ProbeTimeoutSeconds}} + initialDelaySeconds: {{ .Values.ProbeInitialDelaySeconds }} + timeoutSeconds: {{ .Values.ProbeTimeoutSeconds }} livenessProbe: exec: command: - "zkOk.sh" - initialDelaySeconds: {{.Values.ProbeInitialDelaySeconds}} - timeoutSeconds: {{.Values.ProbeTimeoutSeconds}} + initialDelaySeconds: {{ .Values.ProbeInitialDelaySeconds }} + timeoutSeconds: {{ .Values.ProbeTimeoutSeconds }} volumeMounts: - name: datadir mountPath: /var/lib/zookeeper @@ -110,7 +110,7 @@ spec: accessModes: [ "ReadWriteOnce" ] resources: requests: - storage: {{.Values.Storage}} - {{- if .Values.StorageClass}} - storageClassName: {{.Values.StorageClass | quote}} - {{- end}} + storage: {{ .Values.Storage }} + {{- if .Values.StorageClass }} + storageClassName: {{ .Values.StorageClass | quote }} + {{- end }} diff --git a/incubator/zookeeper/templates/svc.yaml b/incubator/zookeeper/templates/svc.yaml index 968213f9d03b..6d818739030d 100644 --- a/incubator/zookeeper/templates/svc.yaml +++ b/incubator/zookeeper/templates/svc.yaml @@ -3,16 +3,16 @@ kind: Service metadata: name: "{{ printf "zk-hsvc-%s" .Release.Name | trunc 24 }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" spec: ports: - - port: {{.Values.ServerPort}} + - port: {{ .Values.ServerPort }} name: server - - port: {{.Values.LeaderElectionPort}} + - port: {{ .Values.LeaderElectionPort }} name: leader-election clusterIP: None selector: - component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" \ No newline at end of file + component: "{{ printf "zk-%s" .Release.Name | trunc 24 }}" diff --git a/stable/chaoskube/templates/deployment.yaml b/stable/chaoskube/templates/deployment.yaml index 1c022c341392..fe171e21f06c 100644 --- a/stable/chaoskube/templates/deployment.yaml +++ b/stable/chaoskube/templates/deployment.yaml @@ -26,7 +26,7 @@ spec: - --labels={{ .Values.labels }} - --annotations={{ .Values.annotations }} - --namespaces={{ .Values.namespaces }} - {{- if not .Values.dryRun}} + {{- if not .Values.dryRun }} - --no-dry-run {{- end }} resources: diff --git a/stable/chronograf/templates/deployment.yaml b/stable/chronograf/templates/deployment.yaml index 0d879b228455..41fe83f8fe71 100644 --- a/stable/chronograf/templates/deployment.yaml +++ b/stable/chronograf/templates/deployment.yaml @@ -25,7 +25,7 @@ spec: secretKeyRef: name: {{ template "fullname" . }} key: token_secret -{{- if .Values.oauth.github.enabled}} +{{- if .Values.oauth.github.enabled }} - name: GH_CLIENT_ID valueFrom: secretKeyRef: @@ -42,7 +42,7 @@ spec: name: {{ template "fullname" . }} key: gh_orgs {{- end }} -{{- if .Values.oauth.heroku.enabled}} +{{- if .Values.oauth.heroku.enabled }} - name: HEROKU_CLIENT_ID valueFrom: secretKeyRef: @@ -59,7 +59,7 @@ spec: name: {{ template "fullname" . }} key: he_orgs {{- end }} -{{- if .Values.oauth.google.enabled}} +{{- if .Values.oauth.google.enabled }} - name: GOOGLE_CLIENT_ID valueFrom: secretKeyRef: diff --git a/stable/cockroachdb/templates/cockroachdb-statefulset.yaml b/stable/cockroachdb/templates/cockroachdb-statefulset.yaml index fcc7c72b6d51..0132381cc36a 100644 --- a/stable/cockroachdb/templates/cockroachdb-statefulset.yaml +++ b/stable/cockroachdb/templates/cockroachdb-statefulset.yaml @@ -5,23 +5,23 @@ metadata: # automatically load balance connections to the different database pods. name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}-public" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: ports: # The main port, served by gRPC, serves Postgres-flavor SQL, internode # traffic and the cli. - - port: {{.Values.GrpcPort}} - targetPort: {{.Values.GrpcPort}} + - port: {{ .Values.GrpcPort }} + targetPort: {{ .Values.GrpcPort }} name: grpc # The secondary port serves the UI as well as health and debug endpoints. - - port: {{.Values.HttpPort}} - targetPort: {{.Values.HttpPort}} + - port: {{ .Values.HttpPort }} + targetPort: {{ .Values.HttpPort }} name: http selector: - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" --- apiVersion: v1 kind: Service @@ -32,10 +32,10 @@ metadata: # in most circumstances. name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: # This is needed to make the peer-finder work properly and to help avoid # edge cases where instance 0 comes up after losing its data and needs to @@ -50,30 +50,30 @@ metadata: prometheus.io/port: "8080" spec: ports: - - port: {{.Values.GrpcPort}} - targetPort: {{.Values.GrpcPort}} + - port: {{ .Values.GrpcPort }} + targetPort: {{ .Values.GrpcPort }} name: grpc - - port: {{.Values.HttpPort}} - targetPort: {{.Values.HttpPort}} + - port: {{ .Values.HttpPort }} + targetPort: {{ .Values.HttpPort }} name: http clusterIP: None selector: - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" --- apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}-budget" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: selector: matchLabels: - component: "{{.Release.Name}}-{{.Values.Component}}" - minAvailable: {{.Values.MinAvailable}} + component: "{{ .Release.Name }}-{{ .Values.Component }}" + minAvailable: {{ .Values.MinAvailable }} --- apiVersion: apps/v1beta1 kind: StatefulSet @@ -81,14 +81,14 @@ metadata: name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}" spec: serviceName: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}" - replicas: {{default 3 .Values.Replicas}} + replicas: {{ default 3 .Values.Replicas }} template: metadata: labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: scheduler.alpha.kubernetes.io/affinity: > { @@ -99,7 +99,7 @@ spec: "matchExpressions": [{ "key": "component", "operator": "In", - "values": ["{{.Release.Name}}-{{.Values.Component}}"] + "values": ["{{ .Release.Name }}-{{ .Values.Component }}"] }] }, "topologyKey": "kubernetes.io/hostname" @@ -121,12 +121,12 @@ spec: pod.alpha.kubernetes.io/init-containers: '[ { "name": "bootstrap", - "image": "{{.Values.BootstrapImage}}:{{.Values.BootstrapImageTag}}", - "imagePullPolicy": "{{.Values.ImagePullPolicy}}", + "image": "{{ .Values.BootstrapImage }}:{{ .Values.BootstrapImageTag }}", + "imagePullPolicy": "{{ .Values.ImagePullPolicy }}", "args": [ "-on-start=/on-start.sh", "-service={{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}", - "-domain={{.Values.ClusterDomain}}" + "-domain={{ .Values.ClusterDomain }}" ], "env": [ { @@ -150,12 +150,12 @@ spec: spec: containers: - name: "{{ printf "%s-%s" .Release.Name .Values.Name | trunc 56 }}" - image: "{{.Values.Image}}:{{.Values.ImageTag}}" - imagePullPolicy: "{{.Values.ImagePullPolicy}}" + image: "{{ .Values.Image }}:{{ .Values.ImageTag }}" + imagePullPolicy: "{{ .Values.ImagePullPolicy }}" ports: - - containerPort: {{.Values.GrpcPort}} + - containerPort: {{ .Values.GrpcPort }} name: grpc - - containerPort: {{.Values.HttpPort}} + - containerPort: {{ .Values.HttpPort }} name: http resources: {{ toYaml .Values.resources | indent 10 }} @@ -196,10 +196,10 @@ spec: - metadata: name: datadir annotations: - volume.alpha.kubernetes.io/storage-class: "{{.Values.StorageClass}}" + volume.alpha.kubernetes.io/storage-class: "{{ .Values.StorageClass }}" spec: accessModes: - "ReadWriteOnce" resources: requests: - storage: "{{.Values.Storage}}" + storage: "{{ .Values.Storage }}" diff --git a/stable/consul/templates/consul-test.yaml b/stable/consul/templates/consul-test.yaml index b3129b3b80f0..293aa73b9249 100644 --- a/stable/consul/templates/consul-test.yaml +++ b/stable/consul/templates/consul-test.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Pod metadata: - name: "{{.Release.Name}}-ui-test-{{ randAlphaNum 5 | lower }}" + name: "{{ .Release.Name }}-ui-test-{{ randAlphaNum 5 | lower }}" annotations: "helm.sh/hook": test-success "pod.beta.kubernetes.io/init-containers": '[ @@ -20,8 +20,8 @@ metadata: ]' spec: containers: - - name: {{.Release.Name}}-ui-test - image: {{.Values.test.image}}:{{.Values.test.imageTag}} + - name: {{ .Release.Name }}-ui-test + image: {{ .Values.test.image }}:{{ .Values.test.imageTag }} command: ["/tools/bats/bats", "-t", "/tests/run.sh"] volumeMounts: - mountPath: /tests diff --git a/stable/consul/templates/consul.yaml b/stable/consul/templates/consul.yaml index 39d6f1da525a..450e1841f6f2 100644 --- a/stable/consul/templates/consul.yaml +++ b/stable/consul/templates/consul.yaml @@ -12,17 +12,17 @@ kind: Service metadata: name: "{{ template "fullname" . }}-ui" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: ports: - name: http - port: {{.Values.HttpPort}} + port: {{ .Values.HttpPort }} selector: - component: "{{.Release.Name}}-{{.Values.Component}}" - type: "{{.Values.uiService.type}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" + type: "{{ .Values.uiService.type }}" {{- end }} --- apiVersion: v1 @@ -30,58 +30,58 @@ kind: Service metadata: name: "{{ template "fullname" . }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" spec: ports: - name: http - port: {{.Values.HttpPort}} + port: {{ .Values.HttpPort }} - name: rpc - port: {{.Values.RpcPort}} + port: {{ .Values.RpcPort }} - name: serflan-tcp protocol: "TCP" - port: {{.Values.SerflanPort}} + port: {{ .Values.SerflanPort }} - name: serflan-udp protocol: "UDP" - port: {{.Values.SerflanUdpPort}} + port: {{ .Values.SerflanUdpPort }} - name: serfwan-tcp protocol: "TCP" - port: {{.Values.SerfwanPort}} + port: {{ .Values.SerfwanPort }} - name: serfwan-udp protocol: "UDP" - port: {{.Values.SerfwanUdpPort}} + port: {{ .Values.SerfwanUdpPort }} - name: server - port: {{.Values.ServerPort}} + port: {{ .Values.ServerPort }} - name: consuldns - port: {{.Values.ConsulDnsPort}} + port: {{ .Values.ConsulDnsPort }} clusterIP: None selector: - component: "{{.Release.Name}}-{{.Values.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" --- apiVersion: apps/v1beta1 kind: StatefulSet metadata: name: "{{ template "fullname" . }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" spec: serviceName: "{{ template "fullname" . }}" - replicas: {{default 3 .Values.Replicas}} + replicas: {{ default 3 .Values.Replicas }} template: metadata: name: "{{ template "fullname" . }}" labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Component }}" annotations: pod.alpha.kubernetes.io/initialized: "true" spec: @@ -89,33 +89,33 @@ spec: fsGroup: 1000 containers: - name: "{{ template "fullname" . }}" - image: "{{.Values.Image}}:{{.Values.ImageTag}}" - imagePullPolicy: "{{.Values.ImagePullPolicy}}" + image: "{{ .Values.Image }}:{{ .Values.ImageTag }}" + imagePullPolicy: "{{ .Values.ImagePullPolicy }}" ports: - name: http - containerPort: {{.Values.HttpPort}} + containerPort: {{ .Values.HttpPort }} - name: rpc - containerPort: {{.Values.RpcPort}} + containerPort: {{ .Values.RpcPort }} - name: serflan-tcp protocol: "TCP" - containerPort: {{.Values.SerflanPort}} + containerPort: {{ .Values.SerflanPort }} - name: serflan-udp protocol: "UDP" - containerPort: {{.Values.SerflanUdpPort}} + containerPort: {{ .Values.SerflanUdpPort }} - name: serfwan-tcp protocol: "TCP" - containerPort: {{.Values.SerfwanPort}} + containerPort: {{ .Values.SerfwanPort }} - name: serfwan-udp protocol: "UDP" - containerPort: {{.Values.SerfwanUdpPort}} + containerPort: {{ .Values.SerfwanUdpPort }} - name: server - containerPort: {{.Values.ServerPort}} + containerPort: {{ .Values.ServerPort }} - name: consuldns - containerPort: {{.Values.ConsulDnsPort}} + containerPort: {{ .Values.ConsulDnsPort }} resources: requests: - cpu: "{{.Values.Cpu}}" - memory: "{{.Values.Memory}}" + cpu: "{{ .Values.Cpu }}" + memory: "{{ .Values.Memory }}" env: - name: INITIAL_CLUSTER_SIZE value: {{ default 3 .Values.Replicas | quote }} @@ -193,7 +193,7 @@ spec: name: datadir annotations: {{- if .Values.StorageClass }} - volume.beta.kubernetes.io/storage-class: {{.Values.StorageClass | quote}} + volume.beta.kubernetes.io/storage-class: {{ .Values.StorageClass | quote }} {{- else }} volume.alpha.kubernetes.io/storage-class: default {{- end }} @@ -203,4 +203,4 @@ spec: resources: requests: # upstream recommended max is 700M - storage: "{{.Values.Storage}}" + storage: "{{ .Values.Storage }}" diff --git a/stable/consul/templates/test-config.yaml b/stable/consul/templates/test-config.yaml index 4a8ae7a0055c..deb42e05524c 100644 --- a/stable/consul/templates/test-config.yaml +++ b/stable/consul/templates/test-config.yaml @@ -6,11 +6,11 @@ data: run.sh: |- @test "Testing Consul cluster has quorum" { for i in {0..2}; do - if [ `kubectl exec {{.Release.Name}}-consul-$i consul members --namespace={{.Release.Namespace}} | grep server | wc -l` -ge "3" ]; then - echo "{{.Release.Name}}-consul-$i OK. consul members returning at least 3 records." + if [ `kubectl exec {{ .Release.Name }}-consul-$i consul members --namespace={{ .Release.Namespace }} | grep server | wc -l` -ge "3" ]; then + echo "{{ .Release.Name }}-consul-$i OK. consul members returning at least 3 records." else - echo "{{.Release.Name}}-consul-$i ERROR. consul members returning less than 3 records." + echo "{{ .Release.Name }}-consul-$i ERROR. consul members returning less than 3 records." exit 1 fi done - } \ No newline at end of file + } diff --git a/stable/factorio/templates/deployment.yaml b/stable/factorio/templates/deployment.yaml index c91224fa6992..3e85be846b64 100644 --- a/stable/factorio/templates/deployment.yaml +++ b/stable/factorio/templates/deployment.yaml @@ -78,7 +78,7 @@ spec: - name: rcon containerPort: {{ .Values.factorioServer.rcon.port }} protocol: TCP - {{- end}} + {{- end }} volumeMounts: - name: saves mountPath: /opt/factorio/saves @@ -88,14 +88,14 @@ spec: - name: saves {{- if .Values.persistence.savedGames.enabled }} persistentVolumeClaim: - claimName: {{template "fullname" .}}-savedgames + claimName: {{ template "fullname" . }}-savedgames {{- else }} emptyDir: {} {{- end }} - name: mods {{- if .Values.persistence.mods.enabled }} persistentVolumeClaim: - claimName: {{template "fullname" .}}-mods + claimName: {{ template "fullname" . }}-mods {{- else }} emptyDir: {} {{- end }} diff --git a/stable/fluent-bit/templates/daemonset.yaml b/stable/fluent-bit/templates/daemonset.yaml index 23658b84590e..11083435409d 100644 --- a/stable/fluent-bit/templates/daemonset.yaml +++ b/stable/fluent-bit/templates/daemonset.yaml @@ -13,7 +13,7 @@ spec: containers: - name: fluent-bit image: "{{ .Values.image.fluent_bit.repository }}:{{ .Values.image.fluent_bit.tag }}" - imagePullPolicy: "{{ .Values.image.pullPolicy}}" + imagePullPolicy: "{{ .Values.image.pullPolicy }}" env: {{ toYaml .Values.env | indent 10 }} resources: diff --git a/stable/ghost/templates/NOTES.txt b/stable/ghost/templates/NOTES.txt index 632f42418b98..51bda81893f0 100644 --- a/stable/ghost/templates/NOTES.txt +++ b/stable/ghost/templates/NOTES.txt @@ -18,7 +18,7 @@ host. To configure Ghost with the URL of your service: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") {{- end }} 2. Complete your Ghost deployment by running: diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml index bf37853d8625..82ded927977c 100644 --- a/stable/grafana/templates/deployment.yaml +++ b/stable/grafana/templates/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: labels: app: {{ template "grafana.fullname" . }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: "{{ .Values.server.name }}" heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" diff --git a/stable/grafana/templates/job.yaml b/stable/grafana/templates/job.yaml index 6d7a5d00e439..7fc908d06cde 100644 --- a/stable/grafana/templates/job.yaml +++ b/stable/grafana/templates/job.yaml @@ -40,7 +40,7 @@ spec: - "Content-Type: application/json;charset=UTF-8" - "--data-binary" {{- with .Values.server.setDatasource.datasource }} - - "{\"name\":\"{{ .name }}\",\"type\":\"{{ .type }}\",\"url\":\"{{ .url }}\",\"database\":\"{{ .database }}\",\"jsonData\":{ {{ .jsonData }} },\"access\":\"{{ .access }}\",\"isDefault\":{{ .isDefault }}}" + - "{\"name\":\"{{ .name }}\",\"type\":\"{{ .type }}\",\"url\":\"{{ .url }}\",\"database\":\"{{ .database }}\",\"jsonData\":{ {{ .jsonData }} },\"access\":\"{{ .access }}\",\"isDefault\":{{ .isDefault } }}" {{- end }} restartPolicy: {{ .Values.server.setDatasource.restartPolicy }} {{- end -}} diff --git a/stable/grafana/templates/svc.yaml b/stable/grafana/templates/svc.yaml index a2e64c48ed4d..1334efec77e1 100644 --- a/stable/grafana/templates/svc.yaml +++ b/stable/grafana/templates/svc.yaml @@ -27,7 +27,7 @@ spec: {{- if .Values.server.loadBalancerIP }} loadBalancerIP: {{ .Values.server.loadBalancerIP }} {{- end -}} - {{- if .Values.server.loadBalancerSourceRanges}} + {{- if .Values.server.loadBalancerSourceRanges }} loadBalancerSourceRanges: {{- range .Values.server.loadBalancerSourceRanges }} - {{ . }} diff --git a/stable/jenkins/templates/NOTES.txt b/stable/jenkins/templates/NOTES.txt index f17c01254455..cc59ba14d8bd 100644 --- a/stable/jenkins/templates/NOTES.txt +++ b/stable/jenkins/templates/NOTES.txt @@ -14,7 +14,7 @@ {{- else if contains "LoadBalancer" .Values.Master.ServiceType }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. You can watch the status of by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export SERVICE_IP=$(kubectl get svc {{ template "fullname" . }} --namespace {{ .Release.Namespace }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") echo http://$SERVICE_IP:{{ .Values.Master.ServicePort }}/login {{- else if contains "ClusterIP" .Values.Master.ServiceType }} diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml index 730cdf09f41a..dde70bd7b64b 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -9,7 +9,7 @@ data: - {{.Values.Master.ImageTag}} + {{ .Values.Master.ImageTag }} 0 NORMAL {{ .Values.Master.UseSecurity }} @@ -35,7 +35,7 @@ data: default 2147483647 0 - + {{- range $index, $volume := .Values.Agent.volumes }} @@ -60,10 +60,10 @@ data: ${computer.jnlpmac} ${computer.name} false - {{.Values.Agent.Cpu}} - {{.Values.Agent.Memory}} - {{.Values.Agent.Cpu}} - {{.Values.Agent.Memory}} + {{ .Values.Agent.Cpu }} + {{ .Values.Agent.Memory }} + {{ .Values.Agent.Cpu }} + {{ .Values.Agent.Memory }} @@ -77,7 +77,7 @@ data: https://kubernetes.default false {{ .Release.Namespace }} - http://{{ template "fullname" . }}:{{.Values.Master.ServicePort}} + http://{{ template "fullname" . }}:{{ .Values.Master.ServicePort }} {{ template "fullname" . }}-agent:50000 10 5 @@ -137,7 +137,7 @@ data: {{- end }} {{- range $key, $val := .Values.Master.InitScripts }} init{{ $key }}.groovy: |- -{{ $val | indent 4}} +{{ $val | indent 4 }} {{- end }} plugins.txt: |- {{- if .Values.Master.InstallPlugins }} diff --git a/stable/jenkins/templates/jenkins-agent-svc.yaml b/stable/jenkins/templates/jenkins-agent-svc.yaml index 8af289ecfa12..193bf8d5fca5 100644 --- a/stable/jenkins/templates/jenkins-agent-svc.yaml +++ b/stable/jenkins/templates/jenkins-agent-svc.yaml @@ -1,16 +1,16 @@ apiVersion: v1 kind: Service metadata: - name: {{template "fullname" . }}-agent + name: {{ template "fullname" . }}-agent labels: app: {{ template "fullname" . }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" spec: ports: - - port: {{.Values.Master.SlaveListenerPort}} - targetPort: {{.Values.Master.SlaveListenerPort}} + - port: {{ .Values.Master.SlaveListenerPort }} + targetPort: {{ .Values.Master.SlaveListenerPort }} name: slavelistener selector: - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" type: ClusterIP diff --git a/stable/jenkins/templates/jenkins-master-deployment.yaml b/stable/jenkins/templates/jenkins-master-deployment.yaml index 311c1388cb5c..59b26e60854f 100644 --- a/stable/jenkins/templates/jenkins-master-deployment.yaml +++ b/stable/jenkins/templates/jenkins-master-deployment.yaml @@ -3,32 +3,32 @@ kind: Deployment metadata: name: {{ template "fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Master.Name}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Master.Name }}" spec: replicas: 1 strategy: type: RollingUpdate selector: matchLabels: - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" template: metadata: labels: app: {{ template "fullname" . }} - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} pod.alpha.kubernetes.io/init-containers: '[ { "name": "copy-default-config", - "image": "{{.Values.Master.Image}}:{{.Values.Master.ImageTag}}", - "imagePullPolicy": "{{.Values.Master.ImagePullPolicy}}", + "image": "{{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }}", + "imagePullPolicy": "{{ .Values.Master.ImagePullPolicy }}", "command": [ "sh", "/var/jenkins_config/apply_config.sh" ], "volumeMounts": [ { @@ -63,14 +63,14 @@ spec: runAsUser: 0 containers: - name: {{ template "fullname" . }} - image: "{{.Values.Master.Image}}:{{.Values.Master.ImageTag}}" - imagePullPolicy: "{{.Values.Master.ImagePullPolicy}}" + image: "{{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }}" + imagePullPolicy: "{{ .Values.Master.ImagePullPolicy }}" {{- if .Values.Master.UseSecurity }} args: [ "--argumentsRealm.passwd.$(ADMIN_USER)=$(ADMIN_PASSWORD)", "--argumentsRealm.roles.$(ADMIN_USER)=admin"] {{- end }} env: - name: JAVA_OPTS - value: "{{ default "" .Values.Master.JavaOpts}}" + value: "{{ default "" .Values.Master.JavaOpts }}" {{- if .Values.Master.UseSecurity }} - name: ADMIN_PASSWORD valueFrom: @@ -84,9 +84,9 @@ spec: key: jenkins-admin-user {{- end }} ports: - - containerPort: {{.Values.Master.ContainerPort}} + - containerPort: {{ .Values.Master.ContainerPort }} name: http - - containerPort: {{.Values.Master.SlaveListenerPort}} + - containerPort: {{ .Values.Master.SlaveListenerPort }} name: slavelistener {{- if .Values.Master.JMXPort }} - containerPort: {{ .Values.Master.JMXPort }} @@ -94,8 +94,8 @@ spec: {{- end }} resources: requests: - cpu: "{{.Values.Master.Cpu}}" - memory: "{{.Values.Master.Memory}}" + cpu: "{{ .Values.Master.Cpu }}" + memory: "{{ .Values.Master.Memory }}" volumeMounts: {{- if .Values.Persistence.mounts }} {{ toYaml .Values.Persistence.mounts | indent 12 }} diff --git a/stable/jenkins/templates/jenkins-master-networkpolicy.yaml b/stable/jenkins/templates/jenkins-master-networkpolicy.yaml index 21b9fc5026ce..6034c919f6a3 100644 --- a/stable/jenkins/templates/jenkins-master-networkpolicy.yaml +++ b/stable/jenkins/templates/jenkins-master-networkpolicy.yaml @@ -2,32 +2,32 @@ kind: NetworkPolicy apiVersion: {{ .Values.NetworkPolicy.ApiVersion }} metadata: - name: "{{.Release.Name}}-{{.Values.Master.Component}}" + name: "{{ .Release.Name }}-{{ .Values.Master.Component }}" spec: podSelector: matchLabels: - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" ingress: # Allow web access to the UI - ports: - - port: {{.Values.Master.ContainerPort}} + - port: {{ .Values.Master.ContainerPort }} # Allow inbound connections from slave - from: - podSelector: matchLabels: - "jenkins/{{.Release.Name}}-{{.Values.Agent.Component}}": "true" + "jenkins/{{ .Release.Name }}-{{ .Values.Agent.Component }}": "true" ports: - - port: {{.Values.Master.SlaveListenerPort}} + - port: {{ .Values.Master.SlaveListenerPort }} {{- if .Values.Agent.Enabled }} --- kind: NetworkPolicy apiVersion: {{ .Values.NetworkPolicy.ApiVersion }} metadata: - name: "{{.Release.Name}}-{{.Values.Agent.Component}}" + name: "{{ .Release.Name }}-{{ .Values.Agent.Component }}" spec: podSelector: matchLabels: # DefaultDeny - "jenkins/{{.Release.Name}}-{{.Values.Agent.Component}}": "true" + "jenkins/{{ .Release.Name }}-{{ .Values.Agent.Component }}": "true" {{- end }} {{- end }} diff --git a/stable/jenkins/templates/jenkins-master-svc.yaml b/stable/jenkins/templates/jenkins-master-svc.yaml index 05b7df248e6f..e30b42552c4b 100644 --- a/stable/jenkins/templates/jenkins-master-svc.yaml +++ b/stable/jenkins/templates/jenkins-master-svc.yaml @@ -10,7 +10,7 @@ metadata: component: "{{.Release.Name}}-{{.Values.Master.Component}}" {{- if .Values.Master.ServiceAnnotations }} annotations: -{{ toYaml .Values.Master.ServiceAnnotations | indent 4}} +{{ toYaml .Values.Master.ServiceAnnotations | indent 4 }} {{- end }} spec: ports: diff --git a/stable/jenkins/templates/jenkins-test.yaml b/stable/jenkins/templates/jenkins-test.yaml index 3ea15ec44e5e..34e9aadff67e 100644 --- a/stable/jenkins/templates/jenkins-test.yaml +++ b/stable/jenkins/templates/jenkins-test.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Pod metadata: - name: "{{.Release.Name}}-ui-test-{{ randAlphaNum 5 | lower }}" + name: "{{ .Release.Name }}-ui-test-{{ randAlphaNum 5 | lower }}" annotations: "helm.sh/hook": test-success "pod.beta.kubernetes.io/init-containers": '[ @@ -28,8 +28,8 @@ spec: {{ toYaml .Values.Master.Tolerations | indent 4 }} {{- end }} containers: - - name: {{.Release.Name}}-ui-test - image: {{.Values.Master.Image}}:{{.Values.Master.ImageTag}} + - name: {{ .Release.Name }}-ui-test + image: {{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }} command: ["/tools/bats/bats", "-t", "/tests/run.sh"] volumeMounts: - mountPath: /tests diff --git a/stable/jenkins/templates/test-config.yaml b/stable/jenkins/templates/test-config.yaml index 4723003e0f90..db4f35a5caaa 100644 --- a/stable/jenkins/templates/test-config.yaml +++ b/stable/jenkins/templates/test-config.yaml @@ -5,5 +5,5 @@ metadata: data: run.sh: |- @test "Testing Jenkins UI is accessible" { - curl --retry 12 --retry-delay 10 {{.Release.Name}}-jenkins:8080/login - } \ No newline at end of file + curl --retry 12 --retry-delay 10 {{ .Release.Name }}-jenkins:8080/login + } diff --git a/stable/kapacitor/templates/deployment.yaml b/stable/kapacitor/templates/deployment.yaml index a69d0daa8c27..609aeddef0e6 100644 --- a/stable/kapacitor/templates/deployment.yaml +++ b/stable/kapacitor/templates/deployment.yaml @@ -28,7 +28,7 @@ spec: {{- range $key, $val := .Values.envVars }} - name: {{ $key }} value: {{ $val | quote }} - {{- end}} + {{- end }} ports: - containerPort: 9092 volumeMounts: diff --git a/stable/kube-ops-view/templates/ingress.yaml b/stable/kube-ops-view/templates/ingress.yaml index a054ab71f3d1..6cb0a0c6483c 100644 --- a/stable/kube-ops-view/templates/ingress.yaml +++ b/stable/kube-ops-view/templates/ingress.yaml @@ -10,7 +10,7 @@ metadata: heritage: "{{ .Release.Service }}" {{- if .Values.ingress.annotations }} annotations: -{{ toYaml .Values.ingress.annotations | indent 4}} +{{ toYaml .Values.ingress.annotations | indent 4 }} {{- end }} spec: rules: @@ -25,4 +25,4 @@ spec: tls: {{ toYaml .Values.ingress.tls | indent 4 }} {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/stable/kube-ops-view/templates/service.yaml b/stable/kube-ops-view/templates/service.yaml index 1faf14123fbc..2484951bcf91 100644 --- a/stable/kube-ops-view/templates/service.yaml +++ b/stable/kube-ops-view/templates/service.yaml @@ -4,12 +4,12 @@ metadata: name: {{ template "fullname" . }} {{- if .Values.service.annotations }} annotations: -{{ toYaml .Values.service.annotations | indent 4}} +{{ toYaml .Values.service.annotations | indent 4 }} {{- end }} labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" {{- if .Values.service.labels }} -{{ toYaml .Values.service.labels | indent 4}} +{{ toYaml .Values.service.labels | indent 4 }} {{- end }} spec: type: {{ .Values.service.type }} diff --git a/stable/kube2iam/templates/daemonset.yaml b/stable/kube2iam/templates/daemonset.yaml index 4595271ce8e8..3bfc09d0c8dd 100644 --- a/stable/kube2iam/templates/daemonset.yaml +++ b/stable/kube2iam/templates/daemonset.yaml @@ -12,7 +12,7 @@ spec: metadata: {{- if .Values.podAnnotations }} annotations: -{{ toYaml .Values.podAnnotations | indent 8}} +{{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} labels: app: {{ template "name" . }} diff --git a/stable/linkerd/templates/config.yaml b/stable/linkerd/templates/config.yaml index c8751daf1c51..f82483c61d60 100644 --- a/stable/linkerd/templates/config.yaml +++ b/stable/linkerd/templates/config.yaml @@ -34,4 +34,4 @@ data: servers: - ip: 0.0.0.0 port: 4140 -{{ end}} +{{ end }} diff --git a/stable/linkerd/templates/daemonset.yaml b/stable/linkerd/templates/daemonset.yaml index 75df5a5d81dd..2a8dc0ddcbc0 100644 --- a/stable/linkerd/templates/daemonset.yaml +++ b/stable/linkerd/templates/daemonset.yaml @@ -24,7 +24,7 @@ spec: name: "{{ template "fullname" . }}-config" containers: - name: {{ .Values.linkerd.name }} - image: {{ .Values.linkerd.image}} + image: {{ .Values.linkerd.image }} env: - name: POD_IP valueFrom: @@ -55,7 +55,7 @@ spec: mountPath: "/io.buoyant/linkerd/config" readOnly: true - name: kubectl - image: {{ .Values.kubectl.image}} + image: {{ .Values.kubectl.image }} args: - "proxy" - "-p" diff --git a/stable/locust/templates/NOTES.txt b/stable/locust/templates/NOTES.txt index b090947187b6..10a41ddb5d61 100644 --- a/stable/locust/templates/NOTES.txt +++ b/stable/locust/templates/NOTES.txt @@ -10,7 +10,7 @@ Get the Locust URL to visit by running these commands in the same shell: {{- else if contains "LoadBalancer" .Values.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. You can watch the status by running 'kubectl get svc -n {{ .Release.Namespace }} -w {{ template "locust.master-svc" . }}' - export SERVICE_IP=$(kubectl get svc -n {{ .Release.Namespace }} {{ template "locust.master-svc" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "locust.master-svc" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export LOCUST_URL=http://$SERVICE_IP:{{ .Values.service.externalPort }}/ {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/stable/locust/templates/master-deploy.yaml b/stable/locust/templates/master-deploy.yaml index 0635f8bb9b05..bf39be6ea0c6 100644 --- a/stable/locust/templates/master-deploy.yaml +++ b/stable/locust/templates/master-deploy.yaml @@ -6,15 +6,15 @@ metadata: app: {{ template "locust.fullname" . }} heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: master spec: replicas: 1 strategy: type: RollingUpdate rollingUpdate: - maxSurge: {{default 1 .Values.master.maxSurge}} - maxUnavailable: {{default 1 .Values.master.maxUnavailable}} + maxSurge: {{ default 1 .Values.master.maxSurge }} + maxUnavailable: {{ default 1 .Values.master.maxUnavailable }} template: metadata: labels: diff --git a/stable/locust/templates/master-svc.yaml b/stable/locust/templates/master-svc.yaml index 0e30a4f5a9e1..94387662bf3a 100644 --- a/stable/locust/templates/master-svc.yaml +++ b/stable/locust/templates/master-svc.yaml @@ -5,7 +5,7 @@ metadata: labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: {{ template "locust.fullname" . }} component: "master" spec: @@ -14,7 +14,7 @@ spec: - name: {{ .Values.service.name }} port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - nodePort: {{ .Values.service.nodePort}} + nodePort: {{ .Values.service.nodePort }} protocol: TCP - name: master-p1 port: 5557 diff --git a/stable/locust/templates/worker-deploy.yaml b/stable/locust/templates/worker-deploy.yaml index ba74ec0f5c84..f857e929b0f5 100644 --- a/stable/locust/templates/worker-deploy.yaml +++ b/stable/locust/templates/worker-deploy.yaml @@ -5,16 +5,16 @@ metadata: labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" app: {{ template "locust.fullname" . }} component: worker spec: - replicas: {{default 2 .Values.worker.replicaCount}} + replicas: {{ default 2 .Values.worker.replicaCount }} strategy: type: RollingUpdate rollingUpdate: - maxSurge: {{default 1 .Values.worker.maxSurge}} - maxUnavailable: {{default 1 .Values.worker.maxUnavailable}} + maxSurge: {{ default 1 .Values.worker.maxSurge }} + maxUnavailable: {{ default 1 .Values.worker.maxUnavailable }} template: metadata: labels: diff --git a/stable/magento/templates/NOTES.txt b/stable/magento/templates/NOTES.txt index dc1e202b922b..8afc2574d9e5 100644 --- a/stable/magento/templates/NOTES.txt +++ b/stable/magento/templates/NOTES.txt @@ -18,7 +18,7 @@ host. To configure Magento with the URL of your service: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.magento-password}" | base64 --decode) {{- if .Values.mariadb.mariadbRootPassword }} export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) diff --git a/stable/mailhog/templates/service.yaml b/stable/mailhog/templates/service.yaml index faeea969fc24..33d49c4a1e09 100644 --- a/stable/mailhog/templates/service.yaml +++ b/stable/mailhog/templates/service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: {{- if .Values.service.annotations }} annotations: -{{ toYaml .Values.service.annotations | indent 4}} +{{ toYaml .Values.service.annotations | indent 4 }} {{- end }} labels: app: {{ template "name" . }} diff --git a/stable/minecraft/templates/deployment.yaml b/stable/minecraft/templates/deployment.yaml index 3e72a84783da..40e398576a44 100644 --- a/stable/minecraft/templates/deployment.yaml +++ b/stable/minecraft/templates/deployment.yaml @@ -98,7 +98,7 @@ spec: - name: rcon containerPort: {{ .Values.minecraftServer.rcon.port }} protocol: TCP - {{- end}} + {{- end }} volumeMounts: - name: datadir mountPath: /data @@ -106,7 +106,7 @@ spec: - name: datadir {{- if .Values.persistence.dataDir.enabled }} persistentVolumeClaim: - claimName: {{template "fullname" .}}-datadir + claimName: {{ template "fullname" . }}-datadir {{- else }} emptyDir: {} {{- end }} diff --git a/stable/minio/templates/minio_statefulset.yaml b/stable/minio/templates/minio_statefulset.yaml index 43835d4f7d0c..66e11aea9bcb 100644 --- a/stable/minio/templates/minio_statefulset.yaml +++ b/stable/minio/templates/minio_statefulset.yaml @@ -67,7 +67,7 @@ spec: args: - server {{- range $i := until $nodeCount }} - - http://{{ template "fullname" $ }}-{{$i}}.{{ template "fullname" $ }}.{{ $.Release.Namespace }}.svc.cluster.local{{ $.Values.mountPath }} + - http://{{ template "fullname" $ }}-{{ $i }}.{{ template "fullname" $ }}.{{ $.Release.Namespace }}.svc.cluster.local{{ $.Values.mountPath }} {{- end }} {{- end }} volumeMounts: diff --git a/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml b/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml index e7832d74dd71..f5f26ce16149 100644 --- a/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml +++ b/stable/mongodb-replicaset/templates/mongodb-statefulset.yaml @@ -17,7 +17,7 @@ spec: release: {{ .Release.Name }} annotations: {{- if .Values.podAnnotations }} -{{ toYaml .Values.podAnnotations | indent 8}} +{{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} pod.alpha.kubernetes.io/init-containers: '[ { diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index bb93115f854d..0363253ea4ab 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/stable/nginx-ingress/templates/controller-daemonset.yaml @@ -14,7 +14,7 @@ spec: metadata: {{- if .Values.controller.podAnnotations }} annotations: -{{ toYaml .Values.controller.podAnnotations | indent 8}} +{{ toYaml .Values.controller.podAnnotations | indent 8 }} {{- end }} labels: app: {{ template "name" . }} @@ -31,7 +31,7 @@ spec: - --default-backend-service={{ if .Values.defaultBackend.enabled }}{{ .Release.Namespace }}/{{ template "defaultBackend.fullname" . }}{{ else }}{{ .Values.controller.defaultBackendService }}{{ end }} {{- if and (contains "0.9" .Values.controller.image.tag) .Values.controller.publishService.enabled }} - --publish-service={{ template "controller.publishServicePath" . }} - {{- end}} + {{- end }} {{- if (contains "0.9" .Values.controller.image.tag) }} - --configmap={{ .Release.Namespace }}/{{ template "controller.fullname" . }} {{- else }} diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index f7cce2e99562..43af40606d28 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/stable/nginx-ingress/templates/controller-deployment.yaml @@ -15,7 +15,7 @@ spec: metadata: {{- if .Values.controller.podAnnotations }} annotations: -{{ toYaml .Values.controller.podAnnotations | indent 8}} +{{ toYaml .Values.controller.podAnnotations | indent 8 }} {{- end }} labels: app: {{ template "name" . }} @@ -32,7 +32,7 @@ spec: - --default-backend-service={{ if .Values.defaultBackend.enabled }}{{ .Release.Namespace }}/{{ template "defaultBackend.fullname" . }}{{ else }}{{ .Values.controller.defaultBackendService }}{{ end }} {{- if and (contains "0.9" .Values.controller.image.tag) .Values.controller.publishService.enabled }} - --publish-service={{ template "controller.publishServicePath" . }} - {{- end}} + {{- end }} {{- if (contains "0.9" .Values.controller.image.tag) }} - --configmap={{ .Release.Namespace }}/{{ template "controller.fullname" . }} {{- else }} diff --git a/stable/nginx-ingress/templates/controller-service.yaml b/stable/nginx-ingress/templates/controller-service.yaml index 7eeb95ab249f..25b4fb86f316 100644 --- a/stable/nginx-ingress/templates/controller-service.yaml +++ b/stable/nginx-ingress/templates/controller-service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: {{- if .Values.controller.service.annotations }} annotations: -{{ toYaml .Values.controller.service.annotations | indent 4}} +{{ toYaml .Values.controller.service.annotations | indent 4 }} {{- end }} labels: app: {{ template "name" . }} diff --git a/stable/nginx-ingress/templates/default-backend-deployment.yaml b/stable/nginx-ingress/templates/default-backend-deployment.yaml index 4663e50c18e1..c1b967cac7b0 100644 --- a/stable/nginx-ingress/templates/default-backend-deployment.yaml +++ b/stable/nginx-ingress/templates/default-backend-deployment.yaml @@ -15,7 +15,7 @@ spec: metadata: {{- if .Values.defaultBackend.podAnnotations }} annotations: -{{ toYaml .Values.defaultBackend.podAnnotations | indent 8}} +{{ toYaml .Values.defaultBackend.podAnnotations | indent 8 }} {{- end }} labels: app: {{ template "name" . }} diff --git a/stable/opencart/templates/NOTES.txt b/stable/opencart/templates/NOTES.txt index 3972a292fdce..6a3192c03263 100644 --- a/stable/opencart/templates/NOTES.txt +++ b/stable/opencart/templates/NOTES.txt @@ -18,7 +18,7 @@ host. To configure OpenCart with the URL of your service: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.opencart-password}" | base64 --decode) {{- if .Values.mariadb.mariadbRootPassword }} export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) diff --git a/stable/openvpn/templates/config-openvpn.yaml b/stable/openvpn/templates/config-openvpn.yaml index 881ef582555a..2dc253a96faa 100644 --- a/stable/openvpn/templates/config-openvpn.yaml +++ b/stable/openvpn/templates/config-openvpn.yaml @@ -16,10 +16,10 @@ data: ./easyrsa init-pki echo "ca\n" | ./easyrsa build-ca nopass ./easyrsa build-server-full server nopass - ./easyrsa gen-dh + ./easyrsa gen-dh fi - - + + newClientCert.sh: |- #!/bin/bash EASY_RSA_LOC="/etc/openvpn/certs" @@ -48,7 +48,7 @@ data: EOF cat pki/$1.ovpn - + configure.sh: |- #!/bin/sh /etc/openvpn/setup/setup-certs.sh @@ -57,7 +57,7 @@ data: if [ ! -c /dev/net/tun ]; then mknod /dev/net/tun c 10 200 fi - + if [ "$DEBUG" == "1" ]; then echo ========== ${OVPN_CONFIG} ========== cat "${OVPN_CONFIG}" @@ -72,7 +72,7 @@ data: sed 's|OVPN_K8S_SEARCH|'"${SEARCH}"'|' -i /etc/openvpn/openvpn.conf sed 's|OVPN_K8S_DNS|'"${DNS}"'|' -i /etc/openvpn/openvpn.conf sed 's|NETWORK|'"${NETWORK}"'|' -i /etc/openvpn/openvpn.conf - + openvpn --config /etc/openvpn/openvpn.conf openvpn.conf: |- server {{ .Values.openvpn.OVPN_NETWORK }} {{ .Values.openvpn.OVPN_SUBNET }} @@ -81,24 +81,24 @@ data: ca /etc/openvpn/certs/pki/ca.crt cert /etc/openvpn/certs/pki/issued/server.crt dh /etc/openvpn/certs/pki/dh.pem - + key-direction 0 keepalive 10 60 persist-key persist-tun - - proto {{.Values.openvpn.OVPN_PROTO}} + + proto {{ .Values.openvpn.OVPN_PROTO }} port {{ .Values.service.internalPort }} dev tun0 status /tmp/openvpn-status.log - + user nobody group nogroup - + push "route NETWORK 255.255.240.0" {{ if (.Values.openvpn.OVPN_K8S_POD_NETWORK) (.Values.openvpn.OVPN_K8S_POD_SUBNET) }} - push "route {{ .Values.openvpn.OVPN_K8S_POD_NETWORK }} {{.Values.openvpn.OVPN_K8S_POD_SUBNET}}" -{{end}} + push "route {{ .Values.openvpn.OVPN_K8S_POD_NETWORK }} {{ .Values.openvpn.OVPN_K8S_POD_SUBNET }}" +{{ end }} push "dhcp-option DOMAIN OVPN_K8S_SEARCH" - push "dhcp-option DNS OVPN_K8S_DNS" \ No newline at end of file + push "dhcp-option DNS OVPN_K8S_DNS" diff --git a/stable/openvpn/templates/openvpn-deployment.yaml b/stable/openvpn/templates/openvpn-deployment.yaml index 11ef3e695b3b..de473514f913 100644 --- a/stable/openvpn/templates/openvpn-deployment.yaml +++ b/stable/openvpn/templates/openvpn-deployment.yaml @@ -3,9 +3,9 @@ kind: Deployment metadata: name: {{ template "fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: replicas: {{ .Values.replicaCount }} @@ -14,9 +14,9 @@ spec: labels: app: {{ template "fullname" . }} type: openvpn - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: containers: - name: {{ .Chart.Name }} @@ -32,11 +32,11 @@ spec: - NET_ADMIN resources: requests: - cpu: "{{.Values.resources.requests.cpu}}" - memory: "{{.Values.resources.requests.memory}}" + cpu: "{{ .Values.resources.requests.cpu }}" + memory: "{{ .Values.resources.requests.memory }}" limits: - cpu: "{{.Values.resources.limits.cpu}}" - memory: "{{.Values.resources.limits.memory}}" + cpu: "{{ .Values.resources.limits.cpu }}" + memory: "{{ .Values.resources.limits.memory }}" volumeMounts: - mountPath: /etc/openvpn/setup name: openvpn diff --git a/stable/osclass/templates/NOTES.txt b/stable/osclass/templates/NOTES.txt index 87b05edbe4c0..2ca23fd550f6 100644 --- a/stable/osclass/templates/NOTES.txt +++ b/stable/osclass/templates/NOTES.txt @@ -18,7 +18,7 @@ host. To configure Osclass with the URL of your service: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.osclass-password}" | base64 --decode) {{- if .Values.mariadb.mariadbRootPassword }} export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) diff --git a/stable/owncloud/templates/NOTES.txt b/stable/owncloud/templates/NOTES.txt index 3339a003f096..d602874ae058 100644 --- a/stable/owncloud/templates/NOTES.txt +++ b/stable/owncloud/templates/NOTES.txt @@ -18,7 +18,7 @@ host. To configure ownCloud with the URL of your service: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.owncloud1-password}" | base64 --decode) {{- if .Values.mariadb.mariadbRootPassword }} export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) diff --git a/stable/phabricator/templates/NOTES.txt b/stable/phabricator/templates/NOTES.txt index 183ef003d736..918b7142f87f 100644 --- a/stable/phabricator/templates/NOTES.txt +++ b/stable/phabricator/templates/NOTES.txt @@ -18,7 +18,7 @@ host. To configure Phabricator with the URL of your service: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.phabricator-password}" | base64 --decode) {{- if .Values.mariadb.mariadbRootPassword }} export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) diff --git a/stable/prestashop/templates/NOTES.txt b/stable/prestashop/templates/NOTES.txt index 3c75e9428134..df19714d59b6 100644 --- a/stable/prestashop/templates/NOTES.txt +++ b/stable/prestashop/templates/NOTES.txt @@ -18,7 +18,7 @@ host. To configure PrestaShop with the URL of your service: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.prestashop-password}" | base64 --decode) {{- if .Values.mariadb.mariadbRootPassword }} export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode) diff --git a/stable/prometheus/templates/alertmanager-ingress.yaml b/stable/prometheus/templates/alertmanager-ingress.yaml index 2115233d366f..42e22165e4cf 100644 --- a/stable/prometheus/templates/alertmanager-ingress.yaml +++ b/stable/prometheus/templates/alertmanager-ingress.yaml @@ -7,7 +7,7 @@ kind: Ingress metadata: {{- if .Values.alertmanager.ingress.annotations }} annotations: -{{ toYaml .Values.alertmanager.ingress.annotations | indent 4}} +{{ toYaml .Values.alertmanager.ingress.annotations | indent 4 }} {{- end }} labels: app: {{ template "prometheus.name" . }} diff --git a/stable/prometheus/templates/alertmanager-service.yaml b/stable/prometheus/templates/alertmanager-service.yaml index a2854d9cb5ba..8eaebe05e095 100644 --- a/stable/prometheus/templates/alertmanager-service.yaml +++ b/stable/prometheus/templates/alertmanager-service.yaml @@ -4,7 +4,7 @@ kind: Service metadata: {{- if .Values.alertmanager.service.annotations }} annotations: -{{ toYaml .Values.alertmanager.service.annotations | indent 4}} +{{ toYaml .Values.alertmanager.service.annotations | indent 4 }} {{- end }} labels: app: {{ template "prometheus.name" . }} @@ -13,7 +13,7 @@ metadata: heritage: {{ .Release.Service }} release: {{ .Release.Name }} {{- if .Values.alertmanager.service.labels }} -{{ toYaml .Values.alertmanager.service.labels | indent 4}} +{{ toYaml .Values.alertmanager.service.labels | indent 4 }} {{- end }} name: {{ template "prometheus.alertmanager.fullname" . }} spec: diff --git a/stable/prometheus/templates/kube-state-metrics-svc.yaml b/stable/prometheus/templates/kube-state-metrics-svc.yaml index 1738aa0f2901..e11fa06a4068 100644 --- a/stable/prometheus/templates/kube-state-metrics-svc.yaml +++ b/stable/prometheus/templates/kube-state-metrics-svc.yaml @@ -4,7 +4,7 @@ kind: Service metadata: {{- if .Values.kubeStateMetrics.service.annotations }} annotations: -{{ toYaml .Values.kubeStateMetrics.service.annotations | indent 4}} +{{ toYaml .Values.kubeStateMetrics.service.annotations | indent 4 }} {{- end }} labels: app: {{ template "prometheus.name" . }} @@ -13,7 +13,7 @@ metadata: heritage: {{ .Release.Service }} release: {{ .Release.Name }} {{- if .Values.kubeStateMetrics.service.labels }} -{{ toYaml .Values.kubeStateMetrics.service.labels | indent 4}} +{{ toYaml .Values.kubeStateMetrics.service.labels | indent 4 }} {{- end }} name: {{ template "prometheus.kubeStateMetrics.fullname" . }} spec: diff --git a/stable/prometheus/templates/node-exporter-service.yaml b/stable/prometheus/templates/node-exporter-service.yaml index 085556935b23..6af14c26c498 100644 --- a/stable/prometheus/templates/node-exporter-service.yaml +++ b/stable/prometheus/templates/node-exporter-service.yaml @@ -4,7 +4,7 @@ kind: Service metadata: {{- if .Values.nodeExporter.service.annotations }} annotations: -{{ toYaml .Values.nodeExporter.service.annotations | indent 4}} +{{ toYaml .Values.nodeExporter.service.annotations | indent 4 }} {{- end }} labels: app: {{ template "prometheus.name" . }} @@ -13,7 +13,7 @@ metadata: heritage: {{ .Release.Service }} release: {{ .Release.Name }} {{- if .Values.nodeExporter.service.labels }} -{{ toYaml .Values.nodeExporter.service.labels | indent 4}} +{{ toYaml .Values.nodeExporter.service.labels | indent 4 }} {{- end }} name: {{ template "prometheus.nodeExporter.fullname" . }} spec: diff --git a/stable/prometheus/templates/server-ingress.yaml b/stable/prometheus/templates/server-ingress.yaml index 0cb435f6b8ff..e6009d50141b 100644 --- a/stable/prometheus/templates/server-ingress.yaml +++ b/stable/prometheus/templates/server-ingress.yaml @@ -7,7 +7,7 @@ kind: Ingress metadata: {{- if .Values.server.ingress.annotations }} annotations: -{{ toYaml .Values.server.ingress.annotations | indent 4}} +{{ toYaml .Values.server.ingress.annotations | indent 4 }} {{- end }} labels: app: {{ template "prometheus.name" . }} diff --git a/stable/prometheus/templates/server-service.yaml b/stable/prometheus/templates/server-service.yaml index 50c3e86b06d0..a56910b7eb86 100644 --- a/stable/prometheus/templates/server-service.yaml +++ b/stable/prometheus/templates/server-service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: {{- if .Values.server.service.annotations }} annotations: -{{ toYaml .Values.server.service.annotations | indent 4}} +{{ toYaml .Values.server.service.annotations | indent 4 }} {{- end }} labels: app: {{ template "prometheus.name" . }} @@ -12,7 +12,7 @@ metadata: heritage: {{ .Release.Service }} release: {{ .Release.Name }} {{- if .Values.server.service.labels }} -{{ toYaml .Values.server.service.labels | indent 4}} +{{ toYaml .Values.server.service.labels | indent 4 }} {{- end }} name: {{ template "prometheus.server.fullname" . }} spec: diff --git a/stable/redmine/templates/NOTES.txt b/stable/redmine/templates/NOTES.txt index 739110d7c689..a6fdd9802862 100644 --- a/stable/redmine/templates/NOTES.txt +++ b/stable/redmine/templates/NOTES.txt @@ -12,7 +12,7 @@ Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export SERVICE_IP=$(kubectl get svc {{ template "fullname" . }} --namespace {{ .Release.Namespace }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}") echo http://$SERVICE_IP/ {{- else if .Values.ingress.enabled }} diff --git a/stable/redmine/templates/svc.yaml b/stable/redmine/templates/svc.yaml index e83c16d9f83d..e3ab12b5e4bd 100644 --- a/stable/redmine/templates/svc.yaml +++ b/stable/redmine/templates/svc.yaml @@ -15,6 +15,6 @@ spec: targetPort: http selector: app: {{ template "fullname" . }} - {{if eq .Values.serviceType "LoadBalancer"}} - loadBalancerSourceRanges: {{.Values.serviceLoadBalancerSourceRanges}} - {{end}} + {{ if eq .Values.serviceType "LoadBalancer" }} + loadBalancerSourceRanges: {{ .Values.serviceLoadBalancerSourceRanges }} + {{ end }} diff --git a/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml b/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml index 1a90bbf1e59f..2e58315ae53b 100644 --- a/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml +++ b/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml @@ -15,12 +15,12 @@ spec: name: "{{ template "fullname" . }}-cluster" labels: app: "{{ template "name" . }}-cluster" - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" annotations: {{- if .Values.cluster.podAnnotations }} -{{ toYaml .Values.cluster.podAnnotations | indent 8}} +{{ toYaml .Values.cluster.podAnnotations | indent 8 }} {{- end }} spec: containers: diff --git a/stable/rethinkdb/templates/rethinkdb-proxy-deployment.yaml b/stable/rethinkdb/templates/rethinkdb-proxy-deployment.yaml index 17da550fbb3f..662ef25deca8 100644 --- a/stable/rethinkdb/templates/rethinkdb-proxy-deployment.yaml +++ b/stable/rethinkdb/templates/rethinkdb-proxy-deployment.yaml @@ -14,12 +14,12 @@ spec: name: {{ template "fullname" . }}-proxy labels: app: {{ template "name" . }}-proxy - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" annotations: {{- if .Values.proxy.podAnnotations }} -{{ toYaml .Values.proxy.podAnnotations | indent 8}} +{{ toYaml .Values.proxy.podAnnotations | indent 8 }} {{- end }} spec: containers: diff --git a/stable/sensu/templates/deployment.yaml b/stable/sensu/templates/deployment.yaml index 9e6f044ba96f..db5c0619efad 100644 --- a/stable/sensu/templates/deployment.yaml +++ b/stable/sensu/templates/deployment.yaml @@ -1,13 +1,13 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{template "fullname" . }} + name: {{ template "fullname" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" spec: - replicas: {{ .Values.replicaCount }} + replicas: {{ .Values.replicaCount }} template: metadata: labels: @@ -26,45 +26,45 @@ spec: - name: API_HOST value: localhost - name: API_PORT - value: '4567' - - name: REDIS_HOST + value: '4567' + - name: REDIS_HOST value: {{ template "redis.fullname" . }} - name: REDIS_PASSWORD valueFrom: secretKeyRef: name: {{ template "redis.fullname" . }} - key: redis-password - - name: REDIS_DB + key: redis-password + - name: REDIS_DB value: {{ .Values.REDIS_DB | quote }} - - name: REDIS_AUTO_RECONNECT - value: {{ .Values.REDIS_AUTO_RECONNECT | quote}} - - name: REDIS_RECONNECT_ON_ERROR + - name: REDIS_AUTO_RECONNECT + value: {{ .Values.REDIS_AUTO_RECONNECT | quote }} + - name: REDIS_RECONNECT_ON_ERROR value: {{ .Values.REDIS_RECONNECT_ON_ERROR | quote }} - - name: REDIS_PORT - value: {{ .Values.REDIS_PORT | quote }} + - name: REDIS_PORT + value: {{ .Values.REDIS_PORT | quote }} - name: api image: "{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ .Values.pullPolicy }} args: - - api + - api resources: {{ toYaml .Values.api.resources | indent 10 }} env: - - name: REDIS_HOST + - name: REDIS_HOST value: {{ template "redis.fullname" . }} - name: REDIS_PASSWORD valueFrom: secretKeyRef: name: {{ template "redis.fullname" . }} - key: redis-password - - name: REDIS_DB + key: redis-password + - name: REDIS_DB value: {{ .Values.REDIS_DB | quote }} - - name: REDIS_AUTO_RECONNECT - value: {{ .Values.REDIS_AUTO_RECONNECT | quote}} - - name: REDIS_RECONNECT_ON_ERROR + - name: REDIS_AUTO_RECONNECT + value: {{ .Values.REDIS_AUTO_RECONNECT | quote }} + - name: REDIS_RECONNECT_ON_ERROR value: {{ .Values.REDIS_RECONNECT_ON_ERROR | quote }} - - name: REDIS_PORT - value: {{ .Values.REDIS_PORT | quote }} + - name: REDIS_PORT + value: {{ .Values.REDIS_PORT | quote }} ports: - containerPort: 4567 readinessProbe: @@ -78,7 +78,7 @@ spec: path: /info port: 4567 initialDelaySeconds: 30 - timeoutSeconds: 1 + timeoutSeconds: 1 diff --git a/stable/sensu/templates/svc.yaml b/stable/sensu/templates/svc.yaml index 1d9efbd85369..ca1498899993 100644 --- a/stable/sensu/templates/svc.yaml +++ b/stable/sensu/templates/svc.yaml @@ -10,11 +10,11 @@ metadata: router.deis.io/routable: "true" annotations: router.deis.io/domains: {{ .Values.deis.domains | quote }} - {{end}} + {{ end }} spec: - type: {{.Values.serviceType }} + type: {{ .Values.serviceType }} ports: - port: {{ .Values.httpPort }} targetPort: 4567 selector: - app: {{ template "fullname" . }} \ No newline at end of file + app: {{ template "fullname" . }} diff --git a/stable/sentry/templates/cron-deployment.yaml b/stable/sentry/templates/cron-deployment.yaml index 065fd11fd24a..0656d5c9622f 100644 --- a/stable/sentry/templates/cron-deployment.yaml +++ b/stable/sentry/templates/cron-deployment.yaml @@ -39,7 +39,7 @@ spec: name: {{ template "postgresql.fullname" . }} key: postgres-password - name: SENTRY_POSTGRES_HOST - value: {{ template "postgresql.fullname" .}} + value: {{ template "postgresql.fullname" . }} - name: SENTRY_POSTRGES_PORT value: "5432" - name: SENTRY_REDIS_PASSWORD @@ -48,7 +48,7 @@ spec: name: {{ template "redis.fullname" . }} key: redis-password - name: SENTRY_REDIS_HOST - value: {{ template "redis.fullname" .}} + value: {{ template "redis.fullname" . }} - name: SENTRY_REDIS_PORT value: "6379" - name: SENTRY_EMAIL_HOST diff --git a/stable/sentry/templates/hooks/db-init.job.yaml b/stable/sentry/templates/hooks/db-init.job.yaml index 928130323440..85352d40faf9 100644 --- a/stable/sentry/templates/hooks/db-init.job.yaml +++ b/stable/sentry/templates/hooks/db-init.job.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: "{{.Release.Name}}-db-init" + name: "{{ .Release.Name }}-db-init" labels: app: {{ template "fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" @@ -16,7 +16,7 @@ metadata: spec: template: metadata: - name: "{{.Release.Name}}-db-init" + name: "{{ .Release.Name }}-db-init" labels: app: {{ template "fullname" . }} release: "{{ .Release.Name }}" @@ -42,7 +42,7 @@ spec: name: {{ template "postgresql.fullname" . }} key: postgres-password - name: SENTRY_POSTGRES_HOST - value: {{ template "postgresql.fullname" .}} + value: {{ template "postgresql.fullname" . }} - name: SENTRY_POSTRGES_PORT value: "5432" - name: SENTRY_REDIS_PASSWORD @@ -51,7 +51,7 @@ spec: name: {{ template "redis.fullname" . }} key: redis-password - name: SENTRY_REDIS_HOST - value: {{ template "redis.fullname" .}} + value: {{ template "redis.fullname" . }} - name: SENTRY_REDIS_PORT value: "6379" - name: SENTRY_EMAIL_HOST diff --git a/stable/sentry/templates/hooks/user-create.job.yaml b/stable/sentry/templates/hooks/user-create.job.yaml index d0240dd12976..80f631897740 100644 --- a/stable/sentry/templates/hooks/user-create.job.yaml +++ b/stable/sentry/templates/hooks/user-create.job.yaml @@ -1,7 +1,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: "{{.Release.Name}}-user-create" + name: "{{ .Release.Name }}-user-create" labels: app: {{ template "fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" @@ -15,7 +15,7 @@ metadata: spec: template: metadata: - name: "{{.Release.Name}}-user-create" + name: "{{ .Release.Name }}-user-create" labels: app: {{ template "fullname" . }} release: "{{ .Release.Name }}" @@ -41,7 +41,7 @@ spec: name: {{ template "postgresql.fullname" . }} key: postgres-password - name: SENTRY_POSTGRES_HOST - value: {{ template "postgresql.fullname" .}} + value: {{ template "postgresql.fullname" . }} - name: SENTRY_POSTRGES_PORT value: "5432" - name: SENTRY_REDIS_PASSWORD @@ -50,7 +50,7 @@ spec: name: {{ template "redis.fullname" . }} key: redis-password - name: SENTRY_REDIS_HOST - value: {{ template "redis.fullname" .}} + value: {{ template "redis.fullname" . }} - name: SENTRY_REDIS_PORT value: "6379" - name: SENTRY_EMAIL_HOST diff --git a/stable/sentry/templates/web-deployment.yaml b/stable/sentry/templates/web-deployment.yaml index 5ef48db39203..39c678052ee8 100644 --- a/stable/sentry/templates/web-deployment.yaml +++ b/stable/sentry/templates/web-deployment.yaml @@ -38,7 +38,7 @@ spec: name: {{ template "postgresql.fullname" . }} key: postgres-password - name: SENTRY_POSTGRES_HOST - value: {{ template "postgresql.fullname" .}} + value: {{ template "postgresql.fullname" . }} - name: SENTRY_POSTRGES_PORT value: "5432" - name: SENTRY_REDIS_PASSWORD @@ -47,7 +47,7 @@ spec: name: {{ template "redis.fullname" . }} key: redis-password - name: SENTRY_REDIS_HOST - value: {{ template "redis.fullname" .}} + value: {{ template "redis.fullname" . }} - name: SENTRY_REDIS_PORT value: "6379" - name: SENTRY_EMAIL_HOST diff --git a/stable/sentry/templates/workers-deployment.yaml b/stable/sentry/templates/workers-deployment.yaml index d895e78dc78f..87285973bdfa 100644 --- a/stable/sentry/templates/workers-deployment.yaml +++ b/stable/sentry/templates/workers-deployment.yaml @@ -39,7 +39,7 @@ spec: name: {{ template "postgresql.fullname" . }} key: postgres-password - name: SENTRY_POSTGRES_HOST - value: {{ template "postgresql.fullname" .}} + value: {{ template "postgresql.fullname" . }} - name: SENTRY_POSTRGES_PORT value: "5432" - name: SENTRY_REDIS_PASSWORD @@ -48,7 +48,7 @@ spec: name: {{ template "redis.fullname" . }} key: redis-password - name: SENTRY_REDIS_HOST - value: {{ template "redis.fullname" .}} + value: {{ template "redis.fullname" . }} - name: SENTRY_REDIS_PORT value: "6379" - name: SENTRY_EMAIL_HOST diff --git a/stable/spark/templates/spark-master-deployment.yaml b/stable/spark/templates/spark-master-deployment.yaml index 2a526e22597d..d96c4db5a4e7 100644 --- a/stable/spark/templates/spark-master-deployment.yaml +++ b/stable/spark/templates/spark-master-deployment.yaml @@ -3,32 +3,32 @@ kind: Service metadata: name: {{ template "master-fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" spec: ports: - - port: {{.Values.Master.ServicePort}} - targetPort: {{.Values.Master.ContainerPort}} + - port: {{ .Values.Master.ServicePort }} + targetPort: {{ .Values.Master.ContainerPort }} selector: - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" --- apiVersion: v1 kind: Service metadata: name: {{ template "webui-fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" spec: ports: - - port: {{.Values.WebUi.ServicePort}} - targetPort: {{.Values.WebUi.ContainerPort}} + - port: {{ .Values.WebUi.ServicePort }} + targetPort: {{ .Values.WebUi.ContainerPort }} selector: - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" type: "LoadBalancer" --- apiVersion: extensions/v1beta1 @@ -36,37 +36,37 @@ kind: Deployment metadata: name: {{ template "master-fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" spec: - replicas: {{default 1 .Values.Master.Replicas}} + replicas: {{ default 1 .Values.Master.Replicas }} strategy: type: RollingUpdate selector: matchLabels: - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" template: metadata: labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Master.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" spec: containers: - name: {{ template "master-fullname" . }} - image: "{{.Values.Master.Image}}:{{.Values.Master.ImageTag}}" + image: "{{ .Values.Master.Image }}:{{ .Values.Master.ImageTag }}" command: ["/bin/sh","-c"] - args: ["echo $(hostname -i) {{ template "master-fullname" . }} >> /etc/hosts; /opt/spark/bin/spark-class org.apache.spark.deploy.master.Master --ip {{ template "master-fullname" . }} --port {{.Values.Master.ServicePort}} --webui-port {{.Values.WebUi.ContainerPort}}"] + args: ["echo $(hostname -i) {{ template "master-fullname" . }} >> /etc/hosts; /opt/spark/bin/spark-class org.apache.spark.deploy.master.Master --ip {{ template "master-fullname" . }} --port {{ .Values.Master.ServicePort }} --webui-port {{ .Values.WebUi.ContainerPort }}"] ports: - - containerPort: {{.Values.Master.ContainerPort}} - - containerPort: {{.Values.WebUi.ContainerPort}} + - containerPort: {{ .Values.Master.ContainerPort }} + - containerPort: {{ .Values.WebUi.ContainerPort }} resources: requests: - cpu: "{{.Values.Master.Cpu}}" - memory: "{{.Values.Master.Memory}}" + cpu: "{{ .Values.Master.Cpu }}" + memory: "{{ .Values.Master.Memory }}" env: - name: SPARK_DAEMON_MEMORY value: {{ default "1g" .Values.Master.DaemonMemory | quote }} diff --git a/stable/spark/templates/spark-worker-deployment.yaml b/stable/spark/templates/spark-worker-deployment.yaml index 95010e1b14c7..0cd6689c5778 100644 --- a/stable/spark/templates/spark-worker-deployment.yaml +++ b/stable/spark/templates/spark-worker-deployment.yaml @@ -3,35 +3,35 @@ kind: Deployment metadata: name: {{ template "worker-fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Worker.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Worker.Component }}" spec: - replicas: {{default 1 .Values.Worker.Replicas}} + replicas: {{ default 1 .Values.Worker.Replicas }} strategy: type: RollingUpdate selector: matchLabels: - component: "{{.Release.Name}}-{{.Values.Worker.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Worker.Component }}" template: metadata: labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Worker.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Worker.Component }}" spec: containers: - name: {{ template "worker-fullname" . }} - image: "{{.Values.Worker.Image}}:{{.Values.Worker.ImageTag}}" - command: ["/opt/spark/bin/spark-class", "org.apache.spark.deploy.worker.Worker", "spark://{{ template "master-fullname" . }}:{{.Values.Master.ServicePort}}", "--webui-port", "{{.Values.Worker.ContainerPort}}"] + image: "{{ .Values.Worker.Image }}:{{ .Values.Worker.ImageTag }}" + command: ["/opt/spark/bin/spark-class", "org.apache.spark.deploy.worker.Worker", "spark://{{ template "master-fullname" . }}:{{ .Values.Master.ServicePort }}", "--webui-port", "{{ .Values.Worker.ContainerPort }}"] ports: - - containerPort: {{.Values.Worker.ContainerPort}} + - containerPort: {{ .Values.Worker.ContainerPort }} resources: requests: - cpu: "{{.Values.Worker.Cpu}}" - memory: "{{.Values.Worker.Memory}}" + cpu: "{{ .Values.Worker.Cpu }}" + memory: "{{ .Values.Worker.Memory }}" env: - name: SPARK_DAEMON_MEMORY value: {{ default "1g" .Values.Worker.DaemonMemory | quote }} diff --git a/stable/spark/templates/spark-zeppelin-deployment.yaml b/stable/spark/templates/spark-zeppelin-deployment.yaml index ce709e7b68a1..21dff346c07a 100644 --- a/stable/spark/templates/spark-zeppelin-deployment.yaml +++ b/stable/spark/templates/spark-zeppelin-deployment.yaml @@ -3,16 +3,16 @@ kind: Service metadata: name: {{ template "zeppelin-fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Zeppelin.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Zeppelin.Component }}" spec: ports: - - port: {{.Values.Zeppelin.ServicePort}} - targetPort: {{.Values.Zeppelin.ContainerPort}} + - port: {{ .Values.Zeppelin.ServicePort }} + targetPort: {{ .Values.Zeppelin.ContainerPort }} selector: - component: "{{.Release.Name}}-{{.Values.Zeppelin.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Zeppelin.Component }}" type: "LoadBalancer" --- apiVersion: extensions/v1beta1 @@ -20,32 +20,32 @@ kind: Deployment metadata: name: {{ template "zeppelin-fullname" . }} labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Zeppelin.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Zeppelin.Component }}" spec: - replicas: {{default 1 .Values.Zeppelin.Replicas}} + replicas: {{ default 1 .Values.Zeppelin.Replicas }} strategy: type: RollingUpdate selector: matchLabels: - component: "{{.Release.Name}}-{{.Values.Zeppelin.Component}}" + component: "{{ .Release.Name }}-{{ .Values.Zeppelin.Component }}" template: metadata: labels: - heritage: {{.Release.Service | quote }} - release: {{.Release.Name | quote }} - chart: "{{.Chart.Name}}-{{.Chart.Version}}" - component: "{{.Release.Name}}-{{.Values.Zeppelin.Component}}" + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + component: "{{ .Release.Name }}-{{ .Values.Zeppelin.Component }}" spec: containers: - name: {{ template "zeppelin-fullname" . }} - image: "{{.Values.Zeppelin.Image}}:{{.Values.Zeppelin.ImageTag}}" + image: "{{ .Values.Zeppelin.Image }}:{{ .Values.Zeppelin.ImageTag }}" command: ["/bin/sh","-c"] - args: ["sed -i.bak s/spark-master:7077/{{ template "master-fullname" . }}:{{.Values.Master.ServicePort}}/g /opt/zeppelin/conf/zeppelin-env.sh; /opt/zeppelin/bin/docker-zeppelin.sh"] + args: ["sed -i.bak s/spark-master:7077/{{ template "master-fullname" . }}:{{ .Values.Master.ServicePort }}/g /opt/zeppelin/conf/zeppelin-env.sh; /opt/zeppelin/bin/docker-zeppelin.sh"] ports: - - containerPort: {{.Values.Zeppelin.ContainerPort}} + - containerPort: {{ .Values.Zeppelin.ContainerPort }} resources: requests: - cpu: "{{.Values.Zeppelin.Cpu}}" + cpu: "{{ .Values.Zeppelin.Cpu }}" diff --git a/stable/spartakus/templates/deployment.yaml b/stable/spartakus/templates/deployment.yaml index 45c0ea191352..1eb744c3c132 100644 --- a/stable/spartakus/templates/deployment.yaml +++ b/stable/spartakus/templates/deployment.yaml @@ -13,7 +13,7 @@ spec: metadata: {{- if .Values.podAnnotations }} annotations: -{{ toYaml .Values.podAnnotations | indent 8}} +{{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} labels: app: {{ template "name" . }} diff --git a/stable/spinnaker/templates/configmap/jenkins-config.yaml b/stable/spinnaker/templates/configmap/jenkins-config.yaml index 7b04c4fef60d..bd99f8d2ff59 100644 --- a/stable/spinnaker/templates/configmap/jenkins-config.yaml +++ b/stable/spinnaker/templates/configmap/jenkins-config.yaml @@ -39,10 +39,10 @@ data: 2147483647 - {{.Values.jenkins.Agent.Cpu}} - {{.Values.jenkins.Agent.Memory}} - {{.Values.jenkins.Agent.Cpu}} - {{.Values.jenkins.Agent.Memory}} + {{ .Values.jenkins.Agent.Cpu }} + {{ .Values.jenkins.Agent.Memory }} + {{ .Values.jenkins.Agent.Cpu }} + {{ .Values.jenkins.Agent.Memory }} /usr/bin/docker diff --git a/stable/spinnaker/templates/configmap/s3-config.yaml b/stable/spinnaker/templates/configmap/s3-config.yaml index 75cfc2aaec33..e08f451a7613 100644 --- a/stable/spinnaker/templates/configmap/s3-config.yaml +++ b/stable/spinnaker/templates/configmap/s3-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: {{ template "fullname" . }}-s3-config labels: - app: {{template "fullname" .}} + app: {{ template "fullname" . }} data: credentials: | [default] diff --git a/stable/spinnaker/templates/configmap/spinnaker-config.yaml b/stable/spinnaker/templates/configmap/spinnaker-config.yaml index 29a6c23b22ff..95622751c363 100644 --- a/stable/spinnaker/templates/configmap/spinnaker-config.yaml +++ b/stable/spinnaker/templates/configmap/spinnaker-config.yaml @@ -108,17 +108,17 @@ data: challengeDestructiveActionsEnvironments: ${providers.aws.primaryCredentials.name}, ${providers.google.primaryCredentials.name}, ${providers.cf.primaryCredentials.name}, ${providers.azure.primaryCredentials.name} echo.yml: | -{{.Files.Get "config/echo.yml" | indent 4}} +{{ .Files.Get "config/echo.yml" | indent 4 }} echo-local.yml: | -{{.Files.Get "config/echo-local.yml" | indent 4}} +{{ .Files.Get "config/echo-local.yml" | indent 4 }} fiat.yml: | -{{.Files.Get "config/fiat.yml" | indent 4}} +{{ .Files.Get "config/fiat.yml" | indent 4 }} fiat.yml-local: | -{{.Files.Get "config/fiat-local.yml" | indent 4}} +{{ .Files.Get "config/fiat-local.yml" | indent 4 }} front50.yml: | -{{.Files.Get "config/front50.yml" | indent 4}} +{{ .Files.Get "config/front50.yml" | indent 4 }} front50-local.yml: | -{{.Files.Get "config/front50-local.yml" | indent 4}} +{{ .Files.Get "config/front50-local.yml" | indent 4 }} gate.yml: | server: port: ${services.gate.port:8084} @@ -153,23 +153,23 @@ data: redis: connection: ${services.redis.connection} igor.yml: | -{{.Files.Get "config/igor.yml" | indent 4}} +{{ .Files.Get "config/igor.yml" | indent 4 }} igor-local.yml: | -{{.Files.Get "config/igor-local.yml" | indent 4}} +{{ .Files.Get "config/igor-local.yml" | indent 4 }} orca.yml: | -{{.Files.Get "config/orca.yml" | indent 4}} +{{ .Files.Get "config/orca.yml" | indent 4 }} orca-local.yml: | -{{.Files.Get "config/orca-local.yml" | indent 4}} +{{ .Files.Get "config/orca-local.yml" | indent 4 }} rosco.yml: | -{{.Files.Get "config/rosco.yml" | indent 4}} +{{ .Files.Get "config/rosco.yml" | indent 4 }} rosco-local.yml: | -{{.Files.Get "config/rosco-local.yml" | indent 4}} +{{ .Files.Get "config/rosco-local.yml" | indent 4 }} settings.js: | 'use strict'; var feedbackUrl = 'http://localhost'; var gateHost = '{{ .Values.deck.protocol }}://{{ .Values.deck.host }}:{{ .Values.deck.port }}/gate'; - var bakeryDetailUrl = gateHost + '/bakery/logs/global/{{"{{"}}context.status.id{{"}}"}}'; + var bakeryDetailUrl = gateHost + '/bakery/logs/global/{{ "{{ " }}context.status.id{{ " }}" }}'; window.spinnakerSettings = { defaultProviders: ['kubernetes'], @@ -219,7 +219,7 @@ data: }, }; spinnaker.yml: | -{{.Files.Get "config/spinnaker.yml" | indent 4}} +{{ .Files.Get "config/spinnaker.yml" | indent 4 }} clouddriver-local.yml: | server: port: ${services.clouddriver.port:7002} diff --git a/stable/spinnaker/templates/deployments/igor.yaml b/stable/spinnaker/templates/deployments/igor.yaml index 0bac771d69b5..fcc28406bf3f 100644 --- a/stable/spinnaker/templates/deployments/igor.yaml +++ b/stable/spinnaker/templates/deployments/igor.yaml @@ -21,7 +21,7 @@ spec: pod.alpha.kubernetes.io/init-containers: '[ { "name": "copy-default-config", - "image": "{{.Values.jenkins.Master.Image}}:{{.Values.jenkins.Master.ImageTag}}", + "image": "{{ .Values.jenkins.Master.Image }}:{{ .Values.jenkins.Master.ImageTag }}", "command": ["cp", "-n", "/var/jenkins_config/config.xml", "/var/jenkins_home"], "imagePullPolicy": "IfNotPresent", "volumeMounts": [ @@ -53,20 +53,20 @@ spec: initialDelaySeconds: 20 timeoutSeconds: 1 - name: jenkins-master - image: "{{.Values.jenkins.Master.Image}}:{{.Values.jenkins.Master.ImageTag}}" - imagePullPolicy: "{{.Values.jenkins.Master.ImagePullPolicy}}" + image: "{{ .Values.jenkins.Master.Image }}:{{ .Values.jenkins.Master.ImageTag }}" + imagePullPolicy: "{{ .Values.jenkins.Master.ImagePullPolicy }}" env: - name: JAVA_OPTS - value: "{{ default "" .Values.jenkins.Master.JavaOpts}}" + value: "{{ default "" .Values.jenkins.Master.JavaOpts }}" ports: - - containerPort: {{.Values.jenkins.Master.ContainerPort}} + - containerPort: {{ .Values.jenkins.Master.ContainerPort }} name: http - - containerPort: {{.Values.jenkins.Master.SlaveListenerPort}} + - containerPort: {{ .Values.jenkins.Master.SlaveListenerPort }} name: slavelistener resources: requests: - cpu: "{{.Values.jenkins.Master.Cpu}}" - memory: "{{.Values.jenkins.Master.Memory}}" + cpu: "{{ .Values.jenkins.Master.Cpu }}" + memory: "{{ .Values.jenkins.Master.Memory }}" volumeMounts: - mountPath: /var/jenkins_home name: jenkins-home diff --git a/stable/spinnaker/templates/hooks/create-bucket.yaml b/stable/spinnaker/templates/hooks/create-bucket.yaml index 2d7253eef7d8..428a41e8459b 100644 --- a/stable/spinnaker/templates/hooks/create-bucket.yaml +++ b/stable/spinnaker/templates/hooks/create-bucket.yaml @@ -1,7 +1,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: "{{.Release.Name}}-create-bucket" + name: "{{ .Release.Name }}-create-bucket" labels: app: {{ template "fullname" . }} component: minio @@ -10,7 +10,7 @@ metadata: spec: template: metadata: - name: "{{.Release.Name}}" + name: "{{ .Release.Name }}" labels: app: {{ template "fullname" . }} component: minio @@ -22,4 +22,4 @@ spec: command: - sh - -c - - "mc config host add {{.Release.Name}}-minio http://{{.Release.Name}}-minio-svc:9000 {{ .Values.minio.accessKey }} {{ .Values.minio.secretKey }} S3v4 && mc mb {{.Release.Name}}-minio/spinnaker" + - "mc config host add {{ .Release.Name }}-minio http://{{ .Release.Name }}-minio-svc:9000 {{ .Values.minio.accessKey }} {{ .Values.minio.secretKey }} S3v4 && mc mb {{ .Release.Name }}-minio/spinnaker" diff --git a/stable/spinnaker/templates/hooks/delete-jobs.yaml b/stable/spinnaker/templates/hooks/delete-jobs.yaml index e1307372def2..369c13706f01 100644 --- a/stable/spinnaker/templates/hooks/delete-jobs.yaml +++ b/stable/spinnaker/templates/hooks/delete-jobs.yaml @@ -1,7 +1,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: "{{.Release.Name}}-delete-jobs" + name: "{{ .Release.Name }}-delete-jobs" labels: app: {{ template "fullname" . }} component: spinnaker @@ -10,7 +10,7 @@ metadata: spec: template: metadata: - name: "{{.Release.Name}}" + name: "{{ .Release.Name }}" labels: app: {{ template "fullname" . }} component: spinnaker @@ -30,4 +30,4 @@ spec: command: - sh - -c - - "kubectl delete job --namespace {{ .Release.Namespace }} {{.Release.Name}}-create-bucket {{.Release.Name}}-upload-build-image {{.Release.Name}}-delete-jobs {{.Release.Name}}-upload-run-script" + - "kubectl delete job --namespace {{ .Release.Namespace }} {{ .Release.Name }}-create-bucket {{ .Release.Name }}-upload-build-image {{ .Release.Name }}-delete-jobs {{ .Release.Name }}-upload-run-script" diff --git a/stable/spinnaker/templates/hooks/upload-build-image.yaml b/stable/spinnaker/templates/hooks/upload-build-image.yaml index cb987f14f818..d4aca348a950 100644 --- a/stable/spinnaker/templates/hooks/upload-build-image.yaml +++ b/stable/spinnaker/templates/hooks/upload-build-image.yaml @@ -1,7 +1,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: "{{.Release.Name}}-upload-build-image" + name: "{{ .Release.Name }}-upload-build-image" labels: app: {{ template "fullname" . }} component: jenkins @@ -10,7 +10,7 @@ metadata: spec: template: metadata: - name: "{{.Release.Name}}" + name: "{{ .Release.Name }}" labels: app: {{ template "fullname" . }} component: jenkins diff --git a/stable/spinnaker/templates/hooks/upload-run-script.yaml b/stable/spinnaker/templates/hooks/upload-run-script.yaml index 369357037014..c38c9e39fc50 100644 --- a/stable/spinnaker/templates/hooks/upload-run-script.yaml +++ b/stable/spinnaker/templates/hooks/upload-run-script.yaml @@ -1,7 +1,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: "{{.Release.Name}}-upload-run-script" + name: "{{ .Release.Name }}-upload-run-script" labels: app: {{ template "fullname" . }} component: jenkins @@ -10,7 +10,7 @@ metadata: spec: template: metadata: - name: "{{.Release.Name}}" + name: "{{ .Release.Name }}" labels: app: {{ template "fullname" . }} component: jenkins diff --git a/stable/sumokube/templates/config.yaml b/stable/sumokube/templates/config.yaml index 8c7cab9a7ce1..e2caa2e965a0 100644 --- a/stable/sumokube/templates/config.yaml +++ b/stable/sumokube/templates/config.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: metadata: - name: "{{ template "fullname" . }}-config-{{.Release.Time.Seconds }}" + name: "{{ template "fullname" . }}-config-{{ .Release.Time.Seconds }}" labels: app: {{ template "fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" diff --git a/stable/sumokube/templates/secrets.yaml b/stable/sumokube/templates/secrets.yaml index 2678aa3c486d..1013cde3c699 100644 --- a/stable/sumokube/templates/secrets.yaml +++ b/stable/sumokube/templates/secrets.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: "{{ template "fullname" . }}-secrets-{{.Release.Time.Seconds }}" + name: "{{ template "fullname" . }}-secrets-{{ .Release.Time.Seconds }}" labels: app: {{ template "fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" diff --git a/stable/traefik/templates/deployment.yaml b/stable/traefik/templates/deployment.yaml index 0156cf28e81d..9aaca5403b1e 100644 --- a/stable/traefik/templates/deployment.yaml +++ b/stable/traefik/templates/deployment.yaml @@ -38,11 +38,11 @@ spec: name: {{ template "fullname" . }} resources: requests: - cpu: "{{.Values.cpuRequest}}" - memory: "{{.Values.memoryRequest}}" + cpu: "{{ .Values.cpuRequest }}" + memory: "{{ .Values.memoryRequest }}" limits: - cpu: "{{.Values.cpuLimit}}" - memory: "{{.Values.memoryLimit}}" + cpu: "{{ .Values.cpuLimit }}" + memory: "{{ .Values.memoryLimit }}" readinessProbe: tcpSocket: port: 80 diff --git a/stable/uchiwa/templates/deployment.yaml b/stable/uchiwa/templates/deployment.yaml index 059a4a121f87..217cf3ad6215 100644 --- a/stable/uchiwa/templates/deployment.yaml +++ b/stable/uchiwa/templates/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{template "fullname" .}} + name: {{ template "fullname" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} diff --git a/stable/uchiwa/templates/svc.yaml b/stable/uchiwa/templates/svc.yaml index 2e07e795fbfb..297f9a651849 100644 --- a/stable/uchiwa/templates/svc.yaml +++ b/stable/uchiwa/templates/svc.yaml @@ -10,11 +10,11 @@ metadata: router.deis.io/routable: "true" annotations: router.deis.io/domains: {{ .Values.deis.domains | quote }} - {{end}} + {{ end }} spec: - type: {{.Values.serviceType}} + type: {{ .Values.serviceType }} ports: - port: {{ .Values.httpPort }} targetPort: {{ .Values.port }} selector: - app: {{ template "fullname" . }} \ No newline at end of file + app: {{ template "fullname" . }} diff --git a/stable/weave-cloud/templates/NOTES.txt b/stable/weave-cloud/templates/NOTES.txt index 441d22e6d743..af16ccb999e9 100644 --- a/stable/weave-cloud/templates/NOTES.txt +++ b/stable/weave-cloud/templates/NOTES.txt @@ -25,4 +25,4 @@ Then run: helm upgrade {{ .Release.Name }} --set ServiceToken= stable/weave-cloud -{{- end}} +{{- end }} diff --git a/stable/weave-cloud/templates/cortex.yaml b/stable/weave-cloud/templates/cortex.yaml index 82151761ed18..e05ce48012ee 100644 --- a/stable/weave-cloud/templates/cortex.yaml +++ b/stable/weave-cloud/templates/cortex.yaml @@ -149,7 +149,7 @@ items: remote_write: - url: 'https://cloud.weave.works/api/prom/push' basic_auth: - password: '{{.Values.ServiceToken}}' + password: '{{ .Values.ServiceToken }}' scrape_configs: - job_name: kubernetes-service-endpoints kubernetes_sd_configs: diff --git a/stable/weave-cloud/templates/flux.yaml b/stable/weave-cloud/templates/flux.yaml index 65f8a7daf8cd..606e67636ab7 100644 --- a/stable/weave-cloud/templates/flux.yaml +++ b/stable/weave-cloud/templates/flux.yaml @@ -60,7 +60,7 @@ items: containers: - name: agent args: - - '--token={{.Values.ServiceToken}}' + - '--token={{ .Values.ServiceToken }}' image: 'quay.io/weaveworks/fluxd:0.2.0' imagePullPolicy: IfNotPresent serviceAccountName: weave-flux diff --git a/stable/weave-cloud/templates/scope.yaml b/stable/weave-cloud/templates/scope.yaml index 06fa7e7539c6..783066074775 100644 --- a/stable/weave-cloud/templates/scope.yaml +++ b/stable/weave-cloud/templates/scope.yaml @@ -63,7 +63,7 @@ items: - '--probe.docker.bridge=docker0' - '--probe.docker=true' - '--probe.kubernetes=true' - - '--service-token={{.Values.ServiceToken}}' + - '--service-token={{ .Values.ServiceToken }}' image: 'weaveworks/scope:1.4.0' imagePullPolicy: IfNotPresent securityContext: