kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pause: bump to newest image v3.4.1

pull/10666/head
Predrag Rogic 2021-03-01 16:41:29 +00:00
parent 2aa2d1fb8d
commit 50a1d239b1
No known key found for this signature in database
GPG Key ID: F1FF5748C4855229
11 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/master.yml vendored
View File

@ -1343,7 +1343,6 @@ jobs:
if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi
if [ "$numPass" -lt 7 ];then echo "*** Failed to pass at least 7 ! ***";exit 2;fi if [ "$numPass" -lt 7 ];then echo "*** Failed to pass at least 7 ! ***";exit 2;fi
preload_dockerflags_docker_ubuntu: preload_dockerflags_docker_ubuntu:
# TestPause was removed due to https://github.com/kubernetes/minikube/issues/9568
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
env: env:
TIME_ELAPSED: time TIME_ELAPSED: time
@ -1398,7 +1397,7 @@ jobs:
chmod a+x e2e-* chmod a+x e2e-*
chmod a+x minikube-* chmod a+x minikube-*
START_TIME=$(date -u +%s) START_TIME=$(date -u +%s)
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestDockerFlags|TestPreload)" -test.timeout=30m -test.v -timeout-multiplier=1.2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestPause|TestDockerFlags|TestPreload)" -test.timeout=30m -test.v -timeout-multiplier=1.2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
END_TIME=$(date -u +%s) END_TIME=$(date -u +%s)
TIME_ELAPSED=$(($END_TIME-$START_TIME)) TIME_ELAPSED=$(($END_TIME-$START_TIME))
min=$((${TIME_ELAPSED}/60)) min=$((${TIME_ELAPSED}/60))

3
.github/workflows/pr.yml vendored
View File

@ -1340,7 +1340,6 @@ jobs:
if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi
if [ "$numPass" -lt 7 ];then echo "*** Failed to pass at least 7 ! ***";exit 2;fi if [ "$numPass" -lt 7 ];then echo "*** Failed to pass at least 7 ! ***";exit 2;fi
preload_dockerflags_docker_ubuntu: preload_dockerflags_docker_ubuntu:
# TestPause was removed due to https://github.com/kubernetes/minikube/issues/9568
runs-on: ubuntu-18.04 runs-on: ubuntu-18.04
env: env:
TIME_ELAPSED: time TIME_ELAPSED: time
@ -1395,7 +1394,7 @@ jobs:
chmod a+x e2e-* chmod a+x e2e-*
chmod a+x minikube-* chmod a+x minikube-*
START_TIME=$(date -u +%s) START_TIME=$(date -u +%s)
KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestDockerFlags|TestPreload)" -test.timeout=30m -test.v -timeout-multiplier=1.2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-linux-amd64 -minikube-start-args=--driver=docker -test.run "(TestPause|TestDockerFlags|TestPreload)" -test.timeout=30m -test.v -timeout-multiplier=1.2 -binary=./minikube-linux-amd64 2>&1 | tee ./report/testout.txt
END_TIME=$(date -u +%s) END_TIME=$(date -u +%s)
TIME_ELAPSED=$(($END_TIME-$START_TIME)) TIME_ELAPSED=$(($END_TIME-$START_TIME))
min=$((${TIME_ELAPSED}/60)) min=$((${TIME_ELAPSED}/60))

2
deploy/addons/gvisor/gvisor-config.toml
View File

@ -29,7 +29,7 @@ oom_score = 0
stream_server_address = "" stream_server_address = ""
stream_server_port = "10010" stream_server_port = "10010"
enable_selinux = false enable_selinux = false
sandbox_image = "{{default "k8s.gcr.io" .ImageRepository}}/pause:3.1" sandbox_image = "{{default "k8s.gcr.io" .ImageRepository}}/pause:3.4.1"
stats_collect_period = 10 stats_collect_period = 10
systemd_cgroup = false systemd_cgroup = false
enable_tls_streaming = false enable_tls_streaming = false

2
deploy/iso/minikube-iso/package/containerd-bin/config.toml
View File

