Skip to content

Commit

Permalink
Merge pull request #546 from nerdalert/brent-enable-kind-debug
Browse files Browse the repository at this point in the history
Enable KIND debugging in ovn-kind-cno
  • Loading branch information
openshift-merge-robot committed Mar 26, 2020
2 parents 74e8036 + 727a913 commit 833e3fc
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions hack/ovn-kind-cno.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ CLUSTER_CIDR=${CLUSTER_CIDR:-"172.16.0.0/16"}
SERVICE_NETWORK=${SERVICE_NETWORK:-"172.30.0.0/16"}
# Skip the comment lines and retrieve the number of Master nodes from kind.yaml file.
NUM_MASTER_NODES=`grep "^[^#]" kind.yaml | grep -c "role\: control-plane"`
OVN_KIND_VERBOSITY=${OVN_KIND_VERBOSITY:-0}

# Check for docker
if ! command -v docker; then
Expand Down Expand Up @@ -40,7 +41,7 @@ if ! sudo iptables -C DOCKER-USER -j ACCEPT > /dev/null 2>&1; then
fi

# Create KIND cluster
kind create cluster --name ovn --kubeconfig ${HOME}/admin.conf --image kindest/node:${K8S_VERSION} --config=./kind.yaml
kind create cluster --name ovn --kubeconfig ${HOME}/admin.conf --image kindest/node:${K8S_VERSION} --config=./kind.yaml -v ${OVN_KIND_VERBOSITY}
export KUBECONFIG=${HOME}/admin.conf
mkdir -p /tmp/kind
sudo chmod 777 /tmp/kind
Expand Down Expand Up @@ -73,7 +74,7 @@ if [ "$BUILD_CNO" = true ]; then
exit 1
fi
echo "Loading CNO image into KIND"
kind load docker-image $CNO_IMAGE --name ovn
kind load docker-image $CNO_IMAGE --name ovn -v ${OVN_KIND_VERBOSITY}
popd
fi

Expand All @@ -94,7 +95,7 @@ COPY ovnkube.sh /root/
EOF
popd
echo "Loading OVN-K8S docker image into KIND"
kind load docker-image origin-ovn-kubernetes:dev --name ovn
kind load docker-image origin-ovn-kubernetes:dev --name ovn -v ${OVN_KIND_VERBOSITY}
popd
fi

Expand Down

0 comments on commit 833e3fc

Please sign in to comment.