Merge pull request #66052 from lubinsz/master

Automatic merge from submit-queue (batch tested with PRs 66085, 66052). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. use pause image with fat-manifest What this PR does / why we need it: Pause manifest code is merged in #57723, so we should use new image in test. Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged): Fixes # Special notes for your reviewer: Release note:

Merge pull request #66052 from lubinsz/master
f0e2a249 · Kubernetes Submit Queue · GitHub · d744c6ea · 773ab3ff · f0e2a249
Unverified Commit f0e2a249 authored Aug 27, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 27, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

template_test.go cmd/kubeadm/app/util/template_test.go +3 -3

No files found.
--- a/cmd/kubeadm/app/util/template_test.go
+++ b/cmd/kubeadm/app/util/template_test.go
@@ -21,9 +21,9 @@ import (
 )
 const (
-	validTmpl    = "image: {{ .ImageRepository }}/pause-{{ .Arch }}:3.1"
+	validTmpl    = "image: {{ .ImageRepository }}/pause:3.1"
-	validTmplOut = "image: k8s.gcr.io/pause-amd64:3.1"
+	validTmplOut = "image: k8s.gcr.io/pause:3.1"
-	doNothing    = "image: k8s.gcr.io/pause-amd64:3.1"
+	doNothing    = "image: k8s.gcr.io/pause:3.1"
 	invalidTmpl1 = "{{ .baz }/d}"
 	invalidTmpl2 = "{{ !foobar }}"
 )