scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-15 20:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106501 from ehashman/cri-graduation-v1

Browse Source 
Make CRI v1 the default and allow a fallback to v1alpha2
This commit is contained in:
Kubernetes Prow Robot
2021-11-17 19:57:01 -08:00
committed by GitHub
parent 91b7fb4dc9 31c4273f66
commit d766ab88f7
115 changed files with 1385 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/cri-api/pkg/apis/services.go
View File

@@ -19,7 +19,7 @@ package cri
import (
"time"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
)
// RuntimeVersioner contains methods for runtime name, version and API version.

2
staging/src/k8s.io/cri-api/pkg/apis/testing/fake_image_service.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
)
// FakeImageService fakes the image service.

2
staging/src/k8s.io/cri-api/pkg/apis/testing/fake_runtime_service.go
View File

@@ -22,7 +22,7 @@ import (
"sync"
"time"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
)
var (

2
staging/src/k8s.io/cri-api/pkg/apis/testing/utils.go
View File

@@ -19,7 +19,7 @@ package testing
import (
"fmt"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
)
// BuildContainerName creates a unique container name string.