Merge 7514ab5 into da9da81

k8snetworkplumbingwg · Jan 28, 2020 · 3fe7b1c · 3fe7b1c
2 parents da9da81 + 7514ab5
commit 3fe7b1c
Show file tree

Hide file tree

Showing 30 changed files with 252 additions and 203 deletions.
diff --git a/go.mod b/go.mod
@@ -6,21 +6,27 @@ require (
 	github.com/Microsoft/go-winio v0.4.14 // indirect
 	github.com/containernetworking/cni v0.7.1
 	github.com/containernetworking/plugins v0.8.2
+	github.com/emicklei/go-restful v2.11.1+incompatible // indirect
+	github.com/go-openapi/spec v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.7 // indirect
 	github.com/golang/protobuf v1.3.2 // indirect
-	github.com/json-iterator/go v1.1.8 // indirect
-	github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20191119172530-79f836b90111
-	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/json-iterator/go v1.1.9 // indirect
+	github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20200127152046-0ee521d56061
 	github.com/onsi/ginkgo v1.10.1
 	github.com/onsi/gomega v1.7.0
 	github.com/pkg/errors v0.8.1
 	github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf
 	github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f // indirect
-	golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933
+	golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
+	golang.org/x/tools v0.0.0-20200128002243-345141a36859 // indirect
+	gonum.org/v1/gonum v0.6.2 // indirect
 	google.golang.org/grpc v1.23.0
-	gopkg.in/yaml.v2 v2.2.7 // indirect
+	gopkg.in/yaml.v2 v2.2.8 // indirect
 	k8s.io/api v0.0.0-20181115043458-b799cb063522
 	k8s.io/apimachinery v0.0.0-20181110190943-2a7c93004028
 	k8s.io/client-go v0.0.0-20181115111358-9bea17718df8
-	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a // indirect
+	k8s.io/code-generator v0.17.2 // indirect
+	k8s.io/gengo v0.0.0-20200127102705-1e9b17e831be // indirect
+	k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c // indirect
 	k8s.io/kubernetes v1.13.0
 )
diff --git a/go.sum b/go.sum
diff --git a/vendor/github.com/json-iterator/go/reflect_extension.go b/vendor/github.com/json-iterator/go/reflect_extension.go
diff --git a/vendor/github.com/json-iterator/go/reflect_map.go b/vendor/github.com/json-iterator/go/reflect_map.go
diff --git a/vendor/github.com/json-iterator/go/reflect_struct_encoder.go b/vendor/github.com/json-iterator/go/reflect_struct_encoder.go
diff --git a/...tworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1/types.go b/...tworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1/types.go
diff --git a/...network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1/zz_generated.deepcopy.go b/...network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1/zz_generated.deepcopy.go
diff --git a/...umbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/clientset.go b/...umbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/clientset.go
diff --git a/...workplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/doc.go b/...workplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/doc.go
diff --git a/...k-attachment-definition-client/pkg/client/clientset/versioned/fake/clientset_generated.go b/...k-attachment-definition-client/pkg/client/clientset/versioned/fake/clientset_generated.go
diff --git a/...lumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake/doc.go b/...lumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake/doc.go
diff --git a/...ngwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake/register.go b/...ngwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake/register.go
diff --git a/...mbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/scheme/doc.go b/...mbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/scheme/doc.go
diff --git a/...wg/network-attachment-definition-client/pkg/client/clientset/versioned/scheme/register.go b/...wg/network-attachment-definition-client/pkg/client/clientset/versioned/scheme/register.go
diff --git a/...tachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/doc.go b/...tachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/doc.go
diff --git a/...ent-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/fake/doc.go b/...ent-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/fake/doc.go
diff --git a/...g/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/fake/fake_k8s.cni.cncf.io_client.go b/...g/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/fake/fake_k8s.cni.cncf.io_client.go
diff --git a/...ent/clientset/versioned/typed/k8s.cni.cncf.io/v1/fake/fake_networkattachmentdefinition.go b/...ent/clientset/versioned/typed/k8s.cni.cncf.io/v1/fake/fake_networkattachmentdefinition.go
diff --git a/...ion-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/generated_expansion.go b/...ion-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/generated_expansion.go
diff --git a/...-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/k8s.cni.cncf.io_client.go b/...-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/k8s.cni.cncf.io_client.go
diff --git a/...nt/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/networkattachmentdefinition.go b/...nt/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1/networkattachmentdefinition.go
diff --git a/...com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils/net-attach-def.go b/...com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils/net-attach-def.go
diff --git a/vendor/golang.org/x/net/html/const.go b/vendor/golang.org/x/net/html/const.go