Skip to content

improvements - #1

Closed
andreaskaris wants to merge 525 commits into
fedepaol:masterfrom
andreaskaris:improvements
Closed

improvements#1
andreaskaris wants to merge 525 commits into
fedepaol:masterfrom
andreaskaris:improvements

Conversation

@andreaskaris

Copy link
Copy Markdown

elfosardo and others added 30 commits August 14, 2024 07:41
Remove metal3-dev-env hack as the new hash points to the fix:
metal3-io/metal3-dev-env@8686655
…al3#1692)

New hash is from commit
metal3-io/metal3-dev-env@62be830
that fixes an issue with bm vm xml libvirt template
* IP_STACK: v6 - allow MIRROR_IMAGES=false

IPv6 forces MIRROR_IMAGES and sets disableAllDefaultSources for
OperatorHub, and the pull-secret contains only an entry for the
mirror. This probably makes sense for disconnected installs,
but not when there is actual connectivity.

This changes the code to only set MIRROR_IMAGES=true when it is
undefined, and all conditions on MIRROR_IMAGES has been updated to
treat the value `false` the same way it treats unset.

This should allow to explicitly disable MIRROR_IMAGES, and thus allow
deploying with IP_STACK=v6 without the image mirror.

* Use ${MIRROR_IMAGES,,} - to lowercase comparison
It appears that openshift-metal3#1654
broke the bonding configuration in 05_agent_configure.sh. AGENT_NODES_MACS
was only adding a singular mac at line 106, not an array. Fixed to
add in the bond mac correctly.
* revert unwanted images mirroring

* restore original checks to allow  setting OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE when required
This is valid for local runs only.
The code to conditionaly add --keep-manifest-list=true to
the mirror command was added for a now unsupported version
of OC. Remove it as it doesn't always work e.g. if the
.releaseClientVersion doesn't follow the 4.XX... format.

4.15.0-0.nightly-2024-..-.....
vs
0.0.1-0.test-2024-....-latest
When running the appliance flow, virt-xml fails when trying to
add a new disk with the following error:
```
+(./agent/06_agent_create_cluster.sh:141): attach_appliance_diskimage(): sudo virt-xml ostest_master_0 --add-device --disk ocp/ostest/appliance.raw_master_0,device=disk,target.dev=sda
ERROR    XML error: target 'sda' duplicated for disk sources '<null>' and '/root/dev-scripts/ocp/ostest/appliance.raw_master_0'
```

The error is raised since the first device in domain xml is
an empty cdrom disk:
```
    <disk type='file' device='cdrom'>
      <driver name='qemu' type='raw'/>
      <target dev='sdb' bus='sata'/>
      <readonly/>
      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
    </disk>
```

I.e. only the cdrom disk is removed before attaching the disk image,
which is causing the aforementioned error.

Hence, removing 'all' disks (instead of the first one) using virt-xml
before attaching the new disks.

Note: I haven't tracked down the commit that caused the issue yet,
but the new behaviour should be more robust regardless.
With openshift-metal3#1669 the
possibility to explicitly set MIRROR_IMAGES=False to disable the
implicit MIRROR_IMAGES=True when IP_STACK=v6.

The revert in openshift-metal3#1694
broke this behaviour because the or logic testing for IP_STACK=v6 result
in overriding OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE to local mirror
even when MIRROR_IMAGES=False was provided by the user.

This changes the logic to use and, checking for MIRROR_IMAGE != False
and IP_STACK == v6.
…etal3#1703)

A bug fix to oc changed the filename of the generated node ISO
to include the architecture. Previously the name was node.iso.
Because the default architecture used in devscripts is x86_64/amd64,
the name is now node.x86_64.iso.

Depends on openshift/oc#1887
Disable client caching of file attributes and force the writes to
become synchronous making local changes to a file become visible
on the server immediately.
* add OPENSHIFT_CLIENT_FROM_RELEASE config var to install oc from the current release image

Required for CI testing

* add missing registry-config option to node-image commands
* revert changes related to OPENSHIFT_CLIENT_FROM_RELEASE

Not required, since the oc tool is already been extracted from the release image in the build installer step

* add missing logging for step 07
…metal3#1701)

Adds a couple macros that were useful in testing specific nmstate
configurations.
…tal3#1713)

* AGENT-991: Scenarios for 4 and 5 control plane replicas

Added 5CONTROL and 4CONTROL as additional AGENT_E2E_TEST_SCENARIOs.

* Post install validation for agent

Added post install validation to count number of master and worker
nodes matches NUM_MASTERS and NUM_WORKERS.

* Change MASTER_MEMORY to 16384 for 5/4CONTROL

* Add 4CONTROL and 5CONTROL to config_example.sh and error message
…ft-metal3#1711)

Configure the installer to create a minimal ISO. Add support
for a nimimal ISO installation in a disconnected environment
using the bootArtifactsBaseURL field. Made the PXE server into
a more generic boot server that can be used to server the rootfs
for minimal ISO.
Fixes an unbound variable when running cleanuup.sh.
…shift-metal3#1722)

Adds a new target to remove all extraworker nodes:

make agent_remove_node

The nodes are deleted from the cluster. The VM is then shutdown
and its disk reinitialized to be empty. Any agent ISO attached as
/dev/sdc is also removed.

The extraworker nodes can be added back to the cluster by running:

make agent_add_node

They can be repeated added and removed using these two make targets.
fedepaol and others added 29 commits July 3, 2026 09:48
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
The locator prefix fd00:${LAST_OCTET}::/48 had node-ID 0x0000, which
is the uSID End-of-Container marker. IOS-XR rejects VPN routes with
this locator ("no best path" in VRF). Split into SRV6_PREFIX + SRV6_NODE_ID
so the locator becomes fd00:X:X::/48 with a non-zero node-ID.

Also create sr0 dummy interface with seg6_enabled, required by FRR
for SRv6 SID installation in the kernel.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
The OCP 4.22 registry image changed its default entrypoint and no
longer runs as a plain distribution registry without explicit flags.
Add -u 0, --entrypoint=/usr/bin/distribution, and serve config.yaml
to match what the appliance generates for the bootstrap node.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Federico Paolinelli <fpaoline@redhat.com>
Signed-off-by: Andreas Karis <ak.karis@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.