Skip to content

Commit

Permalink
Merge pull request #114 from Nordix/minikube-mael
Browse files Browse the repository at this point in the history
Temporary workaround for kubernetes/minikube#5751
  • Loading branch information
metal3-io-bot authored Oct 29, 2019
2 parents 14a5722 + 5a35ac5 commit 47c0049
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions 03_launch_mgmt_cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -151,7 +151,7 @@ function launch_cluster_api_provider_baremetal() {
else
make deploy
fi
popd
popd
}
clone_repos
Expand All @@ -166,7 +166,7 @@ if [ "${V1ALPHA2_SWITCH}" == true ]; then
fi
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
Expand Down
2 changes: 1 addition & 1 deletion lib/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 47c0049

Please sign in to comment.