Merge pull request #41819 from dchen1107/master

Automatic merge from submit-queue (batch tested with PRs 38957, 41819, 41851, 40667, 41373) Bump GCI to gci-stable-56-9000-84-2 Changelogs since gci-beta-56-9000-80-0: - Fixed google-accounts-daemon breaks on GCI when network is unavailable. - Fixed iptables-restore performance regression. cc/ @adityakali @Random-Liu @fabioy

Merge pull request #41819 from dchen1107/master
59f4c591 · Kubernetes Submit Queue · GitHub · 6024f56f · 57fe2611 · 59f4c591
Commit 59f4c591 authored Feb 22, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 22, 2017
7 changed files
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -59,7 +59,7 @@ fi
 # variable. Also please update corresponding image for node e2e at:
 # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
 CVM_VERSION=${CVM_VERSION:-container-vm-v20170214}
-GCI_VERSION=${KUBE_GCI_VERSION:-gci-beta-56-9000-80-0}
+GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2}
 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
 NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -60,7 +60,7 @@ fi
 # variable. Also please update corresponding image for node e2e at:
 # https://github.com/kubernetes/kubernetes/blob/master/test/e2e_node/jenkins/image-config.yaml
 CVM_VERSION=${CVM_VERSION:-container-vm-v20170214}
-GCI_VERSION=${KUBE_GCI_VERSION:-gci-beta-56-9000-80-0}
+GCI_VERSION=${KUBE_GCI_VERSION:-gci-stable-56-9000-84-2}
 MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-}
 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
 NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}

--- a/cluster/kubemark/gce/config-default.sh
+++ b/cluster/kubemark/gce/config-default.sh
@@ -36,7 +36,7 @@ PREEMPTIBLE_NODE=${PREEMPTIBLE_NODE:-false}

 MASTER_OS_DISTRIBUTION=${KUBE_MASTER_OS_DISTRIBUTION:-gci}
 NODE_OS_DISTRIBUTION=${KUBE_NODE_OS_DISTRIBUTION:-debian}
-MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-gci-beta-56-9000-80-0}
+MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-gci-stable-56-9000-84-2}
 MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}

 NETWORK=${KUBE_GCE_NETWORK:-default}

--- a/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/benchmark/benchmark-config.yaml
@@ -49,21 +49,21 @@ images:
    tests:
      - 'resource tracking for 105 pods per node \[Benchmark\]'
  gci-resource1:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 0 pods per node \[Benchmark\]'
  gci-resource2:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 35 pods per node \[Benchmark\]'
  gci-resource3:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"

--- a/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/benchmark-config.yaml
 ---
 images:
  gci-density1:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
    tests:
      - 'create 35 pods with 0s? interval \[Benchmark\]'
  gci-density2:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 0s? interval \[Benchmark\]'
  gci-density2-qps60:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
  gci-density3:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-2
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 0s? interval \[Benchmark\]'
  gci-density4:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 100ms interval \[Benchmark\]'
  gci-resource1:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 0 pods per node \[Benchmark\]'
  gci-resource2:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 35 pods per node \[Benchmark\]'
  gci-resource3:
-    image: gci-beta-56-9000-80-0
+    image: gci-stable-56-9000-84-2
    project: google-containers
    machine: n1-standard-1
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"

--- a/test/e2e_node/jenkins/cri_validation/image-config.yaml
+++ b/test/e2e_node/jenkins/cri_validation/image-config.yaml
@@ -3,7 +3,7 @@ images:
    image: e2e-node-containervm-v20161208-image # docker 1.11.2
    project: kubernetes-node-e2e-images
  gci-family:
-    image_regex: gci-beta-56-9000-80-0 # docker 1.11.2
+    image_regex: gci-stable-56-9000-84-2 # docker 1.11.2
    project: google-containers
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"
  ubuntu-docker12:

--- a/test/e2e_node/jenkins/image-config.yaml
+++ b/test/e2e_node/jenkins/image-config.yaml
@@ -16,6 +16,6 @@ images:
    image: e2e-node-containervm-v20161208-image # docker 1.11.2
    project: kubernetes-node-e2e-images
  gci-family:
-    image_regex: gci-beta-56-9000-80-0 # docker 1.11.2
+    image_regex: gci-stable-56-9000-84-2 # docker 1.11.2
    project: google-containers
    metadata: "user-data<test/e2e_node/jenkins/gci-init.yaml,gci-update-strategy=update_disabled"