Skip to content

Commit 0880c8d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1819 from mrueg/bump-go-1.19
Build with go 1.19 / update to k8s 1.25
2 parents cb5f88b + 3eee641 commit 0880c8d

File tree

8 files changed

+213
-162
lines changed

8 files changed

+213
-162
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ env:
2020
E2E_SETUP_KIND: yes
2121
E2E_SETUP_KUBECTL: yes
2222
SUDO: sudo
23-
GO_VERSION: "^1.18"
23+
GO_VERSION: "^1.19"
2424
GOLANGCI_LINT_VERSION: "v1.48.0"
2525

2626
jobs:

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOVERSION=1.18
1+
ARG GOVERSION=1.19
22
ARG GOARCH
33
FROM golang:${GOVERSION} as builder
44
ARG GOARCH

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ OS ?= $(shell uname -s | tr A-Z a-z)
1616
ALL_ARCH = amd64 arm arm64 ppc64le s390x
1717
PKG = github.com/prometheus/common
1818
PROMETHEUS_VERSION = 2.37.0
19-
GO_VERSION = 1.18.5
19+
GO_VERSION = 1.19.2
2020
IMAGE = $(REGISTRY)/kube-state-metrics
2121
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
2222
USER ?= $(shell id -u -n)

‎README.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,16 @@ All additional compatibility is only best effort, or happens to still/already be
6767
#### Compatibility matrix
6868

6969
At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kubernetes/kubernetes/releases) will be recorded below.
70+
Generally, it is recommended to use the latest release of kube-state-metrics. If you run a very recent version of Kubernetes, you might want to use an unreleased version to have the full range of supported resources. If you run an older version of Kubernetes, you might need to run an older version in order to have full support for all resources. Be aware, that the maintainers will only support the latest release. Older versions might be supported by interested users of the community.
7071

71-
| kube-state-metrics | **Kubernetes 1.20** | **Kubernetes 1.21** | **Kubernetes 1.22** | **Kubernetes 1.23** | **Kubernetes 1.24** |
72-
|--------------------|:--------------------:|:---------------------:|:-------------------:|:-------------------:|:-------------------:|
73-
| **v2.3.0** | ✓ | ✓ | ✓ | ✓ | - |
74-
| **v2.4.2** | -/✓ | -/✓ | ✓ | ✓ | - |
75-
| **v2.5.0** | -/✓ | -/✓ | ✓ | ✓ | ✓ |
76-
| **v2.6.0** | -/✓ | -/✓ | ✓ | ✓ | ✓ |
77-
| **master** | -/✓ | -/✓ | ✓ | ✓ | ✓ |
72+
| kube-state-metrics | Kubernetes client-go Version |
73+
|--------------------|:----------------------------:|
74+
| **v2.3.0** | v1.23 |
75+
| **v2.4.2** | v1.23 |
76+
| **v2.5.0** | v1.24 |
77+
| **v2.6.0** | v1.24 |
78+
| **master** | v1.25 |
7879

79-
- `✓` Fully supported version range.
80-
- `-` The Kubernetes cluster has features the client-go library can't use (additional API objects, deprecated APIs, etc).
81-
82-
**Note:** The current kube-state-metrics `v2.0.0 +` releases work on Kubernetes v1.17 & v1.18 excluding Ingress or CertificateSigningRequest resource metrics. If you require those metrics on an older Kubernetes version, use kube-state-metrics `v1.9.8`.
8380

8481
#### Resource group version compatibility
8582

‎go.mod

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ require (
1818
github.com/stretchr/testify v1.8.0
1919
golang.org/x/perf v0.0.0-20220722155240-3d85ee92886d
2020
gopkg.in/yaml.v3 v3.0.1
21-
k8s.io/api v0.24.4
22-
k8s.io/apimachinery v0.24.4
23-
k8s.io/autoscaler/vertical-pod-autoscaler v0.11.0
24-
k8s.io/client-go v0.24.4
25-
k8s.io/klog/v2 v2.70.1
26-
k8s.io/sample-controller v0.24.4
27-
k8s.io/utils v0.0.0-20220812165043-ad590609e2e5
21+
k8s.io/api v0.25.2
22+
k8s.io/apimachinery v0.25.2
23+
k8s.io/autoscaler/vertical-pod-autoscaler v0.12.0
24+
k8s.io/client-go v0.25.2
25+
k8s.io/klog/v2 v2.80.1
26+
k8s.io/sample-controller v0.25.2
27+
k8s.io/utils v0.0.0-20220922133306-665eaaec4324
2828
)
2929

3030
require (
31-
cloud.google.com/go v0.81.0 // indirect
31+
cloud.google.com/go v0.97.0 // indirect
3232
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
33-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
34-
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
33+
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
34+
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
3535
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
3636
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3737
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
@@ -42,23 +42,22 @@ require (
4242
github.com/beorn7/perks v1.0.1 // indirect
4343
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4444
github.com/davecgh/go-spew v1.1.1 // indirect
45-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
45+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
4646
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4747
github.com/fatih/color v1.13.0 // indirect
48-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
49-
github.com/fsnotify/fsnotify v1.5.1 // indirect
5048
github.com/ghodss/yaml v1.0.0 // indirect
5149
github.com/go-kit/log v0.2.1 // indirect
5250
github.com/go-logfmt/logfmt v0.5.1 // indirect
53-
github.com/go-logr/logr v1.2.0 // indirect
51+
github.com/go-logr/logr v1.2.3 // indirect
5452
github.com/go-openapi/jsonpointer v0.19.5 // indirect
5553
github.com/go-openapi/jsonreference v0.19.5 // indirect
5654
github.com/go-openapi/swag v0.19.14 // indirect
5755
github.com/gogo/protobuf v1.3.2 // indirect
56+
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
5857
github.com/golang/protobuf v1.5.2 // indirect
5958
github.com/google/gnostic v0.5.7-v3refs // indirect
6059
github.com/google/gofuzz v1.1.0 // indirect
61-
github.com/imdario/mergo v0.3.5 // indirect
60+
github.com/imdario/mergo v0.3.6 // indirect
6261
github.com/josharian/intern v1.0.0 // indirect
6362
github.com/jpillora/backoff v1.0.0 // indirect
6463
github.com/json-iterator/go v1.1.12 // indirect
@@ -70,15 +69,13 @@ require (
7069
github.com/modern-go/reflect2 v1.0.2 // indirect
7170
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7271
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
73-
github.com/onsi/ginkgo v1.16.5 // indirect
74-
github.com/onsi/gomega v1.17.0 // indirect
7572
github.com/pkg/errors v0.9.1 // indirect
7673
github.com/pmezard/go-difflib v1.0.0 // indirect
7774
github.com/prometheus/procfs v0.8.0 // indirect
7875
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
79-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
76+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
8077
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
81-
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c // indirect
78+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
8279
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
8380
golang.org/x/text v0.3.7 // indirect
8481
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
@@ -87,9 +84,9 @@ require (
8784
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
8885
gopkg.in/inf.v0 v0.9.1 // indirect
8986
gopkg.in/yaml.v2 v2.4.0 // indirect
90-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
91-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
92-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
87+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
88+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
89+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9390
sigs.k8s.io/yaml v1.3.0 // indirect
9491
)
9592

0 commit comments

Comments
 (0)