diff --git a/stable/heapster/Chart.yaml b/stable/heapster/Chart.yaml index 43c46bedd2..74c6ec1665 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.2.7 +version: 0.2.8 sources: - https://github.com/kubernetes/heapster - https://github.com/kubernetes/contrib/tree/master/addon-resizer diff --git a/stable/heapster/README.md b/stable/heapster/README.md index f5718a7c19..df8e7ebffe 100644 --- a/stable/heapster/README.md +++ b/stable/heapster/README.md @@ -47,6 +47,7 @@ The default configuration values for this chart are listed in `values.yaml`. | `rbac.serviceAccountName` | existing ServiceAccount to use (ignored if rbac.create=true) | default | | `resizer.enabled` | If enabled, scale resources | true | | `eventer.enabled` | If enabled, start eventer | false | +| `podAnnotations` | Pod Annotations to be added to the heapster Pod | `{}` | | `nodeSelector` | Node labels for pod assignment | `{}` | The table below is only applicable if `resizer.enabled` is `true`. More information on resizer can be found [here](https://github.com/kubernetes/contrib/blob/master/addon-resizer/README.md). diff --git a/stable/heapster/templates/deployment.yaml b/stable/heapster/templates/deployment.yaml index 15c3f71543..750d6f4971 100644 --- a/stable/heapster/templates/deployment.yaml +++ b/stable/heapster/templates/deployment.yaml @@ -13,6 +13,8 @@ spec: replicas: {{ .Values.replicaCount }} template: metadata: + annotations: +{{ toYaml .Values.podAnnotations | indent 8 }} labels: app: {{ template "heapster.fullname" . }} spec: diff --git a/stable/heapster/values.yaml b/stable/heapster/values.yaml index c99535adad..306e911fbf 100644 --- a/stable/heapster/values.yaml +++ b/stable/heapster/values.yaml @@ -16,6 +16,11 @@ labels: {} # scheduler.alpha.kubernetes.io/critical-pod: '' annotations: {} +## Here annotations can be added for the heapster Pod +# podAnnotations: +# prometheus.io/scrape: "true" +podAnnotations: {} + ## Node labels for pod assignment ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ##