Skip to content

Commit 13170a3

Browse files
authored
[release-1.27] update k8s.io/kubernetes to v1.27.8 in go.mod (kubernetes#2497)
* [occm] update k8s.io/kubernetes to v1.27.8 in go.mod * Fix "go list -m all" execution
1 parent 45acca7 commit 13170a3

File tree

4 files changed

+97
-74
lines changed

4 files changed

+97
-74
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
## BUILD ARGS ##
1515
################################################################################
1616
# This build arg allows the specification of a custom Golang image.
17-
ARG GOLANG_IMAGE=golang:1.20.3
17+
ARG GOLANG_IMAGE=golang:1.20.12
1818

1919
# The distroless image on which the CPI manager image is built.
2020
#
2121
# Please do not use "latest". Explicit tags should be used to provide
2222
# deterministic builds. Follow what kubernetes uses to build
2323
# kube-controller-manager, for example for 1.27.x:
2424
# https://github.com/kubernetes/kubernetes/blob/release-1.27/build/common.sh#L99
25-
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.20.3-bullseye.0
25+
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.20.12-bullseye.0
2626

2727
# We use Alpine as the source for default CA certificates and some output
2828
# images

go.mod

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ require (
1212
github.com/kubernetes-csi/csi-test/v5 v5.0.0
1313
github.com/mitchellh/go-homedir v1.1.0
1414
github.com/mitchellh/mapstructure v1.5.0
15-
github.com/onsi/ginkgo/v2 v2.9.2
16-
github.com/onsi/gomega v1.27.6
15+
github.com/onsi/ginkgo/v2 v2.9.7
16+
github.com/onsi/gomega v1.27.8
1717
github.com/pborman/uuid v1.2.1
1818
github.com/sirupsen/logrus v1.9.0
1919
github.com/spf13/cobra v1.7.0
@@ -23,25 +23,39 @@ require (
2323
golang.org/x/net v0.17.0
2424
golang.org/x/sys v0.13.0
2525
golang.org/x/term v0.13.0
26-
google.golang.org/grpc v1.54.0
27-
google.golang.org/protobuf v1.30.0
26+
google.golang.org/grpc v1.56.3
27+
google.golang.org/protobuf v1.31.0
2828
gopkg.in/gcfg.v1 v1.2.3
2929
gopkg.in/godo.v2 v2.0.9
3030
gopkg.in/yaml.v2 v2.4.0
31-
k8s.io/api v0.27.6
32-
k8s.io/apimachinery v0.27.6
33-
k8s.io/apiserver v0.27.6
34-
k8s.io/client-go v0.27.6
35-
k8s.io/cloud-provider v0.27.6
36-
k8s.io/component-base v0.27.6
31+
k8s.io/api v0.27.8
32+
k8s.io/apimachinery v0.27.8
33+
k8s.io/apiserver v0.27.8
34+
k8s.io/client-go v0.27.8
35+
k8s.io/cloud-provider v0.27.8
36+
k8s.io/component-base v0.27.8
3737
k8s.io/klog/v2 v2.90.1
38-
k8s.io/kms v0.27.6
39-
k8s.io/kubernetes v1.27.6
40-
k8s.io/mount-utils v0.27.6
38+
k8s.io/kms v0.27.8
39+
k8s.io/kubernetes v1.27.8
40+
k8s.io/mount-utils v0.27.8
4141
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
4242
software.sslmate.com/src/go-pkcs12 v0.2.0
4343
)
4444

45+
// the below fixes the "go list -m all" execution
46+
replace (
47+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.8
48+
k8s.io/cri-api => k8s.io/cri-api v0.27.8
49+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.8
50+
k8s.io/endpointslice => k8s.io/endpointslice v0.27.8
51+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.8
52+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.8
53+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.8
54+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.8
55+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.8
56+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.8
57+
)
58+
4559
require (
4660
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4761
github.com/MichaelTJones/walk v0.0.0-20161122175330-4748e29d5718 // indirect
@@ -126,25 +140,27 @@ require (
126140
golang.org/x/crypto v0.14.0 // indirect
127141
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
128142
golang.org/x/oauth2 v0.7.0 // indirect
129-
golang.org/x/sync v0.1.0 // indirect
143+
golang.org/x/sync v0.3.0 // indirect
130144
golang.org/x/text v0.13.0 // indirect
131145
golang.org/x/time v0.3.0 // indirect
132-
golang.org/x/tools v0.7.0 // indirect
146+
golang.org/x/tools v0.12.0 // indirect
133147
google.golang.org/appengine v1.6.7 // indirect
134-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
148+
google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect
149+
google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
150+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
135151
gopkg.in/inf.v0 v0.9.1 // indirect
136152
gopkg.in/ini.v1 v1.67.0 // indirect
137153
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
138154
gopkg.in/warnings.v0 v0.1.2 // indirect
139155
gopkg.in/yaml.v3 v3.0.1 // indirect
140-
k8s.io/apiextensions-apiserver v0.27.6 // indirect
141-
k8s.io/component-helpers v0.27.6 // indirect
142-
k8s.io/controller-manager v0.27.6 // indirect
143-
k8s.io/csi-translation-lib v0.27.6 // indirect
156+
k8s.io/apiextensions-apiserver v0.27.8 // indirect
157+
k8s.io/component-helpers v0.27.8 // indirect
158+
k8s.io/controller-manager v0.27.8 // indirect
159+
k8s.io/csi-translation-lib v0.27.8 // indirect
144160
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
145-
k8s.io/kubectl v0.27.6 // indirect
146-
k8s.io/kubelet v0.27.6 // indirect
147-
k8s.io/pod-security-admission v0.27.6 // indirect
161+
k8s.io/kubectl v0.27.8 // indirect
162+
k8s.io/kubelet v0.27.8 // indirect
163+
k8s.io/pod-security-admission v0.27.8 // indirect
148164
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
149165
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
150166
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)