suse-edge/Factory
SHA256
14
0
Fork 15
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: suse-edge:1eb9fd63188657f6b4959b231b47ae13b7a760c4cbe6d5bb62a7ce65695b3b64
Branches Tags
suse-edge:main suse-edge:3.3 suse-edge:3.2 suse-edge:devel
..
compare: suse-edge:f98d3d5c1ee57b28b0d6ebbec9bf7d048402018149c03f44b42af0ee46de8b99
Branches Tags
suse-edge:main suse-edge:3.3 suse-edge:3.2 suse-edge:devel

29 Commits
1eb9fd6318 ... f98d3d5c1e

Author SHA256 Message Date
Marco Chiappero
f98d3d5c1e make apache services truly dual socket
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -3s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 2m42s
Details 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:47 +00:00
Marco Chiappero
d250dfff83 Support dual sockets in Apache 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:47 +00:00
Marco Chiappero
336e75f33e let ironic API use v4 and v6 sockets 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:47 +00:00
Marco Chiappero
0ee57d6b80 Set host_ip to an IPv6 address when found 2025-07-28 09:27:47 +00:00
Marco Chiappero
f729c2eb20 Use my_ipv6 when IRONIC_IPV6 is defined 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:47 +00:00
Marco Chiappero
7dba15e8a6 Allow binding on the provisioning network via a hostname 
In a dual-stack scenario, especially when deploying in direct mode via
virtual media, it might be useful to 1) use a hostname to enable "dual IP"
URLs 2) have ironic bind to those two addresses, if found on the system.

To make this possible, this commit introduces:
- a new user environment variable named IRONIC_URL_HOSTNAME, to be used
  as immutable external only input, to derive IRONIC_URL_HOST and the
  IP addresses to bind on
- a new utility function named "get_ip_of_hostname" to help look up the
  A and AAAA records
- additional logic to look for the returned address on the system, for
  binding the processes; this new logic has lower priority than
  PROVISIONING_IP (which can then be used to enforce one specific IP
  version) and PROVISIONING_INTERFACE

Note, while IRONIC_URL_HOSTNAME and PROVISIONING_IP are considered to be
mutually exclusive, IRONIC_URL_HOSTNAME and PROVISIONING_INTERFACE are
not.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:47 +00:00
Marco Chiappero
49f2b270f4 Introduce IRONIC_IPV6 to bind on IPv6 sockets 
The ironic scripts either use PROVISIONING_IP as an input or try to
determine an IP address to bind the sockets to. This results in
IRONIC_IP being defined once the process is complete, and it can carry
either an IPv4 or an IPv6 address.

Likely, the assumption is that on Linux, by default, IPv4-mapped IPv6
addresses can be leveraged to serve both IPv4 and IPv6 through a single
socket. However this is not a good practice and two separate sockets
should be used instead, whenever possible.

This change modifies such logic by
- introducing the variable IRONIC_IPV6 alongside the existing
- matching IRONIC_IP and attempting to populate both variables

Please note that hostname based URLs, with both A and AAAA records, are
also required for a fully working dual-stack configuration.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:47 +00:00
Marco Chiappero
6915f4a2fd Revert 2742439 being now redundant 
Commit 2742439 added logic to tentatively identify the interface name
in get_provisioning_interface if the PROVISIONING_IP is provided.
However the same process in then repeated in wait_for_interface_or_ip.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:46 +00:00
Marco Chiappero
cd6d3cd92d Leverage get_interface_of_ip to find PROVISIONING_IP 
Use the previously introduced get_interface_of_ip, to determine if the
PROVISIONING_IP address is actually present on a network interface.

This improves the code readability and enables additional debugging
output.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:46 +00:00
Marco Chiappero
e5b09cdfe5 Add two new utility functions for later refactoring 
The way the ironic-image processes are bound to internet sockets is mainly
by PROVISIONING_IP or PROVISIONING_INTERFACE, that is, by looking up a
specific address on an interface, or a specific interface for a workable
address.

Introduce two new utility functions in ironic-common.sh for these two
purposes:
get_interface_of_ip: returns the name of the interface where the IP address
                     provided as argument is found
get_ip_of_interface: returns the first IP associated to the interface
                     provided as argument

These two functions will be put into use in subsequent commits.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:46 +00:00
Marco Chiappero
d75c752ace Remove PROVISIONING_INTERFACE default for better validation 
Whenever PROVISIONING_INTERFACE is not set by the user, function
get_provisioning_interface attempts to determine one, or provide
"provisionign" as default value. However this can cause confusing errors
down the line.

