Skip to content

Commit a03c175

Browse files
committed
Fixing K8s 1.21 incompatibility induced by checkpoint file structure change
Switching to interrogate Pod resource monitoring API Also needed to bump all API version dependencies to 1.19.X due to yet another incompatible upstream code change in client-go
1 parent f0c0545 commit a03c175

File tree

12 files changed

+236
-139
lines changed

12 files changed

+236
-139
lines changed

Diff for: crd/client/clientset/versioned/fake/register.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crd/client/listers/danm/v1/clusternetwork.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crd/client/listers/danm/v1/danmep.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crd/client/listers/danm/v1/danmnet.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crd/client/listers/danm/v1/tenantconfig.go

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crd/client/listers/danm/v1/tenantnetwork.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crd/client/nad/clientset/versioned/fake/register.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crd/client/nad/listers/k8s.cni.cncf.io/v1/networkattachmentdefinition.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: go.mod

+9-8
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@ go 1.13
44

55
require (
66
github.com/apparentlymart/go-cidr v1.0.1
7-
github.com/containernetworking/cni v0.7.1
7+
github.com/containernetworking/cni v0.8.1
88
github.com/containernetworking/plugins v0.8.5
99
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
10-
github.com/intel/multus-cni v0.0.0-20200316130803-079c853eba60
1110
github.com/intel/sriov-cni v2.1.0+incompatible
1211
github.com/j-keck/arping v1.0.0
13-
github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20200127152046-0ee521d56061
12+
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.1-0.20201119153432-9d213757d22d
1413
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
1514
github.com/vishvananda/netlink v1.1.1-0.20200221165523-c79a4b7b4066
16-
gopkg.in/intel/multus-cni.v3 v3.4.2
17-
k8s.io/api v0.18.1
18-
k8s.io/apimachinery v0.19.0-alpha.1.0.20200331211856-243f646b5bc8
19-
k8s.io/client-go v0.0.0-20200404181738-fe32aa3b9449
20-
k8s.io/code-generator v0.18.1
15+
gopkg.in/intel/multus-cni.v3 v3.7.1
16+
k8s.io/api v0.19.10
17+
k8s.io/apimachinery v0.19.10
18+
k8s.io/client-go v0.19.10
19+
k8s.io/code-generator v0.19.10
2120
k8s.io/kubernetes v1.14.10
2221
)
22+
23+
replace k8s.io/client-go => k8s.io/client-go v0.19.10

0 commit comments

Comments
 (0)