Merge branch 'master' of github.com:kubernetes/minikube into crio

hack/jenkins/linux_integration_tests_docker_crio.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Copyright 2019 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This script runs the integration tests on a Linux machine for the KVM Driver
+
+# The script expects the following env variables:
+# MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
+# COMMIT: Actual commit ID from upstream build
+# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
+# access_token: The Github API access token. Injected by the Jenkins credential provider. 
+
+set -e
+
+OS_ARCH="linux-amd64"
+VM_DRIVER="docker"
+JOB_NAME="Docker_Linux_crio"
+CONTAINER_RUNTIME="crio"
+
+
+
+mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
+sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
+
+# removing possible left over docker containers from previous runs
+docker rm -f -v $(docker ps -aq) >/dev/null 2>&1 || true
+
+source ./common.sh

hack/jenkins/linux_integration_tests_kvm_containerd.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Copyright 2019 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This script runs the integration tests on a Linux machine for the KVM Driver
+
+# The script expects the following env variables:
+# MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
+# COMMIT: Actual commit ID from upstream build
+# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
+# access_token: The Github API access token. Injected by the Jenkins credential provider. 
+
+set -e
+
+OS_ARCH="linux-amd64"
+VM_DRIVER="kvm2"
+JOB_NAME="KVM_Linux_containerd"
+CONTAINER_RUNTIME="containerd"
+
+
+
+mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
+sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
+
+sudo apt-get update
+sudo apt-get -y install qemu-system libvirt-clients libvirt-daemon-system ebtables iptables dnsmasq
+sudo adduser jenkins libvirt || true
+
+source ./common.sh

hack/jenkins/linux_integration_tests_kvm_crio.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Copyright 2019 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This script runs the integration tests on a Linux machine for the KVM Driver
+
+# The script expects the following env variables:
+# MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
+# COMMIT: Actual commit ID from upstream build
+# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
+# access_token: The Github API access token. Injected by the Jenkins credential provider. 
+
+set -e
+
+OS_ARCH="linux-amd64"
+VM_DRIVER="kvm2"
+JOB_NAME="KVM_Linux_crio"
+CONTAINER_RUNTIME="crio"
+
+
+
+mkdir -p cron && gsutil -qm rsync "gs://minikube-builds/${MINIKUBE_LOCATION}/cron" cron || echo "FAILED TO GET CRON FILES"
+sudo install cron/cleanup_and_reboot_Linux.sh /etc/cron.hourly/cleanup_and_reboot || echo "FAILED TO INSTALL CLEANUP"
+
+sudo apt-get update
+sudo apt-get -y install qemu-system libvirt-clients libvirt-daemon-system ebtables iptables dnsmasq
+sudo adduser jenkins libvirt || true
+
+source ./common.sh

hack/jenkins/minikube_set_pending.sh

