Skip to content

test: remove k8s.io/kubernetes dependency by using containerd copy #984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcantah merged 2 commits into from
Mar 25, 2021
Merged

test: remove k8s.io/kubernetes dependency by using containerd copy #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75abc2e
test: remove k8s.io/kubernetes dependency by using containerd copy
thaJeztah Mar 25, 2021
37ab22e
test: go.mod: remove replace rule, which is no longer needed
thaJeztah Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion test/cri-containerd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import (
"github.com/containerd/containerd"
eventtypes "github.com/containerd/containerd/api/events"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
kubeutil "github.com/containerd/containerd/integration/remote/util"
eventruntime "github.com/containerd/containerd/runtime"
"github.com/containerd/typeurl"
"github.com/gogo/protobuf/types"
"google.golang.org/grpc"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
kubeutil "k8s.io/kubernetes/pkg/kubelet/util"
)

const (
Expand Down
37 changes: 2 additions & 35 deletions test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,9 @@ require (
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.7.0
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
google.golang.org/grpc v1.33.2
k8s.io/cri-api v0.20.1
k8s.io/kubernetes v1.20.4
)

replace (
github.com/Microsoft/hcsshim => ../
// These are all required due to how k8s handles dependencies. The primary k8s.io/kubernetes
// module only depends on v0.0.0 for these, which does not exist. Replace directives are
// then used to redirect to the actual source for the module. Since replace directives are
// not inherited when we depend on k8s.io/kubernetes, we need to put our own in here.
//
// These replace directives all point to v1.20.4's commit ID. Putting the version tag instead
// didn't seem to work.
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20210218160201-e87da0bd6e03
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210218160201-e87da0bd6e03
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20210218160201-e87da0bd6e03
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20210218160201-e87da0bd6e03
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20210218160201-e87da0bd6e03
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20210218160201-e87da0bd6e03
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20210218160201-e87da0bd6e03
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20210218160201-e87da0bd6e03
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20210218160201-e87da0bd6e03
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20210218160201-e87da0bd6e03
k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20210218160201-e87da0bd6e03
k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20210218160201-e87da0bd6e03
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20210218160201-e87da0bd6e03
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20210218160201-e87da0bd6e03
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20210218160201-e87da0bd6e03
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20210218160201-e87da0bd6e03
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20210218160201-e87da0bd6e03
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210218160201-e87da0bd6e03
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210218160201-e87da0bd6e03
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210218160201-e87da0bd6e03
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210218160201-e87da0bd6e03
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210218160201-e87da0bd6e03
k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210218160201-e87da0bd6e03
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20210218160201-e87da0bd6e03
)
replace github.com/Microsoft/hcsshim => ../
348 changes: 12 additions & 336 deletions test/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions test/vendor/github.com/Microsoft/hcsshim/computestorage/helpers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions test/vendor/github.com/Microsoft/hcsshim/go.mod
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading