Skip to content

Commit f433fdb

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #53 from klueska/update-v1.31
Update to kubernetes v1.31.0
2 parents 2b2fddc + f787409 commit f433fdb

File tree

4 files changed

+23
-39
lines changed

4 files changed

+23
-39
lines changed

‎README.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,9 @@ From here we will build the image for the example resource driver:
4545

4646
And create a `kind` cluster to run it in:
4747
```bash
48-
KUBE_GIT_VERSION=v1.30.0 BUILD_KIND_IMAGE=true KIND_K8S_TAG=v1.31.0-rc.1 ./demo/create-cluster.sh
48+
./demo/create-cluster.sh
4949
```
5050

51-
**Note**: The environment variables in the command above allow us to build a
52-
local node image against Kubernetes v1.31.0-rc.1. Once `kind` releases a node
53-
image for v1.31 these extra environment variables will no longer be needed. If
54-
you only plan on running tests for Kubernetes 1.30 then you can just use the
55-
latest `kind` image for v1.30 and omit these extra environment variables.
56-
5751
Once the cluster has been created successfully, double check everything is
5852
coming up as expected:
5953
```console

‎demo/scripts/common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ SCRIPTS_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
3636

3737
# The kubernetes tag to build the kind cluster from
3838
# From ${KIND_K8S_REPO}/tags
39-
: ${KIND_K8S_TAG:="v1.30.2"}
39+
: ${KIND_K8S_TAG:="v1.31.0"}
4040

4141
# At present, kind has a new enough node image that we don't need to build our
4242
# own. This won't always be true and we may need to set the variable below to

‎go.mod

+7-17
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,18 @@ 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-
155
require (
166
github.com/google/uuid v1.6.0
177
github.com/spf13/pflag v1.0.5
188
github.com/urfave/cli/v2 v2.25.3
19-
k8s.io/api v0.0.0
20-
k8s.io/apimachinery v0.0.0
21-
k8s.io/client-go v0.0.0
22-
k8s.io/component-base v0.0.0
23-
k8s.io/dynamic-resource-allocation v0.0.0
9+
k8s.io/api v0.31.0
10+
k8s.io/apimachinery v0.31.0
11+
k8s.io/client-go v0.31.0
12+
k8s.io/component-base v0.31.0
13+
k8s.io/dynamic-resource-allocation v0.31.0
2414
k8s.io/klog/v2 v2.130.1
25-
k8s.io/kubelet v0.0.0
26-
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
15+
k8s.io/kubelet v0.31.0
16+
k8s.io/kubernetes v1.31.0
2717
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2818
tags.cncf.io/container-device-interface v0.8.0
2919
tags.cncf.io/container-device-interface/specs-go v0.8.0

‎go.sum

+14-14
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,6 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
7070
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
7171
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
7272
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
73-
github.com/kubernetes/kubernetes v1.32.0-alpha.0.0.20240806105757-3ea02487b04a h1:H5VRsVFWQThCWfEpWcUI6ENsWCx3WpczU7hpneAxpqM=
74-
github.com/kubernetes/kubernetes v1.32.0-alpha.0.0.20240806105757-3ea02487b04a/go.mod h1:UTpGn7nxrUrPWw5hNIYTAjodcWIvLakgHpLtfrr6GC8=
75-
github.com/kubernetes/kubernetes/staging/src/k8s.io/api v0.0.0-20240806105757-3ea02487b04a h1:/pe+kJMEHpHYTX4WH7vEgvyxRe/jYjKxWj9BAQXMq4E=
76-
github.com/kubernetes/kubernetes/staging/src/k8s.io/api v0.0.0-20240806105757-3ea02487b04a/go.mod h1:KaRi43US9TCyITVXRX8uu9F8GDZSFJYuOtgC4rjoR7g=
77-
github.com/kubernetes/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240806105757-3ea02487b04a h1:GToRDpVp13ncbSGOcflNduNFR4oyDyDQvsGytLxxD1k=
78-
github.com/kubernetes/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240806105757-3ea02487b04a/go.mod h1:5F0wbie5xX1jDEg5sk5dr+KF8rwFkYtZFHDhSF/UsG4=
79-
github.com/kubernetes/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240806105757-3ea02487b04a h1:IYT9EwdkavZN/pacDoEt9KXWaADN+HPWb8sZ9Z7orsw=
80-
github.com/kubernetes/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240806105757-3ea02487b04a/go.mod h1:acnXvvIK5YiMMAflXv5ug7ClSCjxYChU5y63sTDuv3I=
81-
github.com/kubernetes/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240806105757-3ea02487b04a h1:UTsKED4LBblpykV8dM3rpHTS/e8eXG22arBOi7Y+mjQ=
82-
github.com/kubernetes/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240806105757-3ea02487b04a/go.mod h1:PFOdhUAVD6O6z1yuKxWS3EKXSKdZhKjOlCrcuJRxOBA=
83-
github.com/kubernetes/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240806105757-3ea02487b04a h1:lKZZF8CXKDaXekCMy8J5HNYL7/sHpbeutFz/p2tcR/Y=
84-
github.com/kubernetes/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240806105757-3ea02487b04a/go.mod h1:iyXR8oPR54q4bj4LWeUHHrULA/Nm0LjfiR3JHe08sak=
85-
github.com/kubernetes/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240806105757-3ea02487b04a h1:UskQE7Z36WU2YJD5Q769Ol8d9EeqCu0fCtx3JQSxd5o=
86-
github.com/kubernetes/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240806105757-3ea02487b04a/go.mod h1:PeBIZnl5Zg5qaT6JFfsDBaw0IlAL4F3mEVy9VovTW6k=
8773
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
8874
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
8975
github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=
@@ -224,10 +210,24 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
224210
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
225211
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
226212
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
213+
k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo=
214+
k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE=
215+
k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc=
216+
k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
217+
k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8=
218+
k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU=
219+
k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs=
220+
k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo=
221+
k8s.io/dynamic-resource-allocation v0.31.0 h1:zUzbI2d1uUZNleW77L5KQlPWVqHmX6hBsoJvx8AIHUg=
222+
k8s.io/dynamic-resource-allocation v0.31.0/go.mod h1:eDK+MyEeE2m6vihsw7S75lPYr1NkDV3NP6ixm7WvO/0=
227223
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
228224
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
229225
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
230226
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
227+
k8s.io/kubelet v0.31.0 h1:IlfkBy7QTojGEm97GuVGhtli0HL/Pgu4AdayiF76yWo=
228+
k8s.io/kubelet v0.31.0/go.mod h1:s+OnqnfdIh14PFpUb7NgzM53WSYXcczA3w/1qSzsRc8=
229+
k8s.io/kubernetes v1.31.0 h1:sYAB12TTWexXKp4RxqJMm/7EC+P0mNOgn4Xdj5eu7HM=
230+
k8s.io/kubernetes v1.31.0/go.mod h1:UTpGn7nxrUrPWw5hNIYTAjodcWIvLakgHpLtfrr6GC8=
231231
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
232232
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
233233
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

0 commit comments

Comments
 (0)