Remove this default value and fail gracefully, with proper logging,
if the PROVISIONING_INTERFACE value is not detected.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:27:46 +00:00
Marco Chiappero
20fc373230 simplify the definition of host_ip on ironic 2025-07-28 09:27:46 +00:00
Marco Chiappero
af7b78e498 Adopt the new readiness/liveness probes
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -3s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 5m58s
Details 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
5fe1be0e02 Align configure-nonroot.sh 
Try to reuse as much as possible of the upstream configure-nonroot.sh

Co-authored-by: Nicolas Belouin <nicolas.belouin@suse.com>
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
36327d6c26 Make the new scripts executable 
v29.0.0 add a couple of new scripts, such as ironic-probe.sh; make sure
they have the 'executable' flag.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
0ffd39b958 Remove unused prometheus exporter 
The Prometheus exporter is effectively, not only unused, but
unusable, due to missing dependencies. Since currently we
don't have use case for it, opt for dropping the exporter
entirely from the image.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
b331b7cdbd Force the use of Python 3.11 
SLE 15.6 provides Python 3.11, make sure it's enforced.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
5cb12d4ea7 Update the destination path of Jinjia templates 
Previously .j2 files used to be copied to /etc before being
instantiated. In order to make the image potentially read only,
move the templates to /tmp.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
91d0959e3a Disable the network schema check to allow for nmstate definitions 
Bypass the OpenStack network-data format validation, to allow for the
nmstate based one we instead use (which would otherwise fail).

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
dae0b33326 Use arch specific ESP img 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
4e4231b39e Use arch specific file for IPA 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
c9f13a514a Use arch named IPA file in IMAGE_CACHE_PREFIX 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
f8f730087f Change GRUB path in ironic.conf 
Correct path for grub.cfg on a SUSE system.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
7c0423ee04 Use ironic-suse user/group in Apache for API 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
0358093370 Use ironic-suse user/group in Apache for media 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
a69e54a6df Use correct paths and modules for Apache 
Correct the path of the Apache modules for a SUSE image.

