Merge pull request #729 from aaronlevy/v1.8.0

Bump k8s v1.8.1
kubernetes-retired · Oct 18, 2017 · 9230a32 · 9230a32
2 parents af5339f + e47b760
commit 9230a32
Show file tree

Hide file tree

Showing 13 changed files with 496 additions and 178 deletions.
diff --git a/bill-of-materials.json b/bill-of-materials.json
diff --git a/e2e/checkpointer_test.go b/e2e/checkpointer_test.go
@@ -72,7 +72,7 @@ func verifyCheckpoint(c *Cluster, namespace, daemonsetName string, shouldExist,
 
 		return nil
 	}
-	return retry(20, 10*time.Second, checkpointed)
+	return retry(60, 10*time.Second, checkpointed)
 }
 
 func verifyPod(c *Cluster, daemonsetName string, shouldRun bool) error {
@@ -90,7 +90,7 @@ func verifyPod(c *Cluster, daemonsetName string, shouldRun bool) error {
 		}
 		return nil
 	}
-	return retry(20, 10*time.Second, checkpointsRunning)
+	return retry(60, 10*time.Second, checkpointsRunning)
 }
 
 func isNodeReady(n *Node) bool {
@@ -131,7 +131,7 @@ func waitCluster(t *testing.T) *Cluster {
 		return nil
 	}
 
-	if err := retry(20, 10*time.Second, f); err != nil {
+	if err := retry(60, 10*time.Second, f); err != nil {
 		t.Fatalf("Failed to wait cluster: %v", err)
 	}
 	return c
@@ -144,7 +144,7 @@ func waitForCheckpointDeactivation(t *testing.T) {
 	t.Log("Waiting 120 seconds for checkpoints to deactivate.")
 	time.Sleep(120 * time.Second)
 	successes := 0
-	if err := retry(20, 3*time.Second, func() error {
+	if err := retry(60, 3*time.Second, func() error {
 		_, err := client.Discovery().ServerVersion()
 		if err != nil {
 			successes = 0
@@ -222,8 +222,8 @@ func TestCheckpointerUnscheduleCheckpointer(t *testing.T) {
 	}
 
 	// Delete the pod checkpointer on the worker node by updating the daemonset.
-	patch = `[{"op": "replace", "path": "/spec/template/spec/nodeSelector", "value": {"node-role.kubernetes.io/master":""}}]`
-	_, err = client.ExtensionsV1beta1().DaemonSets("kube-system").Patch("pod-checkpointer", types.JSONPatchType, []byte(patch))
+	patch = `{"spec":{"template":{"spec":{"nodeSelector":{"node-role.kubernetes.io/master":""}}}}}`
+	_, err = client.ExtensionsV1beta1().DaemonSets("kube-system").Patch("pod-checkpointer", types.MergePatchType, []byte(patch))
 	if err != nil {
 		t.Fatalf("Failed to patch checkpointer: %v", err)
 	}
@@ -352,8 +352,8 @@ func TestCheckpointerUnscheduleParent(t *testing.T) {
 	}
 
 	// Delete test pod on the workers.
-	patch = `[{"op": "replace", "path": "/spec/template/spec/nodeSelector", "value": {"node-role.kubernetes.io/master":""}}]`
-	_, err = client.ExtensionsV1beta1().DaemonSets(testNS).Patch("nginx-daemonset", types.JSONPatchType, []byte(patch))
+	patch = `{"spec":{"template":{"spec":{"nodeSelector":{"node-role.kubernetes.io/master":""}}}}}`
+	_, err = client.ExtensionsV1beta1().DaemonSets(testNS).Patch("nginx-daemonset", types.MergePatchType, []byte(patch))
 	if err != nil {
 		t.Fatalf("unable to patch daemonset: %v", err)
 	}

diff --git a/e2e/node.go b/e2e/node.go
@@ -54,17 +54,23 @@ func (n *Node) SSH(cmd string) (stdout, stderr []byte, err error) {
 }
 
 func (n *Node) Reboot() error {
-	stdout, stderr, err := n.SSH("sudo reboot")
-	if _, ok := err.(*ssh.ExitMissingError); ok {
-		// A terminated session is perfectly normal during reboot.
-		err = nil
-	}
-	if err != nil {
-		return fmt.Errorf("issuing reboot command failed: %v\nstdout:%s\nstderr:%s", err, stdout, stderr)
+
+	// ssh to node and reboot
+	rebooter := func() error {
+		stdout, stderr, err := n.SSH("sudo reboot")
+		if _, ok := err.(*ssh.ExitMissingError); ok {
+			// A terminated session is perfectly normal during reboot.
+			err = nil
+		}
+		if err != nil {
+			return fmt.Errorf("issuing reboot command failed: %v\nstdout:%s\nstderr:%s", err, stdout, stderr)
+		}
+		return err
 	}
 
+	// ensure rebooted node is running
 	checker := func() error {
-		stdout, stderr, err = n.SSH("systemctl is-system-running")
+		stdout, stderr, err := n.SSH("systemctl is-system-running")
 		if err != nil {
 			return fmt.Errorf("%v: %v", err, stderr)
 		}
@@ -74,6 +80,10 @@ func (n *Node) Reboot() error {
 		return nil
 	}
 
+	if err := retry(5, 30*time.Second, rebooter); err != nil {
+		return err
+	}
+
 	return retry(20, 10*time.Second, checker)
 }
 

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -47,6 +47,15 @@ import:
   - ssh/agent
   - curve25519
 - package: github.com/coreos/ktestutil
-  version: 28c4856c11030d7cb4885cd40137f57e814b5d38
+  version: e715fca7103c954b24fa636de412ac043efe6c49
 - package: github.com/pkg/sftp
   version: 98203f5a8333288eb3163b7c667d4260fe1333e9
+- package: k8s.io/metrics
+  version: 8efbc8e22d00b9c600afec5f1c14073fd2412fce
+  subpackages:
+  - pkg/apis/metrics
+  - pkg/apis/metrics/v1alpha1
+  - pkg/client/clientset_generated/clientset
+  - pkg/client/clientset_generated/clientset/scheme
+  - pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1
+
diff --git a/hack/multi-node/user-data.sample b/hack/multi-node/user-data.sample
@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.7.7_coreos.0
+        Environment=KUBELET_IMAGE_TAG=v1.8.1_coreos.0
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --volume opt-cni-bin,kind=host,source=/opt/cni/bin \

diff --git a/hack/quickstart/kubelet.master b/hack/quickstart/kubelet.master
@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.7.7_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.8.1_coreos.0
 Environment="RKT_RUN_ARGS=\
 --uuid-file-save=/var/cache/kubelet-pod.uuid \
 --volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \

diff --git a/hack/quickstart/kubelet.worker b/hack/quickstart/kubelet.worker
@@ -1,6 +1,6 @@
 [Service]
 Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
-Environment=KUBELET_IMAGE_TAG=v1.7.7_coreos.0
+Environment=KUBELET_IMAGE_TAG=v1.8.1_coreos.0
 Environment="RKT_RUN_ARGS=\
 --uuid-file-save=/var/cache/kubelet-pod.uuid \
 --volume etc-resolv,kind=host,source=/etc/resolv.conf --mount volume=etc-resolv,target=/etc/resolv.conf \

diff --git a/hack/single-node/user-data.sample b/hack/single-node/user-data.sample
@@ -9,7 +9,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/environment
         Environment=KUBELET_IMAGE_URL=quay.io/coreos/hyperkube
-        Environment=KUBELET_IMAGE_TAG=v1.7.7_coreos.0
+        Environment=KUBELET_IMAGE_TAG=v1.8.1_coreos.0
         Environment="RKT_RUN_ARGS=--uuid-file-save=/var/cache/kubelet-pod.uuid \
           --volume var-lib-cni,kind=host,source=/var/lib/cni \
           --volume opt-cni-bin,kind=host,source=/opt/cni/bin \

diff --git a/hack/tests/conformance-test.sh b/hack/tests/conformance-test.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 CONFORMANCE_REPO=${CONFORMANCE_REPO:-github.com/coreos/kubernetes}
-CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.7.7+coreos.0}
+CONFORMANCE_VERSION=${CONFORMANCE_VERSION:-v1.8.1+coreos.0}
 
 usage() {
     echo "USAGE:"

diff --git a/pkg/asset/images.go b/pkg/asset/images.go
@@ -8,7 +8,7 @@ var DefaultImages = ImageVersions{
 	FlannelCNI:      "quay.io/coreos/flannel-cni:v0.3.0",
 	Calico:          "quay.io/calico/node:v2.6.1",
 	CalicoCNI:       "quay.io/calico/cni:v1.11.0",
-	Hyperkube:       "quay.io/coreos/hyperkube:v1.7.7_coreos.0",
+	Hyperkube:       "quay.io/coreos/hyperkube:v1.8.1_coreos.0",
 	Kenc:            "quay.io/coreos/kenc:0.0.2",
 	KubeDNS:         "gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5",
 	KubeDNSMasq:     "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5",