From 92bc986718978014c03621028c71ef9475f12375 Mon Sep 17 00:00:00 2001 From: Paulo Pires Date: Thu, 27 Oct 2016 15:55:01 -0400 Subject: [PATCH 1/2] Fixes PR #35652 --- pkg/util/mount/mount_unsupported.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/util/mount/mount_unsupported.go b/pkg/util/mount/mount_unsupported.go index c22ba30bdb8f..cf7ba8ae6d78 100644 --- a/pkg/util/mount/mount_unsupported.go +++ b/pkg/util/mount/mount_unsupported.go @@ -18,7 +18,10 @@ limitations under the License. package mount -type Mounter struct{} +type Mounter struct { + mounterPath string + mounterRootfsPath string +} func (mounter *Mounter) Mount(source string, target string, fstype string, options []string) error { return nil From 766e9954ca836b69352d04f4e6a96b18b425219e Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Thu, 27 Oct 2016 12:24:29 -0700 Subject: [PATCH 2/2] update rkt to v1.18.0 which avoids outputting debug information by default Signed-off-by: Vishnu kannan Signed-off-by: Jess Frazelle --- cluster/gce/gci/configure.sh | 4 ++-- pkg/util/mount/mount_unsupported.go | 5 +---- test/e2e_node/jenkins/gci-init.yaml | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index c28cac013509..b9e985f822eb 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -99,8 +99,8 @@ function split-commas { } function install-rkt { - local -r rkt_binary="rkt-v1.17.0" - local -r rkt_sha1="e9183dcae0683e345cc73fef98ffd80a253d371a" + local -r rkt_binary="rkt-v1.18.0" + local -r rkt_sha1="75fc8f29c79bc9e505f3e7f6e8fadf2425c21967" download-or-bust "${rkt_sha1}" "https://storage.googleapis.com/kubernetes-release/rkt/${rkt_binary}" local -r rkt_dst="${KUBE_HOME}/bin/rkt" mv "${KUBE_HOME}/${rkt_binary}" "${rkt_dst}" diff --git a/pkg/util/mount/mount_unsupported.go b/pkg/util/mount/mount_unsupported.go index cf7ba8ae6d78..c22ba30bdb8f 100644 --- a/pkg/util/mount/mount_unsupported.go +++ b/pkg/util/mount/mount_unsupported.go @@ -18,10 +18,7 @@ limitations under the License. package mount -type Mounter struct { - mounterPath string - mounterRootfsPath string -} +type Mounter struct{} func (mounter *Mounter) Mount(source string, target string, fstype string, options []string) error { return nil diff --git a/test/e2e_node/jenkins/gci-init.yaml b/test/e2e_node/jenkins/gci-init.yaml index 10e2a4a54702..fe85d338f502 100644 --- a/test/e2e_node/jenkins/gci-init.yaml +++ b/test/e2e_node/jenkins/gci-init.yaml @@ -6,5 +6,5 @@ runcmd: - mkdir -p /home/kubernetes/bin/ - mount -B /home/kubernetes/bin /home/kubernetes/bin - mount -B -o remount,exec /home/kubernetes/bin - - wget https://storage.googleapis.com/kubernetes-release/rkt/rkt-v1.17.0 -O /home/kubernetes/bin/rkt + - wget https://storage.googleapis.com/kubernetes-release/rkt/rkt-v1.18.0 -O /home/kubernetes/bin/rkt - chmod a+x /home/kubernetes/bin/rkt