Merge pull request #1058 from haiyanmeng/update-k8s-version

Update kubernetes to v1.15.0-alpha.0
containerd · Feb 27, 2019 · ec3aa44 · ec3aa44
2 parents fbce579 + 035ce6c
commit ec3aa44
Show file tree

Hide file tree

Showing 73 changed files with 3,474 additions and 1,661 deletions.
diff --git a/integration/addition_gids_test.go b/integration/addition_gids_test.go
@@ -48,7 +48,7 @@ func TestAdditionalGids(t *testing.T) {
 		containerName = "test-container"
 	)
 	t.Logf("Pull test image %q", testImage)
-	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 	require.NoError(t, err)
 	defer func() {
 		assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: img}))

diff --git a/integration/container_log_test.go b/integration/container_log_test.go
@@ -51,7 +51,7 @@ func TestContainerLogWithoutTailingNewLine(t *testing.T) {
 		containerName = "test-container"
 	)
 	t.Logf("Pull test image %q", testImage)
-	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 	require.NoError(t, err)
 	defer func() {
 		assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: img}))
@@ -111,7 +111,7 @@ func TestLongContainerLog(t *testing.T) {
 		containerName = "test-container"
 	)
 	t.Logf("Pull test image %q", testImage)
-	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 	require.NoError(t, err)
 	defer func() {
 		assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: img}))

diff --git a/integration/container_stop_test.go b/integration/container_stop_test.go
@@ -43,7 +43,7 @@ func TestSharedPidMultiProcessContainerStop(t *testing.T) {
 				containerName = "test-container"
 			)
 			t.Logf("Pull test image %q", testImage)
-			img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+			img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 			require.NoError(t, err)
 			defer func() {
 				assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: img}))

diff --git a/integration/container_without_image_ref_test.go b/integration/container_without_image_ref_test.go
@@ -40,7 +40,7 @@ func TestContainerLifecycleWithoutImageRef(t *testing.T) {
 		containerName = "test-container"
 	)
 	t.Log("Pull test image")
-	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 	require.NoError(t, err)
 	defer func() {
 		assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: img}))

diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go
@@ -182,8 +182,9 @@ func TestContainerdImageInOtherNamespaces(t *testing.T) {
 	}
 	require.NoError(t, Consistently(checkImage, 100*time.Millisecond, time.Second))
 
+	sbConfig := PodSandboxConfig("sandbox", "test")
 	t.Logf("pull the image into cri plugin")
-	id, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+	id, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 	require.NoError(t, err)
 	defer func() {
 		assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: id}))

diff --git a/integration/imagefs_info_test.go b/integration/imagefs_info_test.go
@@ -28,15 +28,16 @@ import (
 )
 
 func TestImageFSInfo(t *testing.T) {
+	config := PodSandboxConfig("running-pod", "imagefs")
+
 	t.Logf("Pull an image to make sure image fs is not empty")
-	img, err := imageService.PullImage(&runtime.ImageSpec{Image: "busybox"}, nil)
+	img, err := imageService.PullImage(&runtime.ImageSpec{Image: "busybox"}, nil, config)
 	require.NoError(t, err)
 	defer func() {
 		err := imageService.RemoveImage(&runtime.ImageSpec{Image: img})
 		assert.NoError(t, err)
 	}()
 	t.Logf("Create a sandbox to make sure there is an active snapshot")
-	config := PodSandboxConfig("running-pod", "imagefs")
 	sb, err := runtimeService.RunPodSandbox(config, *runtimeHandler)
 	require.NoError(t, err)
 	defer func() {

diff --git a/integration/pod_hostname_test.go b/integration/pod_hostname_test.go
@@ -75,7 +75,7 @@ func TestPodHostname(t *testing.T) {
 				containerName = "test-container"
 			)
 			t.Logf("Pull test image %q", testImage)
-			img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+			img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 			require.NoError(t, err)
 			defer func() {
 				assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: img}))

diff --git a/integration/restart_test.go b/integration/restart_test.go
@@ -133,7 +133,7 @@ func TestContainerdRestart(t *testing.T) {
 
 	t.Logf("Pull test images")
 	for _, image := range []string{"busybox", "alpine"} {
-		img, err := imageService.PullImage(&runtime.ImageSpec{image}, nil)
+		img, err := imageService.PullImage(&runtime.ImageSpec{image}, nil, nil)
 		require.NoError(t, err)
 		defer func() {
 			assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: img}))