@ -54,7 +54,7 @@ oom_score = 0
stream_idle_timeout = "4h0m0s" stream_idle_timeout = "4h0m0s"
enable_selinux = false enable_selinux = false
selinux_category_range = 1024 selinux_category_range = 1024
sandbox_image = "k8s.gcr.io/pause:3.2" sandbox_image = "k8s.gcr.io/pause:3.4.1"
stats_collect_period = 10 stats_collect_period = 10
systemd_cgroup = true systemd_cgroup = true
enable_tls_streaming = false enable_tls_streaming = false

2
deploy/iso/minikube-iso/package/containerd-bin/config.toml.default
View File

@ -54,7 +54,7 @@ oom_score = 0
stream_idle_timeout = "4h0m0s" stream_idle_timeout = "4h0m0s"
enable_selinux = false enable_selinux = false
selinux_category_range = 1024 selinux_category_range = 1024
sandbox_image = "k8s.gcr.io/pause:3.2" sandbox_image = "k8s.gcr.io/pause:3.4.1"
stats_collect_period = 10 stats_collect_period = 10
systemd_cgroup = false systemd_cgroup = false
enable_tls_streaming = false enable_tls_streaming = false

2
deploy/iso/minikube-iso/package/crio-bin/crio.conf
View File

@ -339,7 +339,7 @@ global_auth_file = ""
# The image used to instantiate infra containers. # The image used to instantiate infra containers.
# This option supports live configuration reload. # This option supports live configuration reload.
pause_image = "k8s.gcr.io/pause:3.2" pause_image = "k8s.gcr.io/pause:3.4.1"
# The path to a file containing credentials specific for pulling the pause_image from # The path to a file containing credentials specific for pulling the pause_image from
# above. The file is similar to that of /var/lib/kubelet/config.json # above. The file is similar to that of /var/lib/kubelet/config.json

2
deploy/iso/minikube-iso/package/crio-bin/crio.conf.default
View File

@ -339,7 +339,7 @@ global_auth_file = ""
# The image used to instantiate infra containers. # The image used to instantiate infra containers.
# This option supports live configuration reload. # This option supports live configuration reload.
pause_image = "k8s.gcr.io/pause:3.2" pause_image = "k8s.gcr.io/pause:3.4.1"
# The path to a file containing credentials specific for pulling the pause_image from # The path to a file containing credentials specific for pulling the pause_image from
# above. The file is similar to that of /var/lib/kubelet/config.json # above. The file is similar to that of /var/lib/kubelet/config.json

4
pkg/minikube/assets/addons.go
View File

