Merge pull request #5619 from mikebrow/cri-add-v1-proxy-alpha

[CRI] move up to CRI v1 and support v1alpha in parallel
2021-07-09 14:07:24 -04:00
parent 9fa7d15077 d1c1051927
commit cf600abecc
110 changed files with 36412 additions and 112 deletions
--- a/integration/containerd_image_test.go
+++ b/integration/containerd_image_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )

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