@@ -209,15 +209,16 @@ func TestUnknownStateAfterContainerdRestart(t *testing.T) {
 		t.Skip("unsupported config: runc not in PATH")
 	}
 
+	sbConfig := PodSandboxConfig("sandbox", "sandbox-unknown-state")
+
 	const testImage = "busybox"
 	t.Logf("Pull test image %q", testImage)
-	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+	img, err := imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 	require.NoError(t, err)
 	defer func() {
 		assert.NoError(t, imageService.RemoveImage(&runtime.ImageSpec{Image: img}))
 	}()
 
-	sbConfig := PodSandboxConfig("sandbox", "sandbox-unknown-state")
 	t.Log("Should not be able to create sandbox without runc")
 	tmpRuncPath := Randomize(runcPath)
 	require.NoError(t, os.Rename(runcPath, tmpRuncPath))

diff --git a/integration/truncindex_test.go b/integration/truncindex_test.go
@@ -29,9 +29,11 @@ func genTruncIndex(normalName string) string {
 }
 
 func TestTruncIndex(t *testing.T) {
+	sbConfig := PodSandboxConfig("sandbox", "truncindex")
+
 	t.Logf("Pull an image")
 	const appImage = "busybox"
-	imgID, err := imageService.PullImage(&runtimeapi.ImageSpec{Image: appImage}, nil)
+	imgID, err := imageService.PullImage(&runtimeapi.ImageSpec{Image: appImage}, nil, sbConfig)
 	require.NoError(t, err)
 	imgTruncId := genTruncIndex(imgID)
 	defer func() {
@@ -54,7 +56,6 @@ func TestTruncIndex(t *testing.T) {
 	// TODO(yanxuean): add test case for ListImages
 
 	t.Logf("Create a sandbox")
-	sbConfig := PodSandboxConfig("sandbox", "truncindex")
 	sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
 	require.NoError(t, err)
 	sbTruncIndex := genTruncIndex(sb)

diff --git a/integration/volume_copy_up_test.go b/integration/volume_copy_up_test.go
@@ -43,7 +43,7 @@ func TestVolumeCopyUp(t *testing.T) {
 	}()
 
 	t.Logf("Pull test image")
-	_, err = imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+	_, err = imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 	require.NoError(t, err)
 
 	t.Logf("Create a container with volume-copy-up test image")
@@ -105,7 +105,7 @@ func TestVolumeOwnership(t *testing.T) {
 	}()
 
 	t.Logf("Pull test image")
-	_, err = imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil)
+	_, err = imageService.PullImage(&runtime.ImageSpec{Image: testImage}, nil, sbConfig)
 	require.NoError(t, err)
 
 	t.Logf("Create a container with volume-ownership test image")

diff --git a/vendor.conf b/vendor.conf
@@ -68,11 +68,11 @@ google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
 google.golang.org/grpc v1.12.0
 gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
 gopkg.in/yaml.v2 v2.2.1
-k8s.io/api kubernetes-1.13.0
-k8s.io/apimachinery kubernetes-1.13.0
-k8s.io/apiserver kubernetes-1.13.0
-k8s.io/client-go kubernetes-1.13.0
-k8s.io/klog 8139d8cb77af419532b33dfa7dd09fbc5f1d344f
-k8s.io/kubernetes v1.13.0
-k8s.io/utils 0d26856f57b32ec3398579285e5c8a2bfe8c5243
+k8s.io/api kubernetes-1.15.0-alpha.0
+k8s.io/apimachinery kubernetes-1.15.0-alpha.0
+k8s.io/apiserver kubernetes-1.15.0-alpha.0
+k8s.io/client-go kubernetes-1.15.0-alpha.0
+k8s.io/klog 8145543d67ada0bd556af97faeeb8a65a2651c98
+k8s.io/kubernetes v1.15.0-alpha.0
+k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c
 sigs.k8s.io/yaml v1.1.0
diff --git a/vendor/k8s.io/api/README.md b/vendor/k8s.io/api/README.md