Skip to content

Commit

Permalink
Fix OVN Image
Browse files Browse the repository at this point in the history
Use local image for non-ic deployment as well as the old image
is not working with latest code.

Signed-off-by: Aswin Suryanarayanan <[email protected]>
  • Loading branch information
aswinsuryan authored and sridhargaddam committed Oct 4, 2023
1 parent c54eab0 commit 2a7fc97
Showing 1 changed file with 2 additions and 37 deletions.
39 changes: 2 additions & 37 deletions scripts/shared/lib/clusters_kind
Original file line number Diff line number Diff line change
Expand Up @@ -236,28 +236,9 @@ function provider_failed() {
fi
}

# If any of the clusters use OVN-K as the CNI then clone the
# ovn-kubernetes repo from master in order to access the required
# kind scripts, and manifest generation templates.
function download_ovnk() {
echo "Cloning ovn-kubernetes source"
mkdir -p ovn-kubernetes
# We only need the contrib directory, use a sparse checkout
(
cd ovn-kubernetes || exit
git init
git config core.sparseCheckout true
echo contrib/ > .git/info/sparse-checkout
echo dist/ >> .git/info/sparse-checkout
if git remote add -f origin https://github.com/ovn-org/ovn-kubernetes.git; then
git pull origin master
else
git fetch && git reset --hard origin/master
fi
)
}
function prepare_ovn() {
export OVN_IMAGE="localhost:5000/ovn-daemonset-f:latest"

function prepare_ovn_ic() {
echo "Building ovn-kubernetes with interconnect (OVN-IC) from source"
echo "This will become unnecessary if OVN CI image publishing is fixed"
echo "https://github.com/ovn-org/ovn-kubernetes/actions/workflows/docker.yml"
Expand All @@ -276,22 +257,6 @@ function prepare_ovn_ic() {
popd || exit
}

function prepare_ovn() {
export OVN_IMAGE="localhost:5000/ovn-daemonset-f:latest"

if [[ "$OVN_IC" = true ]]; then
prepare_ovn_ic
return
fi

download_ovnk

local OVN_SRC_IMAGE="ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-f:master"
docker pull "${OVN_SRC_IMAGE}"
docker tag "${OVN_SRC_IMAGE}" "${OVN_IMAGE}"
docker push "${OVN_IMAGE}"
}

function provider_prepare() {
[[ -z "${K8S_VERSION}" ]] && K8S_VERSION="${DEFAULT_K8S_VERSION}"
[[ -n "${kind_k8s_versions[$K8S_VERSION]}" ]] && K8S_VERSION="${kind_k8s_versions[$K8S_VERSION]}"
Expand Down

0 comments on commit 2a7fc97

Please sign in to comment.