Skip to content

Commit 2a74c6c

Browse files
kayruskayrus
authored
[occm] update k8s.io/kubernetes to v1.29.0-rc.2 in go.mod (kubernetes#2486)
* [occm] update k8s.io/kubernetes to v1.29.0-rc.2 in go.mod * Fix "go list -m all" execution * Add dmesg to collect system logs * Bump Ubuntu to 22.04 LTS
1 parent 8a156e5 commit 2a74c6c

File tree

10 files changed

+205
-164
lines changed

10 files changed

+205
-164
lines changed

‎Dockerfile‎

Lines changed: 3 additions & 3 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.7
17+
ARG GOLANG_IMAGE=golang:1.21.5
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.7-bullseye.0
25+
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.5-bookworm.0
2626

2727
# We use Alpine as the source for default CA certificates and some output
2828
# images
@@ -111,7 +111,7 @@ CMD ["sh", "-c", "/bin/barbican-kms-plugin --socketpath ${socketpath} --cloud-co
111111
# all magic heppens in tools/csi-deps.sh
112112
FROM --platform=${TARGETPLATFORM} ${DEBIAN_IMAGE} as cinder-csi-plugin-utils
113113

114-
RUN clean-install bash rsync mount udev btrfs-progs e2fsprogs xfsprogs
114+
RUN clean-install bash rsync mount udev btrfs-progs e2fsprogs xfsprogs util-linux
115115
COPY tools/csi-deps.sh /tools/csi-deps.sh
116116
RUN /tools/csi-deps.sh
117117

‎go.mod‎

Lines changed: 58 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/cloud-provider-openstack
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/container-storage-interface/spec v1.8.0
@@ -13,35 +13,48 @@ require (
1313
github.com/mitchellh/go-homedir v1.1.0
1414
github.com/mitchellh/mapstructure v1.5.0
1515
github.com/onsi/ginkgo/v2 v2.13.0
16-
github.com/onsi/gomega v1.28.0
16+
github.com/onsi/gomega v1.29.0
1717
github.com/pborman/uuid v1.2.1
1818
github.com/sirupsen/logrus v1.9.0
1919
github.com/spf13/cobra v1.7.0
2020
github.com/spf13/pflag v1.0.5
2121
github.com/spf13/viper v1.15.0
22-
github.com/stretchr/testify v1.8.2
22+
github.com/stretchr/testify v1.8.4
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
26+
google.golang.org/grpc v1.58.3
2727
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.29.0-alpha.2
32-
k8s.io/apimachinery v0.29.0-alpha.2
33-
k8s.io/apiserver v0.29.0-alpha.2
34-
k8s.io/client-go v0.29.0-alpha.2
35-
k8s.io/cloud-provider v0.29.0-alpha.2
36-
k8s.io/component-base v0.29.0-alpha.2
37-
k8s.io/klog/v2 v2.100.1
38-
k8s.io/kms v0.29.0-alpha.2
39-
k8s.io/kubernetes v1.29.0-alpha.2
40-
k8s.io/mount-utils v0.29.0-alpha.2
31+
k8s.io/api v0.29.0-rc.2
32+
k8s.io/apimachinery v0.29.0-rc.2
33+
k8s.io/apiserver v0.29.0-rc.2
34+
k8s.io/client-go v0.29.0-rc.2
35+
k8s.io/cloud-provider v0.29.0-rc.2
36+
k8s.io/component-base v0.29.0-rc.2
37+
k8s.io/klog/v2 v2.110.1
38+
k8s.io/kms v0.29.0-rc.2
39+
k8s.io/kubernetes v1.29.0-rc.2
40+
k8s.io/mount-utils v0.29.0-rc.2
4141
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
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.29.0-rc.2
48+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0-rc.2
49+
k8s.io/endpointslice => k8s.io/endpointslice v0.29.0-rc.2
50+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0-rc.2
51+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0-rc.2
52+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0-rc.2
53+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0-rc.2
54+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0-rc.2
55+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0-rc.2
56+
)
57+
4558
require (
4659
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4760
github.com/MichaelTJones/walk v0.0.0-20161122175330-4748e29d5718 // indirect
@@ -59,8 +72,8 @@ require (
5972
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
6073
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
6174
github.com/felixge/httpsnoop v1.0.3 // indirect
62-
github.com/fsnotify/fsnotify v1.6.0 // indirect
63-
github.com/go-logr/logr v1.2.4 // indirect
75+
github.com/fsnotify/fsnotify v1.7.0 // indirect
76+
github.com/go-logr/logr v1.3.0 // indirect
6477
github.com/go-logr/stdr v1.2.2 // indirect
6578
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6679
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -69,15 +82,15 @@ require (
6982
github.com/gogo/protobuf v1.3.2 // indirect
7083
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7184
github.com/golang/protobuf v1.5.3 // indirect
72-
github.com/google/cel-go v0.17.6 // indirect
85+
github.com/google/cel-go v0.17.7 // indirect
7386
github.com/google/gnostic-models v0.6.8 // indirect
74-
github.com/google/go-cmp v0.5.9 // indirect
87+
github.com/google/go-cmp v0.6.0 // indirect
7588
github.com/google/gofuzz v1.2.0 // indirect
7689
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7790
github.com/google/uuid v1.3.0 // indirect
7891
github.com/gorilla/websocket v1.5.0 // indirect
7992
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
80-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
93+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
8194
github.com/hashicorp/hcl v1.0.0 // indirect
8295
github.com/imdario/mergo v0.3.15 // indirect
8396
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -93,6 +106,7 @@ require (
93106
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
94107
github.com/modern-go/reflect2 v1.0.2 // indirect
95108
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
109+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
96110
github.com/opencontainers/go-digest v1.0.0 // indirect
97111
github.com/opencontainers/selinux v1.11.0 // indirect
98112
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
@@ -108,48 +122,47 @@ require (
108122
github.com/stoewer/go-strcase v1.3.0 // indirect
109123
github.com/stretchr/objx v0.5.0 // indirect
110124
github.com/subosito/gotenv v1.4.2 // indirect
111-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
112-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
113-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
114-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
115-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
116-
go.opentelemetry.io/otel v1.14.0 // indirect
117-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
118-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
119-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
120-
go.opentelemetry.io/otel/metric v0.37.0 // indirect
121-
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
122-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
123-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
125+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
126+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
127+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
128+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
129+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
130+
go.opentelemetry.io/otel v1.19.0 // indirect
131+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
132+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
133+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
134+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
135+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
136+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
124137
go.uber.org/atomic v1.10.0 // indirect
125138
go.uber.org/multierr v1.11.0 // indirect
126139
go.uber.org/zap v1.24.0 // indirect
127140
golang.org/x/crypto v0.14.0 // indirect
128141
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
129-
golang.org/x/oauth2 v0.8.0 // indirect
142+
golang.org/x/oauth2 v0.10.0 // indirect
130143
golang.org/x/sync v0.3.0 // indirect
131144
golang.org/x/text v0.13.0 // indirect
132145
golang.org/x/time v0.3.0 // indirect
133146
golang.org/x/tools v0.12.0 // indirect
134147
google.golang.org/appengine v1.6.7 // indirect
135-
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
136-
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
148+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
149+
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
150+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
138151
gopkg.in/inf.v0 v0.9.1 // indirect
139152
gopkg.in/ini.v1 v1.67.0 // indirect
140153
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
141154
gopkg.in/warnings.v0 v0.1.2 // indirect
142155
gopkg.in/yaml.v3 v3.0.1 // indirect
143-
k8s.io/apiextensions-apiserver v0.29.0-alpha.2 // indirect
144-
k8s.io/component-helpers v0.29.0-alpha.2 // indirect
145-
k8s.io/controller-manager v0.29.0-alpha.2 // indirect
146-
k8s.io/csi-translation-lib v0.29.0-alpha.2 // indirect
147-
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect
148-
k8s.io/kubectl v0.29.0-alpha.2 // indirect
149-
k8s.io/kubelet v0.29.0-alpha.2 // indirect
150-
k8s.io/pod-security-admission v0.29.0-alpha.2 // indirect
156+
k8s.io/apiextensions-apiserver v0.29.0-rc.2 // indirect
157+
k8s.io/component-helpers v0.29.0-rc.2 // indirect
158+
k8s.io/controller-manager v0.29.0-rc.2 // indirect
159+
k8s.io/csi-translation-lib v0.29.0-rc.2 // indirect
160+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
161+
k8s.io/kubectl v0.29.0-rc.2 // indirect
162+
k8s.io/kubelet v0.29.0-rc.2 // indirect
163+
k8s.io/pod-security-admission v0.29.0-rc.2 // indirect
151164
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
152165
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
153-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
166+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
154167
sigs.k8s.io/yaml v1.3.0 // indirect
155168
)

0 commit comments

Comments
 (0)