Merge pull request #1545 from mrueg/update-go-21-08

Support for kubernetes 1.22.0 / Update dependencies
kubernetes · Aug 6, 2021 · 0a18c77 · 0a18c77
2 parents 85bfbf0 + e3f0cbd
commit 0a18c77
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 64 deletions.
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ OS ?= $(shell uname -s | tr A-Z a-z)
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
 PKG = github.com/prometheus/common
 PROMETHEUS_VERSION = 2.28.1
-GO_VERSION = 1.16.5
+GO_VERSION = 1.16.6
 IMAGE = $(REGISTRY)/kube-state-metrics
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 USER ?= $(shell id -u -n)

diff --git a/README.md b/README.md
@@ -66,12 +66,12 @@ All additional compatibility is only best effort, or happens to still/already be
 
 At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kubernetes/kubernetes/releases) will be recorded below.
 
-| kube-state-metrics | **Kubernetes 1.17** |  **Kubernetes 1.18** |  **Kubernetes 1.19** |  **Kubernetes 1.20** |  **Kubernetes 1.21** |
+| kube-state-metrics | **Kubernetes 1.18** |  **Kubernetes 1.19** |  **Kubernetes 1.20** |  **Kubernetes 1.21** | **Kubernetes 1.22**  |
 |--------------------|---------------------|----------------------|----------------------|----------------------|----------------------|
 | **v1.9.8**         |         -           |          -           |          -           |          -           |          -           |
-| **v2.0.0**         |         -/✓         |          -/✓         |          ✓           |          ✓           |          -/✓         |
-| **v2.1.1**         |         -/✓         |          -/✓         |          ✓           |          ✓           |          ✓           |
-| **master**         |         -/✓         |          -/✓         |          ✓           |          ✓           |          ✓           |
+| **v2.0.0**         |         -/✓         |          ✓           |          ✓           |          -/✓         |          -/✓         |
+| **v2.1.1**         |         -/✓         |          ✓           |          ✓           |          ✓           |          -/✓         |
+| **master**         |         -/✓         |          ✓           |          ✓           |          ✓           |          ✓           |
 
 - `✓` Fully supported version range.
 - `-` The Kubernetes cluster has features the client-go library can't use (additional API objects, deprecated APIs, etc).

diff --git a/go.mod b/go.mod
@@ -1,7 +1,7 @@
 module k8s.io/kube-state-metrics/v2
 
 require (
-	github.com/brancz/gojsontoyaml v0.0.0-20210709073738-09985366e724
+	github.com/brancz/gojsontoyaml v0.1.0
 	github.com/campoy/embedmd v1.0.0
 	github.com/dgryski/go-jump v0.0.0-20170409065014-e1f439676b57
 	github.com/google/go-jsonnet v0.17.0
@@ -10,16 +10,16 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.29.0
-	github.com/prometheus/exporter-toolkit v0.6.0
+	github.com/prometheus/common v0.30.0
+	github.com/prometheus/exporter-toolkit v0.6.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/tools v0.1.4
-	k8s.io/api v0.21.2
-	k8s.io/apimachinery v0.21.2
+	golang.org/x/tools v0.1.5
+	k8s.io/api v0.22.0
+	k8s.io/apimachinery v0.22.0
 	k8s.io/autoscaler/vertical-pod-autoscaler v0.9.2
-	k8s.io/client-go v0.21.2
-	k8s.io/klog/v2 v2.9.0
+	k8s.io/client-go v0.22.0
+	k8s.io/klog/v2 v2.10.0
 )
 
 go 1.16