Skip to content

Commit cf600ab

Browse files
estespestesp
authored
Merge pull request containerd#5619 from mikebrow/cri-add-v1-proxy-alpha
[CRI] move up to CRI v1 and support v1alpha in parallel
2 parents 9fa7d15 + d1c1051 commit cf600ab

File tree

110 files changed

+36523
-223
lines changed

Some content is hidden

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

110 files changed

+36523
-223
lines changed

‎integration/addition_gids_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"github.com/stretchr/testify/assert"
2929
"github.com/stretchr/testify/require"
30-
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
30+
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
3131
)
3232

3333
func TestAdditionalGids(t *testing.T) {

‎integration/common.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
"io/ioutil"
2222
"testing"
2323

24+
cri "github.com/containerd/containerd/integration/cri-api/pkg/apis"
2425
"github.com/pelletier/go-toml"
2526
"github.com/sirupsen/logrus"
2627
"github.com/stretchr/testify/require"
27-
cri "k8s.io/cri-api/pkg/apis"
28-
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
28+
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
2929
)
3030

3131
// ImageList holds public image references

‎integration/container_log_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
"github.com/stretchr/testify/assert"
2929
"github.com/stretchr/testify/require"
30-
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
30+
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
3131
)
3232

3333
func TestContainerLogWithoutTailingNewLine(t *testing.T) {

‎integration/container_stats_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/pkg/errors"
2626
"github.com/stretchr/testify/assert"
2727
"github.com/stretchr/testify/require"
28-
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
28+
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
2929
)
3030

3131
// Test to verify for a container ID

‎integration/container_stop_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/stretchr/testify/assert"
2626
"github.com/stretchr/testify/require"
27-
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
27+
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
2828
)
2929

3030
func TestSharedPidMultiProcessContainerStop(t *testing.T) {

‎integration/container_update_resources_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/stretchr/testify/assert"
2727
"github.com/stretchr/testify/require"
2828
"golang.org/x/net/context"
29-
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
29+
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
3030
)
3131

3232
func checkMemoryLimit(t *testing.T, spec *runtimespec.Spec, memLimit int64) {

‎integration/container_volume_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"github.com/stretchr/testify/assert"
2727
"github.com/stretchr/testify/require"
28-
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
28+
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
2929
)
3030

3131
func createRegularFile(basePath, content string) (string, error) {

‎integration/container_without_image_ref_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/stretchr/testify/assert"
2323
"github.com/stretchr/testify/require"
24-
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
24+
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
2525
)
2626

2727
// Test container lifecycle can work without image references.

‎integration/containerd_image_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/pkg/errors"
2929
"github.com/stretchr/testify/assert"
3030
"github.com/stretchr/testify/require"
31-
runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
31+
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
3232
)
3333

3434
// Test to test the CRI plugin should see image pulled into containerd directly.

vendor/k8s.io/cri-api/pkg/apis/services.go renamed to integration/cri-api/pkg/apis/services.go

Lines changed: 19 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
@@ -14,12 +30,14 @@ See the License for the specific language governing permissions and
1430
limitations under the License.
1531
*/
1632

33+
// this file is from k8s.io/cri-api/pkg/apis only it points to v1 as the runtimeapi not v1alpha
34+
1735
package cri
1836

1937
import (
2038
"time"
2139

22-
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
40+
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
2341
)
2442

2543
// RuntimeVersioner contains methods for runtime name, version and API version.

0 commit comments

Comments
 (0)