updates pause image references
The pause:3.6 image has been published. Also updates older / incorrect references.
This commit is contained in:
@@ -399,7 +399,7 @@ const (
|
||||
ModeNode string = "Node"
|
||||
|
||||
// PauseVersion indicates the default pause image version for kubeadm
|
||||
PauseVersion = "3.5"
|
||||
PauseVersion = "3.6"
|
||||
|
||||
// CgroupDriverSystemd holds the systemd driver type
|
||||
CgroupDriverSystemd = "systemd"
|
||||
|
@@ -120,11 +120,11 @@ func TestBuildKubeletArgMap(t *testing.T) {
|
||||
nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
|
||||
CRISocket: "/var/run/dockershim.sock",
|
||||
},
|
||||
pauseImage: "gcr.io/pause:3.5",
|
||||
pauseImage: "k8s.gcr.io/pause:3.6",
|
||||
},
|
||||
expected: map[string]string{
|
||||
"network-plugin": "cni",
|
||||
"pod-infra-container-image": "gcr.io/pause:3.5",
|
||||
"pod-infra-container-image": "k8s.gcr.io/pause:3.6",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
@@ -21,9 +21,9 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
validTmpl = "image: {{ .ImageRepository }}/pause:3.5"
|
||||
validTmplOut = "image: k8s.gcr.io/pause:3.5"
|
||||
doNothing = "image: k8s.gcr.io/pause:3.5"
|
||||
validTmpl = "image: {{ .ImageRepository }}/pause:3.6"
|
||||
validTmplOut = "image: k8s.gcr.io/pause:3.6"
|
||||
doNothing = "image: k8s.gcr.io/pause:3.6"
|
||||
invalidTmpl1 = "{{ .baz }/d}"
|
||||
invalidTmpl2 = "{{ !foobar }}"
|
||||
)
|
||||
|
@@ -28,7 +28,7 @@ import (
|
||||
const (
|
||||
// When these values are updated, also update test/utils/image/manifest.go
|
||||
defaultPodSandboxImageName = "k8s.gcr.io/pause"
|
||||
defaultPodSandboxImageVersion = "3.5"
|
||||
defaultPodSandboxImageVersion = "3.6"
|
||||
)
|
||||
|
||||
var (
|
||||
|
Reference in New Issue
Block a user