Merge pull request #1200 from wzshiming/bump/k8s

Bump k8s to 1.31

.dependencies.yaml

@@ -41,7 +41,7 @@ dependencies:
     match: "KindVersion"
 
 - name: "kubernetes"
-  version: 1.30.2
+  version: 1.31.0
   refPaths:
   - path: supported_releases.txt
     match: ""

charts/kwok/templates/role.yaml

@@ -30,6 +30,7 @@ rules:
   - ""
   resources:
   - nodes/status
+  - pods/status
   verbs:
   - patch
   - update
@@ -44,13 +45,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - pods/status
-  verbs:
-  - patch
-  - update
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -66,214 +60,16 @@ rules:
   - kwok.x-k8s.io
   resources:
   - attaches
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - attaches/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - clusterattaches
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - clusterattaches/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - clusterexecs
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - clusterexecs/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - clusterlogs
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - clusterlogs/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - clusterportforwards
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - clusterportforwards/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - clusterresourceusages
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - clusterresourceusages/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - execs
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - execs/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - logs
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - logs/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - metrics
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - metrics/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - portforwards
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - portforwards/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - resourceusages
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
-  - resourceusages/status
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - kwok.x-k8s.io
-  resources:
   - stages
   verbs:
   - create
@@ -286,6 +82,17 @@ rules:
 - apiGroups:
   - kwok.x-k8s.io
   resources:
+  - attaches/status
+  - clusterattaches/status
+  - clusterexecs/status
+  - clusterlogs/status
+  - clusterportforwards/status
+  - clusterresourceusages/status
+  - execs/status
+  - logs/status
+  - metrics/status
+  - portforwards/status
+  - resourceusages/status
   - stages/status
   verbs:
   - patch

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/emicklei/go-restful/v3 v3.12.1
 	github.com/evanphx/json-patch/v5 v5.9.0
 	github.com/fsnotify/fsnotify v1.7.0
-	github.com/google/cel-go v0.17.8
+	github.com/google/cel-go v0.20.1
 	github.com/google/go-cmp v0.6.0
 	github.com/google/go-containerregistry v0.19.2
 	github.com/itchyny/gojq v0.12.16
@@ -22,24 +22,24 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/wzshiming/cmux v0.3.3
 	github.com/wzshiming/ctc v1.2.3
-	github.com/wzshiming/easycel v0.5.0
+	github.com/wzshiming/easycel v0.6.0
 	github.com/wzshiming/getch v0.0.0-20201023133301-8e758c21cf27
 	github.com/wzshiming/httpseek v0.1.0
 	go.etcd.io/etcd/client/v3 v3.5.14
-	golang.org/x/sync v0.7.0
+	golang.org/x/sync v0.8.0
 	golang.org/x/sys v0.24.0
 	golang.org/x/term v0.23.0
-	k8s.io/api v0.30.2
-	k8s.io/apimachinery v0.30.2
-	k8s.io/apiserver v0.30.2
-	k8s.io/client-go v0.30.2
-	k8s.io/code-generator v0.30.2
-	k8s.io/cri-api v0.30.2
+	k8s.io/api v0.31.0
+	k8s.io/apimachinery v0.31.0
+	k8s.io/apiserver v0.31.0
+	k8s.io/client-go v0.31.0
+	k8s.io/code-generator v0.31.0
+	k8s.io/cri-api v0.31.0
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
-	k8s.io/kubelet v0.30.2
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
-	sigs.k8s.io/controller-runtime v0.18.4
-	sigs.k8s.io/controller-tools v0.15.0
+	k8s.io/kubelet v0.31.0
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
+	sigs.k8s.io/controller-runtime v0.19.0
+	sigs.k8s.io/controller-tools v0.16.1
 	sigs.k8s.io/e2e-framework v0.4.0
 	sigs.k8s.io/kustomize/api v0.17.2
 	sigs.k8s.io/kustomize/kustomize/v5 v5.4.2
@@ -50,7 +50,7 @@ require (
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.2.1 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 // indirect
+	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
@@ -62,8 +62,8 @@ require (
 	github.com/docker/cli v27.0.3+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.2 // indirect
-	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/fatih/color v1.16.0 // indirect
+	github.com/fatih/color v1.17.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -111,31 +111,32 @@ require (
 	github.com/vladimirvivien/gexe v0.3.0 // indirect
 	github.com/wzshiming/trie v0.1.1 // indirect
 	github.com/wzshiming/winseq v0.0.0-20200720163736-7fa652d2b50e // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.14 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
 	go.starlark.net v0.0.0-20240520160348-046347dcd104 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
-	golang.org/x/mod v0.18.0 // indirect
-	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
+	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
-	google.golang.org/grpc v1.64.0 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.30.1 // indirect
-	k8s.io/component-base v0.30.2 // indirect
+	k8s.io/apiextensions-apiserver v0.31.0 // indirect
+	k8s.io/component-base v0.31.0 // indirect
 	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect