Merge pull request #410 from yifan-gu/bump_1.6.0

Bump to v1.6.1+coreos.0

Author: Yifan Gu

Makefile

@@ -8,12 +8,25 @@ GOPATH_BIN:=$(shell echo ${GOPATH} | awk 'BEGIN { FS = ":" }; { print $1 }')/bin
 LDFLAGS=-X github.com/kubernetes-incubator/bootkube/pkg/version.Version=$(shell $(CURDIR)/build/git-version.sh)
 
 all: \
+	patch \
 	_output/bin/linux/bootkube \
 	_output/bin/darwin/bootkube \
-	_output/bin/linux/checkpoint
+	_output/bin/linux/checkpoint \
+	unpatch
 
-release: clean check \
-	_output/release/bootkube.tar.gz
+patch:
+	@echo "Patching etcd-operator vendor, this is a temporal fix for client-go vendor conflicts"
+	@git apply etcd-operator-vendor.patch
+
+unpatch:
+	@git apply -R etcd-operator-vendor.patch
+
+release: \
+	clean \
+	patch \
+	check \
+	_output/release/bootkube.tar.gz \
+	unpatch
 
 check:
 	@find . -name vendor -prune -o -name '*.go' -exec gofmt -s -d {} +
@@ -54,7 +67,7 @@ conformance-%: clean all
 #TODO(aaron): the k8s.io/client-go upstream package is a symlink with relative path. Making note because we change symlink path.
 # This will naively try and create a vendor dir from a k8s release
 # USE: make vendor VENDOR_VERSION=vX.Y.Z
-VENDOR_VERSION = v1.5.5+coreos.0
+VENDOR_VERSION = v1.6.1+coreos.0
 ETCD_OPERATOR_VERSION = v0.2.4
 vendor:
 	@echo "Creating k8s vendor for: $(VENDOR_VERSION)"
