From 7e04a91e7243bc7d1ab9fa509c22c59d6df918012d2b0bb7f769724b7810f783 Mon Sep 17 00:00:00 2001 From: Marco Chiappero Date: Tue, 19 Aug 2025 12:53:09 +0000 Subject: [PATCH 1/2] Allow to set IRONIC_EXTERNAL_URL_V6 to Metal3 BMO Whenever a BMC only has an IPv6 address, the Baremetal Operator will change the "external_http_url" in the driver to an IPv6 contained in IRONIC_EXTERNAL_URL_V6, if set. Introduce 'externalHttpIPv6' in values for the BMO, in order to generate such environment variable in configmap-ironic.yaml. Signed-off-by: Marco Chiappero --- .../baremetal-operator/templates/configmap-ironic.yaml | 4 ++++ metal3-chart/charts/baremetal-operator/values.yaml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/metal3-chart/charts/baremetal-operator/templates/configmap-ironic.yaml b/metal3-chart/charts/baremetal-operator/templates/configmap-ironic.yaml index e27a359..bab310c 100644 --- a/metal3-chart/charts/baremetal-operator/templates/configmap-ironic.yaml +++ b/metal3-chart/charts/baremetal-operator/templates/configmap-ironic.yaml @@ -24,6 +24,10 @@ data: DEPLOY_KERNEL_URL: "{{ $protocol }}://{{ $ironicBootHost }}/images/ironic-python-agent-{{ $deployArch }}.kernel" DEPLOY_RAMDISK_URL: "{{ $protocol }}://{{ $ironicBootHost }}/images/ironic-python-agent-{{ $deployArch }}.initramfs" DEPLOY_ARCHITECTURE: "{{ $deployArch }}" + {{- if .Values.baremetaloperator.externalHttpIPv6 }} + {{- $port := ternary .Values.global.vmediaTLSPort .Values.baremetaloperator.httpPort $enableVMediaTLS }} + IRONIC_EXTERNAL_URL_V6: "{{ $protocol }}://[{{ .Values.baremetaloperator.externalHttpIPv6 }}]:{{ $port }}" + {{- end }} kind: ConfigMap metadata: name: baremetal-operator-ironic diff --git a/metal3-chart/charts/baremetal-operator/values.yaml b/metal3-chart/charts/baremetal-operator/values.yaml index 3b8591b..b7530d1 100644 --- a/metal3-chart/charts/baremetal-operator/values.yaml +++ b/metal3-chart/charts/baremetal-operator/values.yaml @@ -84,3 +84,8 @@ affinity: {} baremetaloperator: httpPort: "6180" + + # IPv6 used for accessing the Ironic HTTP server for BMCs with an IPv6 only address. + # It should not be used in conjunction with 'provisioningHostname' unless BMCs do not + # support hostnames. + externalHttpIPv6: "" -- 2.51.1 From 9cbf868ba73d63c45e954433591e6bfc5191173798fabfddd6e086c48482d93b Mon Sep 17 00:00:00 2001 From: Marco Chiappero Date: Thu, 21 Aug 2025 16:34:17 +0000 Subject: [PATCH 2/2] Bump the metal3-chart and BMO subchart version Signed-off-by: Marco Chiappero --- metal3-chart/Chart.yaml | 10 +++++----- metal3-chart/charts/baremetal-operator/Chart.yaml | 2 +- release-manifest-image/release_manifest.yaml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/metal3-chart/Chart.yaml b/metal3-chart/Chart.yaml index dfbf5da..2fce13d 100644 --- a/metal3-chart/Chart.yaml +++ b/metal3-chart/Chart.yaml @@ -1,12 +1,12 @@ -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.13_up0.12.3 -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.13_up0.12.3-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.14_up0.12.4 +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.14_up0.12.4-%RELEASE% apiVersion: v2 -appVersion: 0.12.3 +appVersion: 0.12.4 dependencies: - alias: metal3-baremetal-operator name: baremetal-operator repository: file://./charts/baremetal-operator - version: 0.10.2 + version: 0.10.3 - alias: metal3-ironic name: ironic repository: file://./charts/ironic @@ -25,4 +25,4 @@ description: A Helm chart that installs all of the dependencies needed for Metal icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg name: metal3 type: application -version: "%%CHART_MAJOR%%.0.13+up0.12.3" +version: "%%CHART_MAJOR%%.0.14+up0.12.4" diff --git a/metal3-chart/charts/baremetal-operator/Chart.yaml b/metal3-chart/charts/baremetal-operator/Chart.yaml index c512ce4..6a3ee5f 100644 --- a/metal3-chart/charts/baremetal-operator/Chart.yaml +++ b/metal3-chart/charts/baremetal-operator/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 0.10.2 description: A Helm chart for baremetal-operator, used by Metal3 name: baremetal-operator type: application -version: 0.10.2 +version: 0.10.3 diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index 20f11bc..98783ba 100644 --- a/release-manifest-image/release_manifest.yaml +++ b/release-manifest-image/release_manifest.yaml @@ -171,7 +171,7 @@ spec: - prettyName: Metal3 releaseName: metal3 chart: '%%CHART_REPO%%/%%CHART_PREFIX%%metal3' - version: '%%CHART_MAJOR%%.0.13+up0.12.3' + version: '%%CHART_MAJOR%%.0.14+up0.12.4' - prettyName: RancherTurtles releaseName: rancher-turtles chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles' -- 2.51.1