Skip to content

Commit b03ac67

Browse files
authored
Merge pull request #1584 from mythi/PR-2023-052
go.mod: upgrade to k8s.io v1.29
2 parents 3739fcb + 1e92918 commit b03ac67

File tree

5 files changed

+156
-502
lines changed

5 files changed

+156
-502
lines changed

.github/workflows/lib-build.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ jobs:
4747
steps:
4848
- uses: actions/checkout@v4
4949
- uses: actions/setup-go@v4
50+
with:
51+
go-version-file: go.mod
52+
check-latest: true
5053
- run: make -e vendor
5154
- name: Build image
5255
env:

.github/workflows/lib-publish.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@v4
4646
- uses: actions/setup-go@v4
47+
with:
48+
go-version-file: go.mod
49+
check-latest: true
4750
- run: make -e vendor
4851
- name: Build image
4952
env:

.github/workflows/lib-validate.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ jobs:
7676
steps:
7777
- uses: actions/checkout@v4
7878
- uses: actions/setup-go@v4
79+
with:
80+
go-version-file: go.mod
81+
check-latest: true
7982
- name: Install envtest and k8s control plane
8083
run: |
8184
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

go.mod

Lines changed: 63 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/intel/intel-device-plugins-for-kubernetes
22

3-
go 1.21
3+
go 1.21.3
44