@@ -66,6 +79,8 @@ vendor:
 	@cd $@/k8s.io/kubernetes/vendor && mv k8s.io/* $(abspath $@/k8s.io) && rmdir k8s.io
 	@mv $@/k8s.io/kubernetes/vendor/* $(abspath $@)
 	@cd $@/k8s.io/ && ln -sf kubernetes/staging/src/k8s.io/client-go client-go
+	@cd $@/k8s.io/ && ln -sf kubernetes/staging/src/k8s.io/apimachinery apimachinery
+	@cd $@/k8s.io/ && ln -sf kubernetes/staging/src/k8s.io/apiserver apiserver
 	@rm -rf $@/k8s.io/kubernetes/vendor $@/k8s.io/kubernetes/.git
 	@echo "vendoring etcd-operator spec: $(ETCD_OPERATOR_VERSION)"
 	@git clone https://github.com/coreos/etcd-operator /tmp/etcd-operator > /dev/null 2>&1

cmd/checkpoint/main.go

@@ -17,13 +17,13 @@ import (
 
 	"github.com/golang/glog"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
-	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5"
-	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
-	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 )
 
 const (
@@ -408,7 +408,7 @@ func sanitizeCheckpointPod(cp *v1.Pod) (*v1.Pod, error) {
 	// NOTE(aaron): If we want to keep labels, we need to add a new label so the static pod
 	//              will not be adopted by higher-level parent (e.g. daemonset/deployment).
 	//              Otherwise you end up in situations where parent tries deleting mirror pods.
-	cp.ObjectMeta = v1.ObjectMeta{
+	cp.ObjectMeta = metav1.ObjectMeta{
 		Name:        cp.Name,
 		Namespace:   cp.Namespace,
 		Annotations: make(map[string]string),
@@ -462,7 +462,7 @@ func getFileCheckpoints(path string) map[string]*v1.Pod {
 
 // getAPIParentPods will retrieve all pods from apiserver that are parents & should be checkpointed
 func getAPIParentPods(client clientset.Interface, nodeName string) map[string]*v1.Pod {
-	opts := v1.ListOptions{
+	opts := metav1.ListOptions{
 		FieldSelector: fields.OneTermEqualSelector(api.PodHostField, nodeName).String(),
 	}
 
@@ -544,7 +544,7 @@ func checkpointSecretVolumes(client clientset.Interface, pod *v1.Pod) (*v1.Pod,
 // The path to the secret data becomes: checkpointSecretPath/namespace/podname/secretName/secret.file
 // Where each "secret.file" is a key from the secret.Data field.
 func checkpointSecret(client clientset.Interface, namespace, podName, secretName string) (string, error) {
-	secret, err := client.Core().Secrets(namespace).Get(secretName)
+	secret, err := client.Core().Secrets(namespace).Get(secretName, metav1.GetOptions{})
 	if err != nil {
 		return "", fmt.Errorf("failed to retrieve secret %s/%s: %v", namespace, secretName, err)
 	}
@@ -585,7 +585,7 @@ func checkpointConfigMapVolumes(client clientset.Interface, pod *v1.Pod) (*v1.Po
 // The path to the configMap data becomes: checkpointSecretPath/namespace/podname/configMapName/configMap.file
 // Where each "configMap.file" is a key from the configMap.Data field.
 func checkpointConfigMap(client clientset.Interface, namespace, podName, configMapName string) (string, error) {
-	configMap, err := client.Core().ConfigMaps(namespace).Get(configMapName)
+	configMap, err := client.Core().ConfigMaps(namespace).Get(configMapName, metav1.GetOptions{})
 	if err != nil {
 		return "", fmt.Errorf("failed to retrieve configMap %s/%s: %v", namespace, configMapName, err)
 	}
@@ -712,7 +712,7 @@ func podListToMap(pl *v1.PodList, filter filterFn) map[string]*v1.Pod {
 
 		// Pods from Kubelet API do not have TypeMeta populated - set it here either way.
 		pods[id] = pod
-		pods[id].TypeMeta = unversioned.TypeMeta{
+		pods[id].TypeMeta = metav1.TypeMeta{
 			APIVersion: pl.APIVersion,
 			Kind:       "Pod",
 		}

cmd/checkpoint/main_test.go

@@ -5,6 +5,7 @@ import (
 	"reflect"
 	"testing"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/v1"
 )
@@ -112,7 +113,7 @@ func TestProcess(t *testing.T) {
 			apiParents:   map[string]*v1.Pod{"kube-system/pod-checkpointer": {}},
 			inactiveCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -125,7 +126,7 @@ func TestProcess(t *testing.T) {
 			localParents: map[string]*v1.Pod{"kube-system/pod-checkpointer": {}},
 			inactiveCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -140,7 +141,7 @@ func TestProcess(t *testing.T) {
 			apiParents:   map[string]*v1.Pod{"BB": {}},
 			inactiveCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -156,7 +157,7 @@ func TestProcess(t *testing.T) {
 			apiParents:   map[string]*v1.Pod{"AA": {}},
 			inactiveCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -172,7 +173,7 @@ func TestProcess(t *testing.T) {
 			apiParents:   map[string]*v1.Pod{"AA": {}},
 			activeCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -189,7 +190,7 @@ func TestProcess(t *testing.T) {
 			apiParents:   map[string]*v1.Pod{"kube-system/pod-checkpointer": {}},
 			inactiveCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -203,7 +204,7 @@ func TestProcess(t *testing.T) {
 			localParents: map[string]*v1.Pod{"kube-system/pod-checkpointer": {}},
 			inactiveCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -219,7 +220,7 @@ func TestProcess(t *testing.T) {
 			apiParents:   map[string]*v1.Pod{"BB": {}},
 			inactiveCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -236,7 +237,7 @@ func TestProcess(t *testing.T) {
 			apiParents:   map[string]*v1.Pod{"AA": {}},
 			inactiveCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -253,7 +254,7 @@ func TestProcess(t *testing.T) {
 			apiParents:   map[string]*v1.Pod{"AA": {}},
 			activeCheckpoints: map[string]*v1.Pod{
 				"kube-system/pod-checkpointer": {
-					ObjectMeta: v1.ObjectMeta{
+					ObjectMeta: metav1.ObjectMeta{
 						Namespace: "kube-system",
 						Name:      "pod-checkpointer",
 					},
@@ -290,13 +291,13 @@ func TestSanitizeCheckpointPod(t *testing.T) {
 		{
 			desc: "Pod name and namespace are preserved & checkpoint annotation added",
 			pod: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:      "podname",
 					Namespace: "podnamespace",
 				},
 			},
 			expected: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:        "podname",
 					Namespace:   "podnamespace",
 					Annotations: map[string]string{checkpointParentAnnotation: "podname"},
@@ -306,14 +307,14 @@ func TestSanitizeCheckpointPod(t *testing.T) {
 		{
 			desc: "Existing annotations are removed, checkpoint annotation added",
 			pod: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:        "podname",
 					Namespace:   "podnamespace",
 					Annotations: map[string]string{"foo": "bar"},
 				},
 			},
 			expected: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:        "podname",
 					Namespace:   "podnamespace",
 					Annotations: map[string]string{checkpointParentAnnotation: "podname"},
@@ -323,14 +324,14 @@ func TestSanitizeCheckpointPod(t *testing.T) {
 		{
 			desc: "Pod status is reset",
 			pod: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:      "podname",
 					Namespace: "podnamespace",
 				},
 				Status: v1.PodStatus{Phase: "Pending"},
 			},
 			expected: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:        "podname",
 					Namespace:   "podnamespace",
 					Annotations: map[string]string{checkpointParentAnnotation: "podname"},
@@ -340,14 +341,14 @@ func TestSanitizeCheckpointPod(t *testing.T) {
 		{
 			desc: "Service acounts are cleared",
 			pod: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:      "podname",
 					Namespace: "podnamespace",
 				},
 				Spec: v1.PodSpec{ServiceAccountName: "foo", DeprecatedServiceAccount: "bar"},
 			},
 			expected: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:        "podname",
 					Namespace:   "podnamespace",
 					Annotations: map[string]string{checkpointParentAnnotation: "podname"},
@@ -368,10 +369,10 @@ func TestSanitizeCheckpointPod(t *testing.T) {
 }
 
 func TestPodListToParentPods(t *testing.T) {
-	parentAPod := v1.Pod{ObjectMeta: v1.ObjectMeta{Name: "A", Namespace: "A", Annotations: map[string]string{shouldCheckpointAnnotation: "true"}}}
-	parentBPod := v1.Pod{ObjectMeta: v1.ObjectMeta{Name: "B", Namespace: "B", Annotations: map[string]string{shouldCheckpointAnnotation: "true"}}}
-	checkpointPod := v1.Pod{ObjectMeta: v1.ObjectMeta{Name: "C", Namespace: "C", Annotations: map[string]string{checkpointParentAnnotation: "foo/bar"}}}
-	regularPod := v1.Pod{ObjectMeta: v1.ObjectMeta{Name: "D", Namespace: "D", Annotations: map[string]string{"meta": "data"}}}
+	parentAPod := v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "A", Namespace: "A", Annotations: map[string]string{shouldCheckpointAnnotation: "true"}}}
+	parentBPod := v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "B", Namespace: "B", Annotations: map[string]string{shouldCheckpointAnnotation: "true"}}}
+	checkpointPod := v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "C", Namespace: "C", Annotations: map[string]string{checkpointParentAnnotation: "foo/bar"}}}
+	regularPod := v1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "D", Namespace: "D", Annotations: map[string]string{"meta": "data"}}}
 
 	type testCase struct {
 		desc     string
@@ -470,7 +471,7 @@ func TestIsRunning(t *testing.T) {
 
 func podWithAnnotations(a map[string]string) *v1.Pod {
 	return &v1.Pod{
-		ObjectMeta: v1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:        "podname",
 			Namespace:   "podnamespace",
 			Annotations: a,
@@ -548,7 +549,7 @@ func TestIsCheckpoint(t *testing.T) {
 		{
 			desc: fmt.Sprintf("Pod is checkpoint and contains %s annotation key and value", checkpointParentAnnotation),
 			pod: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{checkpointParentAnnotation: "podnamespace/podname"},
 				},
 			},
@@ -557,7 +558,7 @@ func TestIsCheckpoint(t *testing.T) {
 		{
 			desc: fmt.Sprintf("Pod is checkpoint contains %s annotation key and no value", checkpointParentAnnotation),
 			pod: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{checkpointParentAnnotation: ""},
 				},
 			},
@@ -566,7 +567,7 @@ func TestIsCheckpoint(t *testing.T) {
 		{
 			desc: "Pod is not checkpoint & contains unrelated annotations",
 			pod: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Annotations: map[string]string{"foo": "bar"},
 				},
 			},
@@ -575,7 +576,7 @@ func TestIsCheckpoint(t *testing.T) {
 		{
 			desc: "Pod is not checkpoint & contains no annotations",
 			pod: &v1.Pod{
-				ObjectMeta: v1.ObjectMeta{},
+				ObjectMeta: metav1.ObjectMeta{},
 			},
 			expected: false,
 		},
@@ -591,7 +592,7 @@ func TestIsCheckpoint(t *testing.T) {
 
 func TestCopyPod(t *testing.T) {
 	pod := v1.Pod{
-		ObjectMeta: v1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:      "podname",
 			Namespace: "podnamespace",
 		},
@@ -608,7 +609,7 @@ func TestCopyPod(t *testing.T) {
 
 func TestPodID(t *testing.T) {
 	pod := &v1.Pod{
-		ObjectMeta: v1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:      "podname",
 			Namespace: "podnamespace",
 		},