From e7082c4a2270c09b7484f597dfd31d0671cfe210 Mon Sep 17 00:00:00 2001 From: Jose Aguirre Date: Tue, 13 Jun 2017 09:23:09 -0700 Subject: [PATCH 1/4] [stable/heapster] Default service name to heapster --- stable/heapster/templates/_helpers.tpl | 3 +-- stable/heapster/values.yaml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/stable/heapster/templates/_helpers.tpl b/stable/heapster/templates/_helpers.tpl index afb73b4075cf..a75a8d5268ca 100644 --- a/stable/heapster/templates/_helpers.tpl +++ b/stable/heapster/templates/_helpers.tpl @@ -20,6 +20,5 @@ Create a service name that defaults to app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "service.fullname" -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- .Values.service.nameOverride | default (printf "%s-%s" .Release.Name $name) | trunc 63 | trimSuffix "-" -}} +{{- .Values.service.nameOverride | default .Chart.Name }} {{- end -}} diff --git a/stable/heapster/values.yaml b/stable/heapster/values.yaml index 2cef479eeb98..6c8b7eb9e967 100644 --- a/stable/heapster/values.yaml +++ b/stable/heapster/values.yaml @@ -10,7 +10,7 @@ service: externalPort: 8082 internalPort: 8082 ## This allows an overide of the heapster service name - ## Default: {{ template "fullname" . }} + ## Default: {{ .Chart.Name }} # nameOverride: resources: limits: From aa81594fd48c03409bac8bd114d0f7d172c4cb05 Mon Sep 17 00:00:00 2001 From: Jose Aguirre Date: Tue, 13 Jun 2017 09:24:39 -0700 Subject: [PATCH 2/4] [stable/heapster] Added support for custom labels --- stable/heapster/templates/deployment.yaml | 3 +++ stable/heapster/templates/service.yaml | 3 +++ stable/heapster/values.yaml | 13 +++++++++++++ 3 files changed, 19 insertions(+) diff --git a/stable/heapster/templates/deployment.yaml b/stable/heapster/templates/deployment.yaml index 3544550deca3..020bcde75e73 100644 --- a/stable/heapster/templates/deployment.yaml +++ b/stable/heapster/templates/deployment.yaml @@ -4,6 +4,9 @@ metadata: name: {{ template "fullname" . }} labels: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + {{- range $key, $value := .Values.labels }} + {{ $key }}: {{ $value }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} template: diff --git a/stable/heapster/templates/service.yaml b/stable/heapster/templates/service.yaml index 6dcf31312545..693094dc3c1f 100644 --- a/stable/heapster/templates/service.yaml +++ b/stable/heapster/templates/service.yaml @@ -7,6 +7,9 @@ metadata: app: {{ template "fullname" . }} heritage: "{{ .Release.Service }}" release: "{{ .Release.Name }}" + {{- range $key, $value := .Values.service.labels }} + {{ $key }}: {{ $value }} + {{- end }} spec: type: {{ .Values.service.type }} ports: diff --git a/stable/heapster/values.yaml b/stable/heapster/values.yaml index 6c8b7eb9e967..4ea2ef659513 100644 --- a/stable/heapster/values.yaml +++ b/stable/heapster/values.yaml @@ -5,6 +5,12 @@ image: repository: gcr.io/google_containers/heapster tag: v1.3.0 pullPolicy: IfNotPresent +## Here labels can be added to the hepaster deployment +# labels: +# kubernetes.io/cluster-service: "true" +# kubernetes.io/name: "Heapster" +labels: + service: type: ClusterIP externalPort: 8082 @@ -12,6 +18,13 @@ service: ## This allows an overide of the heapster service name ## Default: {{ .Chart.Name }} # nameOverride: + + ## Here labels can be added to the hepaster service + # labels: + # kubernetes.io/cluster-service: "true" + # kubernetes.io/name: "Heapster" + labels: + resources: limits: cpu: 100m From da29d8b850d2b99177d2a962ed45c932a28d9149 Mon Sep 17 00:00:00 2001 From: Martin Linkhorst Date: Wed, 14 Jun 2017 16:50:38 +0200 Subject: [PATCH 3/4] [stable/heapster] fix typo --- stable/heapster/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/heapster/values.yaml b/stable/heapster/values.yaml index 4ea2ef659513..ab703d7544e8 100644 --- a/stable/heapster/values.yaml +++ b/stable/heapster/values.yaml @@ -5,7 +5,7 @@ image: repository: gcr.io/google_containers/heapster tag: v1.3.0 pullPolicy: IfNotPresent -## Here labels can be added to the hepaster deployment +## Here labels can be added to the heapster deployment # labels: # kubernetes.io/cluster-service: "true" # kubernetes.io/name: "Heapster" @@ -19,7 +19,7 @@ service: ## Default: {{ .Chart.Name }} # nameOverride: - ## Here labels can be added to the hepaster service + ## Here labels can be added to the heapster service # labels: # kubernetes.io/cluster-service: "true" # kubernetes.io/name: "Heapster" From 2e1f0c6f9c3d2291c78eb75e286726227440b54a Mon Sep 17 00:00:00 2001 From: Vic Iglesias Date: Wed, 5 Jul 2017 15:01:13 -0700 Subject: [PATCH 4/4] Update Chart.yaml --- stable/heapster/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/heapster/Chart.yaml b/stable/heapster/Chart.yaml index ee0657bb7bca..c2e7d9ee5bd1 100644 --- a/stable/heapster/Chart.yaml +++ b/stable/heapster/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Heapster enables Container Cluster Monitoring and Performance Analysis. name: heapster -version: 0.1.0 +version: 0.1.1 sources: - https://github.com/kubernetes/heapster - https://github.com/kubernetes/contrib/tree/master/addon-resizer