From 7a75d9295bb54b51555c7e4522b6b7b7a7e605bd Mon Sep 17 00:00:00 2001 From: maelk Date: Tue, 29 Oct 2019 13:51:31 +0200 Subject: [PATCH] Temporary workaround for kubernetes/minikube#5751 Will be removed when Minikube 1.5.1 is released --- 03_launch_mgmt_cluster.sh | 9 +++++---- lib/common.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/03_launch_mgmt_cluster.sh b/03_launch_mgmt_cluster.sh index e0efce5ea..6bbe5d312 100755 --- a/03_launch_mgmt_cluster.sh +++ b/03_launch_mgmt_cluster.sh @@ -34,7 +34,7 @@ CAPBMREPO="${CAPBMREPO:-https://github.com/metal3-io/cluster-api-provider-bareme if [ "${V1ALPHA2_SWITCH}" == true ]; then CAPBMBRANCH="${CAPBMBRANCH:-v1alpha2}" -else +else CAPBMBRANCH="${CAPBMBRANCH:-master}" fi @@ -137,7 +137,7 @@ function apply_bm_hosts() { # function launch_cluster_api_provider_baremetal() { pushd "${CAPBMPATH}" - + if [ "${CAPBM_RUN_LOCAL}" == true ]; then touch capbm.out.log touch capbm.err.log @@ -151,7 +151,7 @@ function launch_cluster_api_provider_baremetal() { else make deploy fi - popd + popd } clone_repos @@ -165,8 +165,9 @@ if [ "${V1ALPHA2_SWITCH}" == true ]; then fi fi +sudo su -l -c 'minikube delete' "${USER}" init_minikube -sudo su -l -c 'minikube start' "${USER}" +sudo su -l -c 'minikube start --docker-opt="default-ulimit=nofile=102400:102400"' "${USER}" sudo su -l -c 'minikube ssh sudo ip addr add 172.22.0.2/24 dev eth2' "${USER}" launch_baremetal_operator apply_bm_hosts diff --git a/lib/common.sh b/lib/common.sh index 73a50a527..548bb9f1d 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -287,7 +287,7 @@ differs(){ function init_minikube() { #If the vm exists, it has already been initialized if [[ "$(sudo virsh list --all)" != *"minikube"* ]]; then - sudo su -l -c "minikube start --insecure-registry 192.168.111.1:5000" "$USER" + sudo su -l -c 'minikube start --insecure-registry 192.168.111.1:5000 --docker-opt="default-ulimit=nofile=102400:102400"' "$USER" # Pre-pull the image to reduce pod initialization time for IMAGE_VAR in IRONIC_IMAGE IPA_DOWNLOADER_IMAGE IRONIC_INSPECTOR_IMAGE BAREMETAL_OPERATOR_IMAGE; do IMAGE=${!IMAGE_VAR}