Also keep a couple of modules disabled.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Marco Chiappero
65201fd575 Align to v29.0.0 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-28 09:26:00 +00:00
Alberto Morgante Medina
ed4448d7a6 Merge pull request 'add release images file to the release container' (#212) from amorgante/Factory:add-release-images into main 
Reviewed-on: #212
Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>
 2025-07-24 16:32:52 +02:00
Alberto Morgante Medina
f9df52a457 add release images file to the release container
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 3s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 1s
Details
2025-07-24 09:32:28 +02:00
4 changed files with 70 additions and 1 deletions
Expand all files Collapse all files

2
release-manifest-image/Dockerfile
View File

@@ -20,4 +20,4 @@ LABEL com.suse.image-type="release-manifest"
LABEL com.suse.release-stage="released"
# endlabelprefix
COPY release_manifest.yaml release_manifest.yaml
COPY release_manifest.yaml release_images.yaml ./

1
release-manifest-image/_service
View File

@@ -2,6 +2,7 @@
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="file">release_images.yaml</param>
<param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
<param name="var">IMG_PREFIX</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>

64
release-manifest-image/release_images.yaml Normal file
View File

@@ -0,0 +1,64 @@
images:
- name: quay.io/jetstack/cert-manager-cainjector:v1.14.2
- name: quay.io/jetstack/cert-manager-controller:v1.14.2
- name: quay.io/jetstack/cert-manager-webhook:v1.14.2
- name: registry.rancher.com/rancher/hardened-cluster-autoscaler:v1.10.2-build20250507
- name: registry.rancher.com/rancher/hardened-cni-plugins:v1.7.1-build20250509
- name: registry.rancher.com/rancher/hardened-coredns:v1.12.1-build20250507
- name: registry.rancher.com/rancher/hardened-etcd:v3.5.21-k3s1-build20250411
- name: registry.rancher.com/rancher/hardened-k8s-metrics-server:v0.7.2-build20250507
- name: registry.rancher.com/rancher/hardened-kubernetes:v1.32.5-rke2r1-build20250515
- name: registry.rancher.com/rancher/hardened-multus-cni:v4.2.0-build20250326
- name: registry.rancher.com/rancher/klipper-helm:v0.9.5-build20250306
- name: registry.rancher.com/rancher/mirrored-cilium-cilium:v1.17.3
- name: registry.rancher.com/rancher/mirrored-cilium-operator-generic:v1.17.3
- name: registry.rancher.com/rancher/mirrored-longhornio-csi-attacher:v4.8.1
- name: registry.rancher.com/rancher/mirrored-longhornio-csi-node-driver-registrar:v2.13.0
- name: registry.rancher.com/rancher/mirrored-longhornio-csi-provisioner:v5.2.0
- name: registry.rancher.com/rancher/mirrored-longhornio-csi-resizer:v1.13.2
- name: registry.rancher.com/rancher/mirrored-longhornio-csi-snapshotter:v8.2.0
- name: registry.rancher.com/rancher/mirrored-longhornio-livenessprobe:v2.15.0
- name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-engine:v1.8.1
- name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-instance-manager:v1.8.1
- name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-manager:v1.8.1
- name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-share-manager:v1.8.1
- name: registry.rancher.com/rancher/mirrored-longhornio-longhorn-ui:v1.8.1
- name: registry.rancher.com/rancher/mirrored-sig-storage-snapshot-controller:v8.2.0
- name: registry.rancher.com/rancher/neuvector-compliance-config:1.0.4
- name: registry.rancher.com/rancher/neuvector-controller:5.4.3
- name: registry.rancher.com/rancher/neuvector-enforcer:5.4.3
- name: registry.rancher.com/rancher/nginx-ingress-controller:v1.12.1-hardened6
- name: registry.rancher.com/rancher/rke2-cloud-provider:v1.32.0-rc3.0.20241220224140-68fbd1a6b543-build20250101
- name: %%IMG_REPO%%/%%IMG_PREFIX%%baremetal-operator:0.9.1.1
- name: %%IMG_REPO%%/%%IMG_PREFIX%%endpoint-copier-operator:0.3.0
- name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic-ipa-downloader:3.0.8
- name: %%IMG_REPO%%/%%IMG_PREFIX%%ironic:26.1.2.5
- name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-controller:v0.14.9
- name: %%IMG_REPO%%/%%IMG_PREFIX%%metallb-speaker:v0.14.9
- name: %%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.1
- name: registry.rancher.com/rancher/cluster-api-operator:v0.17.0
- name: registry.rancher.com/rancher/fleet-agent:v0.12.3
- name: registry.rancher.com/rancher/fleet:v0.12.3
- name: registry.rancher.com/rancher/hardened-node-feature-discovery:v0.15.7-build20250425
- name: registry.rancher.com/rancher/rancher-webhook:v0.7.2
- name: registry.rancher.com/rancher/rancher/turtles:v0.20.0
- name: registry.rancher.com/rancher/rancher:v2.11.2
- name: registry.rancher.com/rancher/shell:v0.4.1
- name: registry.rancher.com/rancher/system-upgrade-controller:v0.15.2
- name: registry.suse.com/rancher/cluster-api-addon-provider-fleet:v0.10.0
- name: registry.suse.com/rancher/cluster-api-controller:v1.9.5
- name: registry.suse.com/rancher/cluster-api-provider-metal3:v1.9.3
- name: registry.suse.com/rancher/cluster-api-provider-rke2-bootstrap:v0.16.1
- name: registry.suse.com/rancher/cluster-api-provider-rke2-controlplane:v0.16.1
- name: registry.suse.com/rancher/elemental-operator:1.6.8
- name: registry.suse.com/rancher/hardened-sriov-network-operator:v1.5.0-build20250425
- name: registry.suse.com/rancher/ip-address-manager:v1.9.4
- name: registry.suse.com/suse/sles/15.6/cdi-apiserver:1.61.0-150600.3.12.1
- name: registry.suse.com/suse/sles/15.6/cdi-controller:1.61.0-150600.3.12.1
- name: registry.suse.com/suse/sles/15.6/cdi-operator:1.61.0-150600.3.12.1
- name: registry.suse.com/suse/sles/15.6/cdi-uploadproxy:1.61.0-150600.3.12.1
- name: registry.suse.com/suse/sles/15.6/virt-api:1.4.0-150600.5.15.1
- name: registry.suse.com/suse/sles/15.6/virt-controller:1.4.0-150600.5.15.1
- name: registry.suse.com/suse/sles/15.6/virt-handler:1.4.0-150600.5.15.1
- name: registry.suse.com/suse/sles/15.6/virt-launcher:1.4.0-150600.5.15.1
- name: registry.suse.com/suse/sles/15.6/virt-operator:1.4.0-150600.5.15.1

4
release-manifest-image/release_manifest.yaml
View File

@@ -176,3 +176,7 @@ spec:
releaseName: rancher-turtles
chart: "%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles"
version: "%%CHART_MAJOR%%.0.4+up0.20.0"
- prettyName: RancherTurtlesAirgapResources
releaseName: rancher-turtles-airgap-resources
chart: "%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles-airgap-resources"
version: "%%CHART_MAJOR%%.0.4+up0.20.0"