@@ -32,16 +32,19 @@ if [ "${ghprbPullId}" == "master" ]; then
 fi
 
 jobs=(
-     'HyperKit_Functional_macOS'
+     # 'HyperKit_Functional_macOS'
      'Hyper-V_Windows'
      'VirtualBox_Linux'
      # 'VirtualBox_macOS'
      'VirtualBox_Windows'
      # 'KVM-GPU_Linux' - Disabled
      'KVM_Linux'
+     'KVM_Linux_containerd'
+     'KVM_Linux_crio'
      'none_Linux'
      'Docker_Linux'
      'Docker_Linux_containerd'
+     'Docker_Linux_crio'
      # 'Docker_macOS'
      'Docker_Windows'
      # 'Podman_Linux'

pkg/minikube/bootstrapper/bsutil/ktmpl/kubelet.go

@@ -33,11 +33,11 @@ ExecStart={{.KubeletPath}}{{if .ExtraOptions}} {{.ExtraOptions}}{{end}}
 var KubeletServiceTemplate = template.Must(template.New("kubeletServiceTemplate").Parse(`[Unit]
 Description=kubelet: The Kubernetes Node Agent
 Documentation=http://kubernetes.io/docs/
+StartLimitIntervalSec=0
 
 [Service]
 ExecStart={{.KubeletPath}}
 Restart=always
-StartLimitInterval=0
 # Tuned for local dev: faster than upstream default (10s), but slower than systemd default (100ms)
 RestartSec=600ms
 

pkg/minikube/command/kic_runner.go

@@ -186,17 +186,13 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error {
 		}
 	}
 	klog.Infof("%s (temp): %s --> %s (%d bytes)", k.ociBin, src, dst, f.GetLength())
-	tmpFolder := ""
 
-	// Snap only allows an application to see its own files in /tmp, making Docker unable to copy memory assets
-	// https://github.com/kubernetes/minikube/issues/10020
-	if isSnapBinary() {
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return errors.Wrap(err, "detecting home dir")
-		}
-		tmpFolder = home
+	isSnap := isSnapBinary()
+	tmpFolder, err := tempDirectory(isSnap)
+	if err != nil {
+		return errors.Wrap(err, "determining temp directory")
 	}
+
 	tf, err := ioutil.TempFile(tmpFolder, "tmpf-memory-asset")
 	if err != nil {
 		return errors.Wrap(err, "creating temporary file")
@@ -209,6 +205,24 @@ func (k *kicRunner) Copy(f assets.CopyableFile) error {
 	return k.copy(tf.Name(), dst)
 }
 
+// tempDirectory returns the directory to use as the temp directory
+// or an empty string if it should use the os default temp directory.
+func tempDirectory(isSnap bool) (string, error) {
+	if !isSnap {
+		return "", nil
+	}
+
+	// Snap only allows an application to see its own files in /tmp, making Docker unable to copy memory assets
+	// https://github.com/kubernetes/minikube/issues/10020
+
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return "", errors.Wrap(err, "detecting home dir")
+	}
+	return home, nil
+}
+
+// isSnapBinary returns true if the binary path includes "snap".
 func isSnapBinary() bool {
 	ex, err := os.Executable()
 	if err != nil {

pkg/minikube/command/kic_runner_test.go

@@ -0,0 +1,54 @@
+/*
+Copyright 2019 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package command
+
+import (
+	"os"
+	"testing"
+)
+
+func TestKICRunner(t *testing.T) {
+	t.Parallel()
+
+	t.Run("TestTempDirectory", func(t *testing.T) {
+		t.Parallel()
+
+		home, err := os.UserHomeDir()
+		if err != nil {
+			t.Fatalf("failed to get user home directory: %v", err)
+		}
+
+		tests := []struct {
+			in   bool
+			want string
+		}{
+			{false, ""},
+			{true, home},
+		}
+
+		for _, tt := range tests {
+			got, err := tempDirectory(tt.in)
+			if err != nil {
+				t.Fatalf("failed to get temp directory: %v", err)
+			}
+
+			if got != tt.want {
+				t.Errorf("tempDirectory(%t) = %s; want %s", tt.in, got, tt.want)
+			}
+		}
+	})
+}

pkg/provision/buildroot.go

@@ -76,12 +76,12 @@ Description=Docker Application Container Engine
 Documentation=https://docs.docker.com
 After=network.target  minikube-automount.service docker.socket
 Requires= minikube-automount.service docker.socket 
+StartLimitBurst=3
+StartLimitIntervalSec=60
 
 [Service]
 Type=notify
 Restart=on-failure
-StartLimitBurst=3
-StartLimitIntervalSec=60
 `
 	if noPivot {
 		klog.Warning("Using fundamentally insecure --no-pivot option")

pkg/provision/ubuntu.go

@@ -79,12 +79,12 @@ BindsTo=containerd.service
 After=network-online.target firewalld.service containerd.service
 Wants=network-online.target
 Requires=docker.socket
+StartLimitBurst=3
+StartLimitIntervalSec=60
 
 [Service]
 Type=notify
 Restart=on-failure
-StartLimitBurst=3
-StartLimitIntervalSec=60
 `
 	if noPivot {
 		klog.Warning("Using fundamentally insecure --no-pivot option")