Skip to content

Commit c56e5ee

Browse files
committed
Merge branch 'master' into release-1.5
2 parents bbb2c42 + 3a634e9 commit c56e5ee

4 files changed

Lines changed: 20 additions & 16 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: required
33
language: go
44

55
go:
6-
- "1.10.3"
6+
- "1.11.2"
77

88
install:
99
- mkdir -p $HOME/gopath/src/k8s.io

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v1.5.0-beta.0 / 2018-12-11
2+
3+
After a testing period of 11 days, there were no additional bugs found or features introduced.
4+
15
## v1.5.0-alpha.0 / 2018-11-30
26

37
* [CHANGE] Disable gzip compression of kube-state-metrics responses by default. Can be re-enabled via `--enable-gzip-encoding`. See #563 for more details.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ BuildDate = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
88
Commit = $(shell git rev-parse --short HEAD)
99
ALL_ARCH = amd64 arm arm64 ppc64le s390x
1010
PKG=k8s.io/kube-state-metrics/pkg
11-
GO_VERSION=1.10.3
11+
GO_VERSION=1.11.2
1212

1313
IMAGE = $(REGISTRY)/kube-state-metrics
1414
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)

pkg/collectors/builder.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,20 @@ var availableCollectors = map[string]func(f *Builder) *Collector{
122122
"deployments": func(b *Builder) *Collector { return b.buildDeploymentCollector() },
123123
"endpoints": func(b *Builder) *Collector { return b.buildEndpointsCollector() },
124124
"horizontalpodautoscalers": func(b *Builder) *Collector { return b.buildHPACollector() },
125-
"jobs": func(b *Builder) *Collector { return b.buildJobCollector() },
126-
"limitranges": func(b *Builder) *Collector { return b.buildLimitRangeCollector() },
127-
"namespaces": func(b *Builder) *Collector { return b.buildNamespaceCollector() },
128-
"nodes": func(b *Builder) *Collector { return b.buildNodeCollector() },
129-
"persistentvolumeclaims": func(b *Builder) *Collector { return b.buildPersistentVolumeClaimCollector() },
130-
"persistentvolumes": func(b *Builder) *Collector { return b.buildPersistentVolumeCollector() },
131-
"poddisruptionbudgets": func(b *Builder) *Collector { return b.buildPodDisruptionBudgetCollector() },
132-
"pods": func(b *Builder) *Collector { return b.buildPodCollector() },
133-
"replicasets": func(b *Builder) *Collector { return b.buildReplicaSetCollector() },
134-
"replicationcontrollers": func(b *Builder) *Collector { return b.buildReplicationControllerCollector() },
135-
"resourcequotas": func(b *Builder) *Collector { return b.buildResourceQuotaCollector() },
136-
"secrets": func(b *Builder) *Collector { return b.buildSecretCollector() },
137-
"services": func(b *Builder) *Collector { return b.buildServiceCollector() },
138-
"statefulsets": func(b *Builder) *Collector { return b.buildStatefulSetCollector() },
125+
"jobs": func(b *Builder) *Collector { return b.buildJobCollector() },
126+
"limitranges": func(b *Builder) *Collector { return b.buildLimitRangeCollector() },
127+
"namespaces": func(b *Builder) *Collector { return b.buildNamespaceCollector() },
128+
"nodes": func(b *Builder) *Collector { return b.buildNodeCollector() },
129+
"persistentvolumeclaims": func(b *Builder) *Collector { return b.buildPersistentVolumeClaimCollector() },
130+
"persistentvolumes": func(b *Builder) *Collector { return b.buildPersistentVolumeCollector() },
131+
"poddisruptionbudgets": func(b *Builder) *Collector { return b.buildPodDisruptionBudgetCollector() },
132+
"pods": func(b *Builder) *Collector { return b.buildPodCollector() },
133+
"replicasets": func(b *Builder) *Collector { return b.buildReplicaSetCollector() },
134+
"replicationcontrollers": func(b *Builder) *Collector { return b.buildReplicationControllerCollector() },
135+
"resourcequotas": func(b *Builder) *Collector { return b.buildResourceQuotaCollector() },
136+
"secrets": func(b *Builder) *Collector { return b.buildSecretCollector() },
137+
"services": func(b *Builder) *Collector { return b.buildServiceCollector() },
138+
"statefulsets": func(b *Builder) *Collector { return b.buildStatefulSetCollector() },
139139
}
140140

141141
func (b *Builder) buildConfigMapCollector() *Collector {

0 commit comments

Comments
 (0)