55
require (
66
github.com/fsnotify/fsnotify v1.7.0
@@ -17,15 +17,15 @@ require (
1717
golang.org/x/text v0.14.0
1818
google.golang.org/grpc v1.59.0
1919
gopkg.in/yaml.v2 v2.4.0
20-
k8s.io/api v0.28.3
21-
k8s.io/apimachinery v0.28.3
22-
k8s.io/client-go v0.28.3
23-
k8s.io/component-base v0.28.3
24-
k8s.io/klog/v2 v2.100.1
25-
k8s.io/kubelet v1.28.2
26-
k8s.io/kubernetes v1.28.2
20+
k8s.io/api v0.29.0-rc.1
21+
k8s.io/apimachinery v0.29.0-rc.1
22+
k8s.io/client-go v0.29.0-rc.1
23+
k8s.io/component-base v0.29.0-rc.1
24+
k8s.io/klog/v2 v2.110.1
25+
k8s.io/kubelet v0.29.0-rc.1
26+
k8s.io/kubernetes v1.29.0-rc.1
2727
k8s.io/pod-security-admission v0.0.0
28-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
28+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2929
sigs.k8s.io/controller-runtime v0.16.3
3030
sigs.k8s.io/yaml v1.4.0
3131
)
@@ -42,7 +42,7 @@ require (
4242
github.com/coreos/go-semver v0.3.1 // indirect
4343
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4444
github.com/davecgh/go-spew v1.1.1 // indirect
45-
github.com/docker/distribution v2.8.2+incompatible // indirect
45+
github.com/distribution/reference v0.5.0 // indirect
4646
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4747
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4848
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
@@ -55,13 +55,14 @@ require (
5555
github.com/gogo/protobuf v1.3.2 // indirect
5656
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5757
github.com/golang/protobuf v1.5.3 // indirect
58-
github.com/google/cel-go v0.16.1 // indirect
58+
github.com/google/cel-go v0.17.7 // indirect
5959
github.com/google/gnostic-models v0.6.8 // indirect
6060
github.com/google/gofuzz v1.2.0 // indirect
6161
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
6262
github.com/google/uuid v1.3.1 // indirect
63+
github.com/gorilla/websocket v1.5.0 // indirect
6364
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
64-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
65+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
6566
github.com/imdario/mergo v0.3.12 // indirect
6667
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6768
github.com/josharian/intern v1.0.0 // indirect
@@ -72,25 +73,25 @@ require (
7273
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7374
github.com/modern-go/reflect2 v1.0.2 // indirect
7475
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
76+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7577
github.com/opencontainers/go-digest v1.0.0 // indirect
7678
github.com/prometheus/client_golang v1.17.0 // indirect
7779
github.com/prometheus/procfs v0.11.1 // indirect
7880
github.com/spf13/cobra v1.7.0 // indirect
7981
github.com/spf13/pflag v1.0.5 // indirect
8082
github.com/stoewer/go-strcase v1.2.0 // indirect
81-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
82-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
83-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
84-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
85-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
86-
go.opentelemetry.io/otel v1.10.0 // indirect
87-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
88-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
89-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
90-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
91-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
92-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
93-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
83+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
84+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
85+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
86+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
87+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
88+
go.opentelemetry.io/otel v1.19.0 // indirect
89+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
90+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
91+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
92+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
93+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
94+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
9495
go.uber.org/multierr v1.11.0 // indirect
9596
go.uber.org/zap v1.25.0 // indirect
9697
golang.org/x/crypto v0.14.0 // indirect
@@ -112,47 +113,47 @@ require (
112113
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
113114
gopkg.in/yaml.v3 v3.0.1 // indirect
114115
k8s.io/apiextensions-apiserver v0.28.3 // indirect
115-
k8s.io/apiserver v0.28.3 // indirect
116+
k8s.io/apiserver v0.29.0-rc.1 // indirect
116117
k8s.io/cloud-provider v0.0.0 // indirect
117-
k8s.io/component-helpers v0.28.2 // indirect
118-
k8s.io/controller-manager v0.28.2 // indirect
119-
k8s.io/kms v0.28.3 // indirect
120-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
118+
k8s.io/component-helpers v0.29.0-rc.1 // indirect
119+
k8s.io/controller-manager v0.29.0-rc.1 // indirect
120+
k8s.io/kms v0.29.0-rc.1 // indirect
121+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
121122
k8s.io/kubectl v0.0.0 // indirect
122-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
123+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
123124
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
124-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
125+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
125126
)
126127

127128
replace (
128-
k8s.io/api => k8s.io/api v0.28.2
129-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.2
130-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.2
131-
k8s.io/apiserver => k8s.io/apiserver v0.28.2
132-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.2
133-
k8s.io/client-go => k8s.io/client-go v0.28.2
134-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.2
135-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.2
136-
k8s.io/code-generator => k8s.io/code-generator v0.28.2
137-
k8s.io/component-base => k8s.io/component-base v0.28.2
138-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.2
139-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.2
140-
k8s.io/cri-api => k8s.io/cri-api v0.28.2
141-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.2
142-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.2
143-
k8s.io/endpointslice => k8s.io/endpointslice v0.28.2
144-
k8s.io/kms => k8s.io/kms v0.28.2
145-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.2
146-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.2
147-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.2
148-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.2
149-
k8s.io/kubectl => k8s.io/kubectl v0.28.2
150-
k8s.io/kubelet => k8s.io/kubelet v0.28.2
151-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.2
152-
k8s.io/metrics => k8s.io/metrics v0.28.2
153-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.2
154-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.2
155-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.2
156-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.2
157-
k8s.io/sample-controller => k8s.io/sample-controller v0.28.2
129+
k8s.io/api => k8s.io/api v0.29.0-rc.1
130+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0-rc.1
131+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.0-rc.1
132+
k8s.io/apiserver => k8s.io/apiserver v0.29.0-rc.1
133+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0-rc.1
134+
k8s.io/client-go => k8s.io/client-go v0.29.0-rc.1
135+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0-rc.1
136+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0-rc.1
137+
k8s.io/code-generator => k8s.io/code-generator v0.29.0-rc.1
138+
k8s.io/component-base => k8s.io/component-base v0.29.0-rc.1
139+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.0-rc.1
140+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.0-rc.1
141+
k8s.io/cri-api => k8s.io/cri-api v0.29.0-rc.1
142+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0-rc.1
143+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0-rc.1
144+
k8s.io/endpointslice => k8s.io/endpointslice v0.29.0-rc.1
145+
k8s.io/kms => k8s.io/kms v0.29.0-rc.1
146+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0-rc.1
147+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0-rc.1
148+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0-rc.1
149+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0-rc.1
150+
k8s.io/kubectl => k8s.io/kubectl v0.29.0-rc.1
151+
k8s.io/kubelet => k8s.io/kubelet v0.29.0-rc.1
152+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0-rc.1
153+
k8s.io/metrics => k8s.io/metrics v0.29.0-rc.1
154+
k8s.io/mount-utils => k8s.io/mount-utils v0.30.0-alpha.0
155+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0-rc.1
156+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0-rc.1
157+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.0-rc.1
158+
k8s.io/sample-controller => k8s.io/sample-controller v0.29.0-rc.1
158159
)

0 commit comments

Comments
 (0)