Skip to content

Commit e366787

Browse files
klueskaklueska
committed
Update go dependencies to current snapshot of k/k/* release-1.31
Signed-off-by: Kevin Klues <[email protected]>
1 parent e56da36 commit e366787

File tree

11 files changed

+142
-131
lines changed

11 files changed

+142
-131
lines changed

‎cmd/dra-example-controller/claimparametersgen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
"strings"
2424

25-
resourceapi "k8s.io/api/resource/v1alpha2"
25+
resourceapi "k8s.io/api/resource/v1alpha3"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2828
"k8s.io/apimachinery/pkg/runtime"

‎cmd/dra-example-kubeletplugin/driver.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"context"
2121
"fmt"
2222

23-
resourceapi "k8s.io/api/resource/v1alpha2"
23+
resourceapi "k8s.io/api/resource/v1alpha3"
2424
"k8s.io/klog/v2"
25-
drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1alpha3"
25+
drapbv1 "k8s.io/kubelet/pkg/apis/dra/v1alpha4"
2626
)
2727

2828
var _ drapbv1.NodeServer = &driver{}

‎cmd/dra-example-kubeletplugin/state.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222
"sync"
2323

24-
resourceapi "k8s.io/api/resource/v1alpha2"
24+
resourceapi "k8s.io/api/resource/v1alpha3"
2525
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
2626

2727
gpucrd "sigs.k8s.io/dra-example-driver/api/example.com/resource/gpu/v1alpha1"

‎demo/gpu-test1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: gpu-test1
99

1010
---
11-
apiVersion: resource.k8s.io/v1alpha2
11+
apiVersion: resource.k8s.io/v1alpha3
1212
kind: ResourceClaimTemplate
1313
metadata:
1414
namespace: gpu-test1

‎demo/gpu-test2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: gpu-test2
99

1010
---
11-
apiVersion: resource.k8s.io/v1alpha2
11+
apiVersion: resource.k8s.io/v1alpha3
1212
kind: ResourceClaimTemplate
1313
metadata:
1414
namespace: gpu-test2

‎demo/gpu-test3.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
name: gpu-test3
99

1010
---
11-
apiVersion: resource.k8s.io/v1alpha2
11+
apiVersion: resource.k8s.io/v1alpha3
1212
kind: ResourceClaim
1313
metadata:
1414
namespace: gpu-test3

‎demo/gpu-test4.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
count: 4
1818

1919
---
20-
apiVersion: resource.k8s.io/v1alpha2
20+
apiVersion: resource.k8s.io/v1alpha3
2121
kind: ResourceClaimTemplate
2222
metadata:
2323
namespace: gpu-test4

‎demo/scripts/kind-cluster-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ nodes:
1515
kind: ClusterConfiguration
1616
apiServer:
1717
extraArgs:
18-
runtime-config: "resource.k8s.io/v1alpha2=true"
18+
runtime-config: "resource.k8s.io/v1alpha3=true"
1919
scheduler:
2020
extraArgs:
2121
v: "1"

‎deployments/helm/dra-example-driver/templates/resourceclass.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: resource.k8s.io/v1alpha2
2+
apiVersion: resource.k8s.io/v1alpha3
33
kind: ResourceClass
44
metadata:
55
name: gpu.example.com

‎go.mod

Lines changed: 44 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,47 @@ module sigs.k8s.io/dra-example-driver
22

33
go 1.22.2
44

5+
replace (
6+
k8s.io/api => github.com/kubernetes/kubernetes/staging/src/k8s.io/api v0.0.0-20240806105757-3ea02487b04a
7+
k8s.io/apimachinery => github.com/kubernetes/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240806105757-3ea02487b04a
8+
k8s.io/client-go => github.com/kubernetes/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240806105757-3ea02487b04a
9+
k8s.io/component-base => github.com/kubernetes/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240806105757-3ea02487b04a
10+
k8s.io/dynamic-resource-allocation => github.com/kubernetes/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240806105757-3ea02487b04a
11+
k8s.io/kubelet => github.com/kubernetes/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240806105757-3ea02487b04a
12+
k8s.io/kubernetes => github.com/kubernetes/kubernetes v1.32.0-alpha.0.0.20240806105757-3ea02487b04a
13+
)
14+
515
require (
616
github.com/container-orchestrated-devices/container-device-interface v0.5.4
7-
github.com/google/uuid v1.3.0
8-
github.com/prometheus/client_golang v1.16.0
17+
github.com/google/uuid v1.6.0
18+
github.com/prometheus/client_golang v1.19.1
919
github.com/spf13/pflag v1.0.5
1020
github.com/urfave/cli/v2 v2.25.3
11-
k8s.io/api v0.30.2
12-
k8s.io/apimachinery v0.30.2
13-
k8s.io/client-go v0.30.2
14-
k8s.io/component-base v0.30.2
15-
k8s.io/dynamic-resource-allocation v0.30.2
16-
k8s.io/klog/v2 v2.120.1
17-
k8s.io/kubelet v0.30.2
18-
k8s.io/kubernetes v1.30.2
19-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
21+
k8s.io/api v0.0.0
22+
k8s.io/apimachinery v0.0.0
23+
k8s.io/client-go v0.0.0
24+
k8s.io/component-base v0.0.0
25+
k8s.io/dynamic-resource-allocation v0.0.0
26+
k8s.io/klog/v2 v2.130.1
27+
k8s.io/kubelet v0.0.0
28+
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
29+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2030
)
2131

2232
require (
2333
github.com/beorn7/perks v1.0.1 // indirect
2434
github.com/blang/semver/v4 v4.0.0 // indirect
25-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
26-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
27-
github.com/davecgh/go-spew v1.1.1 // indirect
35+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
36+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
37+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2838
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
29-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3039
github.com/fsnotify/fsnotify v1.7.0 // indirect
31-
github.com/go-logr/logr v1.4.1 // indirect
40+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
41+
github.com/go-logr/logr v1.4.2 // indirect
3242
github.com/go-logr/zapr v1.3.0 // indirect
3343
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3444
github.com/go-openapi/jsonreference v0.20.2 // indirect
35-
github.com/go-openapi/swag v0.22.3 // indirect
45+
github.com/go-openapi/swag v0.22.4 // indirect
3646
github.com/gogo/protobuf v1.3.2 // indirect
3747
github.com/golang/protobuf v1.5.4 // indirect
3848
github.com/google/gnostic-models v0.6.8 // indirect
@@ -43,39 +53,39 @@ require (
4353
github.com/josharian/intern v1.0.0 // indirect
4454
github.com/json-iterator/go v1.1.12 // indirect
4555
github.com/mailru/easyjson v0.7.7 // indirect
46-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4756
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4857
github.com/modern-go/reflect2 v1.0.2 // indirect
4958
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
50-
github.com/opencontainers/runc v1.1.12 // indirect
59+
github.com/opencontainers/runc v1.1.13 // indirect
5160
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
5261
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
5362
github.com/pkg/errors v0.9.1 // indirect
54-
github.com/prometheus/client_model v0.4.0 // indirect
55-
github.com/prometheus/common v0.44.0 // indirect
56-
github.com/prometheus/procfs v0.10.1 // indirect
63+
github.com/prometheus/client_model v0.6.1 // indirect
64+
github.com/prometheus/common v0.55.0 // indirect
65+
github.com/prometheus/procfs v0.15.1 // indirect
5766
github.com/russross/blackfriday/v2 v2.1.0 // indirect
58-
github.com/spf13/cobra v1.7.0 // indirect
67+
github.com/spf13/cobra v1.8.1 // indirect
5968
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
69+
github.com/x448/float16 v0.8.4 // indirect
6070
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
6171
go.uber.org/multierr v1.11.0 // indirect
6272
go.uber.org/zap v1.26.0 // indirect
63-
golang.org/x/mod v0.15.0 // indirect
64-
golang.org/x/net v0.23.0 // indirect
65-
golang.org/x/oauth2 v0.10.0 // indirect
66-
golang.org/x/sys v0.18.0 // indirect
67-
golang.org/x/term v0.18.0 // indirect
68-
golang.org/x/text v0.14.0 // indirect
73+
golang.org/x/mod v0.17.0 // indirect
74+
golang.org/x/net v0.26.0 // indirect
75+
golang.org/x/oauth2 v0.21.0 // indirect
76+
golang.org/x/sys v0.21.0 // indirect
77+
golang.org/x/term v0.21.0 // indirect
78+
golang.org/x/text v0.16.0 // indirect
6979
golang.org/x/time v0.3.0 // indirect
70-
google.golang.org/appengine v1.6.7 // indirect
71-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
72-
google.golang.org/grpc v1.58.3 // indirect
73-
google.golang.org/protobuf v1.33.0 // indirect
80+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
81+
google.golang.org/grpc v1.65.0 // indirect
82+
google.golang.org/protobuf v1.34.2 // indirect
83+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7484
gopkg.in/inf.v0 v0.9.1 // indirect
7585
gopkg.in/yaml.v2 v2.4.0 // indirect
7686
gopkg.in/yaml.v3 v3.0.1 // indirect
7787
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
7888
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7989
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
80-
sigs.k8s.io/yaml v1.3.0 // indirect
90+
sigs.k8s.io/yaml v1.4.0 // indirect
8191
)

0 commit comments

Comments
 (0)