Skip to content

Commit 98aadbb

Browse files
dmcgowandmcgowan
authored
Merge pull request #1463 from dims/remove-dependencies-on-k8s.io/kubernetes
Remove dependencies on k8s.io/kubernetes
2 parents b8f7b9f + 3ee62de commit 98aadbb

47 files changed

Lines changed: 529 additions & 1983 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎integration/main_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import (
3636
"google.golang.org/grpc"
3737
"k8s.io/cri-api/pkg/apis"
3838
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
39-
"k8s.io/kubernetes/pkg/kubelet/cri/remote"
40-
kubeletutil "k8s.io/kubernetes/pkg/kubelet/util"
4139

40+
"github.com/containerd/cri/integration/remote"
41+
dialer "github.com/containerd/cri/integration/util"
4242
criconfig "github.com/containerd/cri/pkg/config"
4343
"github.com/containerd/cri/pkg/constants"
4444
"github.com/containerd/cri/pkg/server"
@@ -346,7 +346,7 @@ func PidOf(name string) (int, error) {
346346

347347
// RawRuntimeClient returns a raw grpc runtime service client.
348348
func RawRuntimeClient() (runtime.RuntimeServiceClient, error) {
349-
addr, dialer, err := kubeletutil.GetAddressAndDialer(*criEndpoint)
349+
addr, dialer, err := dialer.GetAddressAndDialer(*criEndpoint)
350350
if err != nil {
351351
return nil, errors.Wrap(err, "failed to get dialer")
352352
}

vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/doc.go renamed to integration/remote/doc.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
Copyright The containerd Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
117
/*
218
Copyright 2016 The Kubernetes Authors.
319

vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_image.go renamed to integration/remote/remote_image.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
Copyright The containerd Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
117
/*
218
Copyright 2016 The Kubernetes Authors.
319
@@ -27,7 +43,8 @@ import (
2743

2844
internalapi "k8s.io/cri-api/pkg/apis"
2945
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
30-
"k8s.io/kubernetes/pkg/kubelet/cri/remote/util"
46+
47+
"github.com/containerd/cri/integration/remote/util"
3148
)
3249

3350
// RemoteImageService is a gRPC implementation of internalapi.ImageManagerService.

vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/remote_runtime.go renamed to integration/remote/remote_runtime.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
Copyright The containerd Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
117
/*
218
Copyright 2016 The Kubernetes Authors.
319
@@ -29,8 +45,9 @@ import (
2945
"k8s.io/component-base/logs/logreduction"
3046
internalapi "k8s.io/cri-api/pkg/apis"
3147
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
32-
"k8s.io/kubernetes/pkg/kubelet/cri/remote/util"
3348
utilexec "k8s.io/utils/exec"
49+
50+
"github.com/containerd/cri/integration/remote/util"
3451
)
3552

3653
// RemoteRuntimeService is a gRPC implementation of internalapi.RuntimeService.

vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_unix.go renamed to integration/remote/util/util_unix.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
// +build freebsd linux darwin
22

3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
319
/*
420
Copyright 2017 The Kubernetes Authors.
521

vendor/k8s.io/kubernetes/pkg/kubelet/util/util_unsupported.go renamed to integration/remote/util/util_unsupported.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
// +build !freebsd,!linux,!windows,!darwin
22

3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
319
/*
420
Copyright 2017 The Kubernetes Authors.
521

vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/util/util_windows.go renamed to integration/remote/util/util_windows.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
// +build windows
22

3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
319
/*
420
Copyright 2017 The Kubernetes Authors.
521

vendor/k8s.io/kubernetes/pkg/kubelet/cri/remote/utils.go renamed to integration/remote/utils.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
Copyright The containerd Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
117
/*
218
Copyright 2016 The Kubernetes Authors.
319

vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_darwin.go renamed to integration/util/boottime_util_darwin.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
// +build darwin
22

3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
319
/*
420
Copyright 2018 The Kubernetes Authors.
521

vendor/k8s.io/kubernetes/pkg/kubelet/util/boottime_util_linux.go renamed to integration/util/boottime_util_linux.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
// +build freebsd linux
22

3+
/*
4+
Copyright The containerd Authors.
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
*/
18+
319
/*
420
Copyright 2018 The Kubernetes Authors.
521

0 commit comments

Comments
 (0)