github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36319 from yujuhong/cri_flag

Browse Source 
Automatic merge from submit-queue

Rename experimental-runtime-integration-type to experimental-cri

Also rename the field in the component config to `EnableCRI`
This commit is contained in:
Kubernetes Submit Queue
2016-11-07 17:07:14 -08:00
committed by GitHub
parent 3624bf2ff4 dcce768a3e
commit 18cdbadb96
21 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/generated/openapi/zz_generated.openapi.go
View File

@@ -2996,10 +2996,10 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Format: "",
},
},
"experimentalRuntimeIntegrationType": {
"enableCRI": {
SchemaProps: spec.SchemaProps{
Description: "How to integrate with runtime. If set to cri, kubelet will switch to using the new Container Runtine Interface.",
Type: []string{"string"},
Description: "Enable Container Runtime Interface (CRI) integration.",
Type: []string{"boolean"},
Format: "",
},
},
@@ -14750,10 +14750,10 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Format: "",
},
},
"experimentalRuntimeIntegrationType": {
"enableCRI": {
SchemaProps: spec.SchemaProps{
Description: "How to integrate with runtime. If set to CRI, kubelet will switch to using the new Container Runtine Interface.",
Type: []string{"string"},
Description: "Enable Container Runtime Interface (CRI) integration.",
Type: []string{"boolean"},
Format: "",
},
},