Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

Commit

Permalink
Upgrade kube-state-metrics to 1.2.0, add new collectors (#4146)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rifelpet @k8s-ci-robot
rifelpet authored and k8s-ci-robot committed Mar 23, 2018
1 parent e067fdd commit b7f8828
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 42 deletions.
4 changes: 2 additions & 2 deletions stable/kube-state-metrics/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ keywords:
- metric
- monitoring
- prometheus
version: 0.5.3
appVersion: 1.1.0
version: 0.6.0
appVersion: 1.2.0
home: https://github.com/kubernetes/kube-state-metrics/
sources:
- https://github.com/kubernetes/kube-state-metrics/
Expand Down
54 changes: 29 additions & 25 deletions stable/kube-state-metrics/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,32 @@ $ helm install stable/kube-state-metrics

## Configuration

| Parameter | Description | Default |
|-------------------------------------|---------------------------------------------------------|---------------------------------------------|
| `image.repository` | The image repository to pull from | k8s.gcr.io/kube-state-metrics |
| `image.tag` | The image tag to pull from | <latest version> |
| `image.pullPolicy` | Image pull policy | IfNotPresent |
| `service.port` | The port of the container | 8080 |
| `prometheusScrape` | Whether or not enable prom scrape | True |
| `rbac.create` | If true, create & use RBAC resources | False |
| `rbac.serviceAccountName` | ServiceAccount to be used (ignored if rbac.create=true) | default |
| `nodeSelector` | Node labels for pod assignment | {} |
| `podAnnotations` | Annotations to be added to the pod | {} |
| `resources` | kube-state-metrics resource requests and limits | {} |
| `collectors.daemonsets` | Enable the daemonsets collector. | true |
| `collectors.deployments` | Enable the deployments collector. | true |
| `collectors.limitranges` | Enable the limitranges collector. | true |
| `collectors.nodes` | Enable the nodes collector. | true |
| `collectors.pods` | Enable the pods collector. | true |
| `collectors.replicasets` | Enable the replicasets collector. | true |
| `collectors.replicationcontrollers` | Enable the replicationcontrollers collector. | true |
| `collectors.resourcequotas` | Enable the resourcequotas collector. | true |
| `collectors.services` | Enable the services collector. | true |
| `collectors.jobs` | Enable the jobs collector. | true |
| `collectors.cronjobs` | Enable the cronjobs collector. | true |
| `collectors.statefulsets` | Enable the statefulsets collector. | true |
| `collectors.persistentvolumeclaims` | Enable the persistentvolumeclaims collector. | true |
| Parameter | Description | Default |
|---------------------------------------|---------------------------------------------------------|---------------------------------------------|
| `image.repository` | The image repository to pull from | k8s.gcr.io/kube-state-metrics |
| `image.tag` | The image tag to pull from | <latest version> |
| `image.pullPolicy` | Image pull policy | IfNotPresent |
| `service.port` | The port of the container | 8080 |
| `prometheusScrape` | Whether or not enable prom scrape | True |
| `rbac.create` | If true, create & use RBAC resources | False |
| `rbac.serviceAccountName` | ServiceAccount to be used (ignored if rbac.create=true) | default |
| `nodeSelector` | Node labels for pod assignment | {} |
| `podAnnotations` | Annotations to be added to the pod | {} |
| `resources` | kube-state-metrics resource requests and limits | {} |
| `collectors.cronjobs` | Enable the cronjobs collector. | true |
| `collectors.daemonsets` | Enable the daemonsets collector. | true |
| `collectors.deployments` | Enable the deployments collector. | true |
| `collectors.endpoints` | Enable the endpoints collector. | true |
| `collectors.horizontalpodautoscalers` | Enable the horizontalpodautoscalers collector. | true |
| `collectors.jobs` | Enable the jobs collector. | true |
| `collectors.limitranges` | Enable the limitranges collector. | true |
| `collectors.namespaces` | Enable the namespaces collector. | true |
| `collectors.nodes` | Enable the nodes collector. | true |
| `collectors.persistentvolumeclaims` | Enable the persistentvolumeclaims collector. | true |
| `collectors.persistentvolumes` | Enable the persistentvolumes collector. | true |
| `collectors.pods` | Enable the pods collector. | true |
| `collectors.replicasets` | Enable the replicasets collector. | true |
| `collectors.replicationcontrollers` | Enable the replicationcontrollers collector. | true |
| `collectors.resourcequotas` | Enable the resourcequotas collector. | true |
| `collectors.services` | Enable the services collector. | true |
| `collectors.statefulsets` | Enable the statefulsets collector. | true |
34 changes: 23 additions & 11 deletions stable/kube-state-metrics/templates/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,39 @@ spec:
containers:
- name: {{ .Chart.Name }}
args:
{{ if .Values.collectors.daemonsets }}
{{ if .Values.collectors.cronjobs }}
- --collectors=cronjobs
{{ end }}
{{ if .Values.collectors.daemonsets }}
- --collectors=daemonsets
{{ end }}
{{ if .Values.collectors.deployments }}
{{ if .Values.collectors.deployments }}
- --collectors=deployments
{{ end }}
{{ if .Values.collectors.endpoints }}
- --collectors=endpoints
{{ end }}
{{ if .Values.collectors.horizontalpodautoscalers }}
- --collectors=horizontalpodautoscalers
{{ end }}
{{ if .Values.collectors.jobs }}
- --collectors=jobs
{{ end }}
{{ if .Values.collectors.limitranges }}
- --collectors=limitranges
{{ end }}
{{ if .Values.collectors.namespaces }}
- --collectors=namespaces
{{ end }}
{{ if .Values.collectors.nodes }}
- --collectors=nodes
{{ end }}
{{ if .Values.collectors.persistentvolumeclaims }}
- --collectors=persistentvolumeclaims
{{ end }}
{{ if .Values.collectors.persistentvolumes }}
- --collectors=persistentvolumes
{{ end }}
{{ if .Values.collectors.pods }}
- --collectors=pods
{{ end }}
Expand All @@ -50,18 +71,9 @@ spec:
{{ if .Values.collectors.services }}
- --collectors=services
{{ end }}
{{ if .Values.collectors.jobs }}
- --collectors=jobs
{{ end }}
{{ if .Values.collectors.cronjobs }}
- --collectors=cronjobs
{{ end }}
{{ if .Values.collectors.statefulsets }}
- --collectors=statefulsets
{{ end }}
{{ if .Values.collectors.persistentvolumeclaims }}
- --collectors=persistentvolumeclaims
{{ end }}
{{ if .Values.namespace }}
- --namespace={{ .Values.namespace }}
{{ end }}
Expand Down
12 changes: 8 additions & 4 deletions stable/kube-state-metrics/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
prometheusScrape: true
image:
repository: k8s.gcr.io/kube-state-metrics
tag: v1.1.0
tag: v1.2.0
pullPolicy: IfNotPresent
service:
port: 8080
Expand All @@ -26,19 +26,23 @@ podAnnotations: {}
# Available collectors for kube-state-metrics. By default all available
# collectors are enabled.
collectors:
cronjobs: true
daemonsets: true
deployments: true
endpoints: true
horizontalpodautoscalers: true
jobs: true
limitranges: true
namespaces: true
nodes: true
persistentvolumeclaims: true
persistentvolumes: true
pods: true
replicasets: true
replicationcontrollers: true
resourcequotas: true
services: true
jobs: true
cronjobs: true
statefulsets: true
persistentvolumeclaims: true

# Namespace to be enabled for collecting resources. By default all namespaces are collected.
# namespace: ""

0 comments on commit b7f8828

Please sign in to comment.