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

Fix CNI config in CI #2594

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Fix CNI config in CI #2594

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
3 changes: 1 addition & 2 deletions hack/ci/Vagrantfile-debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ Vagrant.configure("2") do |config|

# Setup CNI to disable IPv6
CNI_CONFIG=/etc/cni/net.d/10-crio-bridge.conflist
jq 'del(.plugins[0].ipam.routes[1], .plugins[0].ipam.ranges[1])' $CNI_CONFIG >tmp
mv tmp $CNI_CONFIG
jq 'del(.plugins[0].ipam.routes[1], .plugins[0].ipam.ranges[1])' $CNI_CONFIG.disabled >$CNI_CONFIG

# Setup CRI-O
systemctl enable --now crio
Expand Down
3 changes: 3 additions & 0 deletions hack/ci/Vagrantfile-fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ EOF

# Setup CRI-O
printf '[crio.runtime]\nselinux = true' >/etc/crio/crio.conf.d/30-selinux.conf
# Setup CNI to disable IPv6
CNI_CONFIG=/etc/cni/net.d/10-crio-bridge.conflist
jq 'del(.plugins[0].ipam.routes[1], .plugins[0].ipam.ranges[1])' $CNI_CONFIG.disabled >$CNI_CONFIG
systemctl enable --now crio

dnf remove -y \
Expand Down
3 changes: 1 addition & 2 deletions hack/ci/Vagrantfile-ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ Vagrant.configure("2") do |config|

# Setup CNI to disable IPv6
CNI_CONFIG=/etc/cni/net.d/10-crio-bridge.conflist
jq 'del(.plugins[0].ipam.routes[1], .plugins[0].ipam.ranges[1])' $CNI_CONFIG >tmp
mv tmp $CNI_CONFIG
jq 'del(.plugins[0].ipam.routes[1], .plugins[0].ipam.ranges[1])' $CNI_CONFIG.disabled >$CNI_CONFIG

# Setup CRI-O
systemctl enable --now crio
Expand Down
Loading