From 4dd2152fae8123ca9573bf716839ab8d93f16d5d Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 10 Apr 2020 01:42:58 -0700 Subject: [PATCH 1/3] update crio version in kicbase --- hack/images/kicbase.Dockerfile | 6 +++--- pkg/drivers/kic/types.go | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hack/images/kicbase.Dockerfile b/hack/images/kicbase.Dockerfile index 5afbe6e146ad..97a29b73710b 100644 --- a/hack/images/kicbase.Dockerfile +++ b/hack/images/kicbase.Dockerfile @@ -2,7 +2,7 @@ ARG COMMIT_SHA # using base image created by kind https://github.com/kubernetes-sigs/kind/blob/master/images/base/Dockerfile # which is an ubuntu 19.10 with an entry-point that helps running systemd # could be changed to any debian that can run systemd -FROM kindest/base:v20200122-2dfe64b2 as base +FROM kindest/base:v20200317-92225082 as base USER root # specify version of everything explicitly using 'apt-cache policy' RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -19,9 +19,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_19.10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \ curl -LO https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_19.10/Release.key && \ apt-key add - < Release.key && apt-get update && \ - apt-get install -y --no-install-recommends cri-o-1.17=1.17.0-3 + apt-get install -y --no-install-recommends cri-o-1.17=1.17.2~1 # install podman -RUN apt-get install -y --no-install-recommends podman=1.8.2~1 +RUN apt-get install -y --no-install-recommends podman=1.8.2~144 # disable non-docker runtimes by default RUN systemctl disable containerd && systemctl disable crio && rm /etc/crictl.yaml # enable docker which is default diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index d31aac0b850a..2b01019b2ed8 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -30,13 +30,12 @@ const ( DefaultPodCIDR = "10.244.0.0/16" // Version is the current version of kic - Version = "v0.0.8" + Version = "v0.0.9" // SHA of the kic base image - baseImageSHA = "2f3380ebf1bb0c75b0b47160fd4e61b7b8fef0f1f32f9def108d3eada50a7a81" - + baseImageSHA = "82a826cc03c3e59ead5969b8020ca138de98f366c1907293df91fc57205dbb53" // OverlayImage is the cni plugin used for overlay image, created by kind. // CNI plugin image used for kic drivers created by kind. - OverlayImage = "kindest/kindnetd:0.5.3" + OverlayImage = "kindest/kindnetd:0.5.4" ) var ( From 204e469eeb3340cec118daec7b6cd6ab255b0ae2 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 10 Apr 2020 03:10:06 -0700 Subject: [PATCH 2/3] increase time out for dashboard --- test/integration/start_stop_delete_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index fc3462261fad..ccf16708829a 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -135,10 +135,10 @@ func TestStartStop(t *testing.T) { if strings.Contains(tc.name, "cni") { t.Logf("WARNING: cni mode requires additional setup before pods can schedule :(") } else { - if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(4)); err != nil { + if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(7)); err != nil { t.Fatalf("failed waiting for pod 'busybox' post-stop-start: %v", err) } - if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(4)); err != nil { + if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(7)); err != nil { t.Fatalf("failed waiting for 'addon dashboard' pod post-stop-start: %v", err) } } From 10f924df4a5d1a7a5312424fb220970b28adf485 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 10 Apr 2020 03:58:22 -0700 Subject: [PATCH 3/3] increase dashboard more --- test/integration/start_stop_delete_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index ccf16708829a..593019c06f08 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -138,7 +138,7 @@ func TestStartStop(t *testing.T) { if _, err := PodWait(ctx, t, profile, "default", "integration-test=busybox", Minutes(7)); err != nil { t.Fatalf("failed waiting for pod 'busybox' post-stop-start: %v", err) } - if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(7)); err != nil { + if _, err := PodWait(ctx, t, profile, "kubernetes-dashboard", "k8s-app=kubernetes-dashboard", Minutes(9)); err != nil { t.Fatalf("failed waiting for 'addon dashboard' pod post-stop-start: %v", err) } }