@ -356,10 +356,10 @@ var Addons = map[string]*Addon{
}, false, "registry-aliases", map[string]string{ }, false, "registry-aliases", map[string]string{
"CoreDNSPatcher": "rhdevelopers/core-dns-patcher@sha256:9220ff32f690c3d889a52afb59ca6fcbbdbd99e5370550cc6fd249adea8ed0a9", "CoreDNSPatcher": "rhdevelopers/core-dns-patcher@sha256:9220ff32f690c3d889a52afb59ca6fcbbdbd99e5370550cc6fd249adea8ed0a9",
"Alpine": "alpine:3.11@sha256:0bd0e9e03a022c3b0226667621da84fc9bf562a9056130424b5bfbd8bcb0397f", "Alpine": "alpine:3.11@sha256:0bd0e9e03a022c3b0226667621da84fc9bf562a9056130424b5bfbd8bcb0397f",
"Pause": "google_containers/pause:3.1@sha256:f78411e19d84a252e53bff71a4407a5686c46983a2c2eeed83929b888179acea", "Pause": "pause:3.4.1@sha256:6c3835cab3980f11b83277305d0d736051c32b17606f5ec59f1dda67c9ba3810",
}, map[string]string{ }, map[string]string{
"CoreDNSPatcher": "quay.io", "CoreDNSPatcher": "quay.io",
"Pause": "gcr.io", "Pause": "k8s.gcr.io",
}), }),
"freshpod": NewAddon([]*BinAsset{ "freshpod": NewAddon([]*BinAsset{
MustBinAsset( MustBinAsset(

2
pkg/minikube/bootstrapper/bsutil/kubelet_test.go
View File

@ -166,7 +166,7 @@ Wants=docker.socket
[Service] [Service]
ExecStart= ExecStart=
ExecStart=/var/lib/minikube/binaries/v1.18.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.2 --pod-manifest-path=/etc/kubernetes/manifests ExecStart=/var/lib/minikube/binaries/v1.18.2/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-domain=cluster.local --config=/var/lib/kubelet/config.yaml --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.4.1 --pod-manifest-path=/etc/kubernetes/manifests
[Install] [Install]
`, `,

4
pkg/minikube/bootstrapper/images/images.go
View File

@ -29,8 +29,8 @@ import (
// Pause returns the image name to pull for a given Kubernetes version // Pause returns the image name to pull for a given Kubernetes version
func Pause(v semver.Version, mirror string) string { func Pause(v semver.Version, mirror string) string {
// Should match `PauseVersion` in: // Should match `PauseVersion` in:
// https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/constants/constants_unix.go // https://github.com/kubernetes/kubernetes/blob/master/cmd/kubeadm/app/constants/constants.go
pv := "3.2" pv := "3.4.1"
if semver.MustParseRange("<1.18.0-alpha.0")(v) { if semver.MustParseRange("<1.18.0-alpha.0")(v) {
pv = "3.1" pv = "3.1"
} }

10
test/integration/functional_test.go
View File

@ -431,8 +431,8 @@ func validateExtraConfig(ctx context.Context, t *testing.T, profile string) {
func imageID(image string) string { func imageID(image string) string {
ids := map[string]map[string]string{ ids := map[string]map[string]string{
"pause": { "pause": {
"amd64": "0184c1613d929", "amd64": "0184c1613d92",
"arm64": "3d18732f8686c", "arm64": "3d18732f8686",
}, },
} }
@ -637,7 +637,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
t.Run("cache", func(t *testing.T) { t.Run("cache", func(t *testing.T) {
t.Run("add_remote", func(t *testing.T) { t.Run("add_remote", func(t *testing.T) {
for _, img := range []string{"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:3.3", "k8s.gcr.io/pause:latest"} { for _, img := range []string{"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:3.3", "k8s.gcr.io/pause:3.4.1"} {
rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "cache", "add", img)) rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "cache", "add", img))
if err != nil { if err != nil {
t.Errorf("failed to 'cache add' remote image %q. args %q err %v", img, rr.Command(), err) t.Errorf("failed to 'cache add' remote image %q. args %q err %v", img, rr.Command(), err)
@ -710,7 +710,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
}) })
t.Run("cache_reload", func(t *testing.T) { // deleting image inside minikube node manually and expecting reload to bring it back t.Run("cache_reload", func(t *testing.T) { // deleting image inside minikube node manually and expecting reload to bring it back
img := "k8s.gcr.io/pause:latest" img := "k8s.gcr.io/pause:3.4.1"
// deleting image inside minikube node manually // deleting image inside minikube node manually
var binary string var binary string
@ -745,7 +745,7 @@ func validateCacheCmd(ctx context.Context, t *testing.T, profile string) {
// delete will clean up the cached images since they are global and all other tests will load it for no reason // delete will clean up the cached images since they are global and all other tests will load it for no reason
t.Run("delete", func(t *testing.T) { t.Run("delete", func(t *testing.T) {
for _, img := range []string{"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:latest"} { for _, img := range []string{"k8s.gcr.io/pause:3.1", "k8s.gcr.io/pause:3.4.1"} {
rr, err := Run(t, exec.CommandContext(ctx, Target(), "cache", "delete", img)) rr, err := Run(t, exec.CommandContext(ctx, Target(), "cache", "delete", img))
if err != nil { if err != nil {
t.Errorf("failed to delete %s from cache. args %q: %v", img, rr.Command(), err) t.Errorf("failed to delete %s from cache. args %q: %v", img, rr.Command(), err)