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

Jump to bottom

[simplify-networking] mco: Set OVS links to MACAddressPolicy none #94

Open
wants to merge 4 commits into
base: simplify-networking
Choose a base branch
from
Open

[simplify-networking] mco: Set OVS links to MACAddressPolicy none #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4aa4037
mco: Set OVS links to MACAddressPolicy none
RamLavi Jul 31, 2024
2a8b289
tests: Bump to run with OCP 4.14
RamLavi Aug 1, 2024
19b2410
tests: Change jq dockerized URL
RamLavi Aug 1, 2024
c0c15d0
tests: Fix qemu import
RamLavi Aug 1, 2024
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
6 changes: 6 additions & 0 deletions mco_ovs_supervisor.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,9 @@ spec:
filesystem: root
mode: 484
path: /var/init-interfaces.sh
- contents:
compression: ""
source: data:,%5BMatch%5D%0ADriver%3Dopenvswitch%0A%5BLink%5D%0AMACAddressPolicy%3Dnone%0A
mode: 420
overwrite: true
path: /etc/systemd/network/50-ovs-mac-policy-none.link
6 changes: 6 additions & 0 deletions mco_ovs_workers.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,9 @@ spec:
filesystem: root
mode: 484
path: /var/init-interfaces.sh
- contents:
compression: ""
source: data:,%5BMatch%5D%0ADriver%3Dopenvswitch%0A%5BLink%5D%0AMACAddressPolicy%3Dnone%0A
mode: 420
overwrite: true
path: /etc/systemd/network/50-ovs-mac-policy-none.link
6 changes: 3 additions & 3 deletions tests/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/coreos/coreos-assembler/mantle/kola/register"
"github.com/coreos/coreos-assembler/mantle/platform"
"github.com/coreos/coreos-assembler/mantle/platform/conf"
"github.com/coreos/coreos-assembler/mantle/platform/machine/unprivqemu"
"github.com/coreos/coreos-assembler/mantle/platform/machine/qemu"
)

func init() {
Expand Down Expand Up @@ -223,7 +223,7 @@ func setupWithInterfacesTest(c cluster.TestCluster, primaryMac, secondaryMac str
// the golang compiler no longer checks that the individual types in the case have the
// NewMachineWithQemuOptions function, but rather whether platform.Cluster
// does which fails
case *unprivqemu.Cluster:
case *qemu.Cluster:
m, err = pc.NewMachineWithQemuOptions(userdata, options)
default:
panic("unreachable")
Expand Down Expand Up @@ -467,7 +467,7 @@ func setupMultipleNetworkTest(c cluster.TestCluster, primaryMac, secondaryMac st
// the golang compiler no longer checks that the individual types in the case have the
// NewMachineWithQemuOptions function, but rather whether platform.Cluster
// does which fails
case *unprivqemu.Cluster:
case *qemu.Cluster:
m, err = pc.NewMachineWithQemuOptions(userdata, options)
default:
panic("unreachable")
Expand Down
6 changes: 3 additions & 3 deletions tests/test-coreos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -ex

COREOS_ASSEMBLER_REPO_URL=https://github.com/coreos/coreos-assembler.git
OPENSHIFT_VERSION=${OPENSHIFT_VERSION:-"4.13"}
OPENSHIFT_VERSION=${OPENSHIFT_VERSION:-"4.14"}
COREOS_ASSEMBLER_REPO_BRANCH=${COREOS_ASSEMBLER_REPO_BRANCH:-"origin/rhcos-${OPENSHIFT_VERSION}"}
IMAGE_INSTALLER_BRANCH=${IMAGE_INSTALLER_BRANCH:-"release-${OPENSHIFT_VERSION}"}
RHCOS_SLB_TEST_PATH=mantle/kola/tests/misc/network.go
Expand Down Expand Up @@ -47,7 +47,7 @@ fetch_latest_rhcos_image() {
wget -nv -O "${image_path}/${image_menu}" "${image_menu_url}"

local image_gz_url
image_gz_url=$(< "${image_path}/${image_menu}" docker run --rm -i stedolan/jq '.architectures.x86_64.artifacts.qemu.formats["qcow2.gz"].disk.location' | tr -d '"')
image_gz_url=$(< "${image_path}/${image_menu}" docker run --rm -i ghcr.io/jqlang/jq:latest '.architectures.x86_64.artifacts.qemu.formats["qcow2.gz"].disk.location' | tr -d '"')
if [[ -z "${image_gz_url}" ]]; then
echo "failed to get the image.gz name. check url and json path"
exit 1
Expand All @@ -58,7 +58,7 @@ fetch_latest_rhcos_image() {
image_name=${image_gz_name%.gz}

local gz_shasum
gz_shasum=$(< "${image_path}/${image_menu}" docker run --rm -i stedolan/jq '.architectures.x86_64.artifacts.qemu.formats["qcow2.gz"].disk.sha256' | tr -d '"')
gz_shasum=$(< "${image_path}/${image_menu}" docker run --rm -i ghcr.io/jqlang/jq:latest '.architectures.x86_64.artifacts.qemu.formats["qcow2.gz"].disk.sha256' | tr -d '"')
if [[ -z "${gz_shasum}" ]]; then
echo "failed to get the latest image shasum. check url and json path"
exit 1
Expand Down
Loading