Merge pull request #508 from Random-Liu/update-kubernetes

Update kubernetes to v1.9.0.

Author: Random-Liu

hack/versions

@@ -3,4 +3,4 @@ CNI_VERSION=v0.6.0
 CONTAINERD_VERSION=6c7abf7c76c1973d4fb4b0bad51691de84869a51
 CONTAINERD_REPO=
 CRITOOL_VERSION=v1.0.0-alpha.0
-KUBERNETES_VERSION=164317879bcd810b97e5ebf1c8df041770f2ff1b
+KUBERNETES_VERSION=v1.9.0

pkg/server/container_update_resources.go

@@ -28,10 +28,10 @@ import (
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
 	"golang.org/x/net/context"
-	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 
 	containerstore "github.com/kubernetes-incubator/cri-containerd/pkg/store/container"
+	"github.com/kubernetes-incubator/cri-containerd/pkg/util"
 )
 
 // UpdateContainerResources updates ContainerConfig of the container.
@@ -129,11 +129,11 @@ func updateContainerSpec(ctx context.Context, cntr containerd.Container, spec *r
 // updateOCILinuxResource updates container resource limit.
 func updateOCILinuxResource(spec *runtimespec.Spec, new *runtime.LinuxContainerResources) (*runtimespec.Spec, error) {
 	// Copy to make sure old spec is not changed.
-	cloned, err := conversion.NewCloner().DeepCopy(spec)
-	if err != nil {
+	var cloned runtimespec.Spec
+	if err := util.DeepCopy(&cloned, spec); err != nil {
 		return nil, fmt.Errorf("failed to deep copy: %v", err)
 	}
-	g := generate.NewFromSpec(cloned.(*runtimespec.Spec))
+	g := generate.NewFromSpec(&cloned)
 
 	if new.GetCpuPeriod() != 0 {
 		g.SetLinuxResourcesCPUPeriod(uint64(new.GetCpuPeriod()))

pkg/util/deep_copy.go

@@ -0,0 +1,41 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package util
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+// DeepCopy makes a deep copy from src into dst.
+func DeepCopy(dst interface{}, src interface{}) error {
+	if dst == nil {
+		return fmt.Errorf("dst cannot be nil")
+	}
+	if src == nil {
+		return fmt.Errorf("src cannot be nil")
+	}
+	bytes, err := json.Marshal(src)
+	if err != nil {
+		return fmt.Errorf("unable to marshal src: %s", err)
+	}
+	err = json.Unmarshal(bytes, dst)
+	if err != nil {
+		return fmt.Errorf("unable to unmarshal into dst: %s", err)
+	}
+	return nil
+}

pkg/util/deep_copy_test.go

@@ -0,0 +1,63 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package util
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+type A struct {
+	String  string
+	Int     int
+	Strings []string
+	Ints    map[string]int
+	As      map[string]*A
+}
+
+func TestCopy(t *testing.T) {
+	src := &A{
+		String:  "Hello World",
+		Int:     5,
+		Strings: []string{"A", "B"},
+		Ints:    map[string]int{"A": 1, "B": 2, "C": 4},
+		As: map[string]*A{
+			"One": {String: "2"},
+			"Two": {String: "3"},
+		},
+	}
+	dst := &A{
+		Strings: []string{"C"},
+		Ints:    map[string]int{"B": 3, "C": 4},
+		As:      map[string]*A{"One": {String: "1", Int: 5}},
+	}
+	expected := &A{
+		String:  "Hello World",
+		Int:     5,
+		Strings: []string{"A", "B"},
+		Ints:    map[string]int{"A": 1, "B": 2, "C": 4},
+		As: map[string]*A{
+			"One": {String: "2"},
+			"Two": {String: "3"},
+		},
+	}
+	assert.NotEqual(t, expected, dst)
+	err := DeepCopy(dst, src)
+	assert.NoError(t, err)
+	assert.Equal(t, expected, dst)
+}

vendor.conf

@@ -62,10 +62,10 @@ google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
 google.golang.org/grpc v1.7.2
 gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
 gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77
-k8s.io/api 218912509d74a117d05a718bb926d0948e531c20
-k8s.io/apimachinery 18a564baac720819100827c16fdebcadb05b2d0d
-k8s.io/apiserver 7001bc4df8883d4a0ec84cd4b2117655a0009b6c
-k8s.io/client-go 72e1c2a1ef30b3f8da039e92d4a6a1f079f374e8
-k8s.io/kube-openapi 39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1
-k8s.io/kubernetes 164317879bcd810b97e5ebf1c8df041770f2ff1b
-k8s.io/utils bf963466fd3fea33c428098b12a89d8ecd012f25
+k8s.io/api 9382f5a87a364c195477134986b578d103c7c24d
+k8s.io/apimachinery 23bc0b9defba312e3b5938fa0d0581f3e882f862
+k8s.io/apiserver cbbf2be01950dbf88df68c3ac331e532b3664464
+k8s.io/client-go 87887458218a51f3944b2f4c553eb38173458e97
+k8s.io/kube-openapi b16ebc07f5cad97831f961e4b5a9cc1caed33b7e
+k8s.io/kubernetes v1.9.0
+k8s.io/utils 66423a0293c555337adc04fe2c59748151291de8