Merge branch 'master' into release-1.5

kubernetes · Dec 11, 2018 · c56e5ee · c56e5ee
2 parents bbb2c42 + 3a634e9
commit c56e5ee
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: required
 language: go
 
 go:
-    - "1.10.3"
+    - "1.11.2"
 
 install:
 - mkdir -p $HOME/gopath/src/k8s.io

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.5.0-beta.0 / 2018-12-11
+
+After a testing period of 11 days, there were no additional bugs found or features introduced.
+
 ## v1.5.0-alpha.0 / 2018-11-30
 
 * [CHANGE] Disable gzip compression of kube-state-metrics responses by default. Can be re-enabled via `--enable-gzip-encoding`. See #563 for more details.

diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ BuildDate = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 Commit = $(shell git rev-parse --short HEAD)
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 PKG=k8s.io/kube-state-metrics/pkg
-GO_VERSION=1.10.3
+GO_VERSION=1.11.2
 
 IMAGE = $(REGISTRY)/kube-state-metrics
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)

diff --git a/pkg/collectors/builder.go b/pkg/collectors/builder.go
@@ -122,20 +122,20 @@ var availableCollectors = map[string]func(f *Builder) *Collector{
 	"deployments":              func(b *Builder) *Collector { return b.buildDeploymentCollector() },
 	"endpoints":                func(b *Builder) *Collector { return b.buildEndpointsCollector() },
 	"horizontalpodautoscalers": func(b *Builder) *Collector { return b.buildHPACollector() },
-	"jobs":                   func(b *Builder) *Collector { return b.buildJobCollector() },
-	"limitranges":            func(b *Builder) *Collector { return b.buildLimitRangeCollector() },
-	"namespaces":             func(b *Builder) *Collector { return b.buildNamespaceCollector() },
-	"nodes":                  func(b *Builder) *Collector { return b.buildNodeCollector() },
-	"persistentvolumeclaims": func(b *Builder) *Collector { return b.buildPersistentVolumeClaimCollector() },
-	"persistentvolumes":      func(b *Builder) *Collector { return b.buildPersistentVolumeCollector() },
-	"poddisruptionbudgets":   func(b *Builder) *Collector { return b.buildPodDisruptionBudgetCollector() },
-	"pods":                   func(b *Builder) *Collector { return b.buildPodCollector() },
-	"replicasets":            func(b *Builder) *Collector { return b.buildReplicaSetCollector() },
-	"replicationcontrollers": func(b *Builder) *Collector { return b.buildReplicationControllerCollector() },
-	"resourcequotas":         func(b *Builder) *Collector { return b.buildResourceQuotaCollector() },
-	"secrets":                func(b *Builder) *Collector { return b.buildSecretCollector() },
-	"services":               func(b *Builder) *Collector { return b.buildServiceCollector() },
-	"statefulsets":           func(b *Builder) *Collector { return b.buildStatefulSetCollector() },
+	"jobs":                     func(b *Builder) *Collector { return b.buildJobCollector() },
+	"limitranges":              func(b *Builder) *Collector { return b.buildLimitRangeCollector() },
+	"namespaces":               func(b *Builder) *Collector { return b.buildNamespaceCollector() },
+	"nodes":                    func(b *Builder) *Collector { return b.buildNodeCollector() },
+	"persistentvolumeclaims":   func(b *Builder) *Collector { return b.buildPersistentVolumeClaimCollector() },
+	"persistentvolumes":        func(b *Builder) *Collector { return b.buildPersistentVolumeCollector() },
+	"poddisruptionbudgets":     func(b *Builder) *Collector { return b.buildPodDisruptionBudgetCollector() },
+	"pods":                     func(b *Builder) *Collector { return b.buildPodCollector() },
+	"replicasets":              func(b *Builder) *Collector { return b.buildReplicaSetCollector() },
+	"replicationcontrollers":   func(b *Builder) *Collector { return b.buildReplicationControllerCollector() },
+	"resourcequotas":           func(b *Builder) *Collector { return b.buildResourceQuotaCollector() },
+	"secrets":                  func(b *Builder) *Collector { return b.buildSecretCollector() },
+	"services":                 func(b *Builder) *Collector { return b.buildServiceCollector() },
+	"statefulsets":             func(b *Builder) *Collector { return b.buildStatefulSetCollector() },
 }
 
 func (b *Builder) buildConfigMapCollector() *Collector {