Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OVN Image and commit #1528

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Update OVN Image and commit #1528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package/Dockerfile.shipyard-dapper-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} PATH=/go/bin:/root/.l
# - Any unnecessary packages and executables
RUN dnf -y install --nodocs --setopt=install_weak_deps=False \
gcc git-core curl moby-engine make golang kubernetes-client \
findutils moreutils upx jq gitlint procps-ng \
findutils moreutils upx jq gitlint procps-ng pip\
aswinsuryan marked this conversation as resolved.
Show resolved Hide resolved
qemu-user-static python3-jinja2-cli skopeo file unzip gh && \
rpm -e --nodeps containerd && \
rpm -qa "selinux*" | xargs -r rpm -e --nodeps && \
Expand Down
14 changes: 5 additions & 9 deletions scripts/shared/lib/clusters_kind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,20 +243,16 @@ function provider_failed() {
function prepare_ovn() {
export OVN_IMAGE="localhost:5000/ovn-daemonset-f:latest"

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"
rm -rf ovn-kubernetes
git clone https://github.com/ovn-org/ovn-kubernetes
pushd ovn-kubernetes || exit
git checkout d462cf088c44ff501e5fcf746e9163193afa2dc4

make -C go-controller
# When updating commit, Update the OVN_SRC_IMAGE to the corressponding commit
aswinsuryan marked this conversation as resolved.
Show resolved Hide resolved
git checkout 24b0ae73a996e409bfefad7b90cb42224e34be54
local OVN_SRC_IMAGE="ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-u:master@sha256:ba102783d520f0474e5c7dd5f2a0a1dce0ec2bda6cd42ac547621892e57c25e2"

cp go-controller/_output/go/bin/* dist/images

echo "ref: $(git rev-parse --symbolic-full-name HEAD) commit: $(git rev-parse HEAD)" > dist/images/git_info
docker build -t "${OVN_IMAGE}" -f dist/images/Dockerfile.fedora dist/images/
docker pull "${OVN_SRC_IMAGE}"
docker tag "${OVN_SRC_IMAGE}" "${OVN_IMAGE}"
docker push "${OVN_IMAGE}"

popd || exit
Expand Down
Loading