From 18844c5a252b932c5590b7a471eb32ce94c76c78dfa620a6a123a579aaccce8c Mon Sep 17 00:00:00 2001 From: Nicolas Belouin Date: Tue, 16 Sep 2025 13:59:19 +0200 Subject: [PATCH] Use BCI nginx for metal3 media subchart Signed-off-by: Nicolas Belouin --- metal3-chart/Chart.yaml | 8 ++++---- metal3-chart/charts/media/Chart.yaml | 4 ++-- metal3-chart/charts/media/templates/deployment.yaml | 6 +----- metal3-chart/charts/media/values.yaml | 4 ++-- release-manifest-image/release_manifest.yaml | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/metal3-chart/Chart.yaml b/metal3-chart/Chart.yaml index b7f9e47..8b38eba 100644 --- a/metal3-chart/Chart.yaml +++ b/metal3-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.16_up0.12.6 -#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.16_up0.12.6-%RELEASE% +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.17_up0.12.7 +#!BuildTag: %%CHART_PREFIX%%metal3:%%CHART_MAJOR%%.0.17_up0.12.7-%RELEASE% apiVersion: v2 appVersion: 0.12.6 dependencies: @@ -20,9 +20,9 @@ dependencies: condition: global.enable_metal3_media_server name: media repository: file://./charts/media - version: 0.6.6 + version: 0.7.0 description: A Helm chart that installs all of the dependencies needed for Metal3 icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg name: metal3 type: application -version: "%%CHART_MAJOR%%.0.16+up0.12.6" +version: "%%CHART_MAJOR%%.0.17+up0.12.7" diff --git a/metal3-chart/charts/media/Chart.yaml b/metal3-chart/charts/media/Chart.yaml index 283fa6f..4899bbb 100644 --- a/metal3-chart/charts/media/Chart.yaml +++ b/metal3-chart/charts/media/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 1.16.0 +appVersion: 1.21.0 description: A Helm chart for Media, used by Metal3 name: media type: application -version: 0.6.6 +version: 0.7.0 diff --git a/metal3-chart/charts/media/templates/deployment.yaml b/metal3-chart/charts/media/templates/deployment.yaml index 9dccd57..f41513a 100644 --- a/metal3-chart/charts/media/templates/deployment.yaml +++ b/metal3-chart/charts/media/templates/deployment.yaml @@ -34,13 +34,9 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} - command: - - /usr/sbin/httpd - args: - - -DFOREGROUND securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http diff --git a/metal3-chart/charts/media/values.yaml b/metal3-chart/charts/media/values.yaml index efa8c21..b573861 100644 --- a/metal3-chart/charts/media/values.yaml +++ b/metal3-chart/charts/media/values.yaml @@ -22,9 +22,9 @@ global: replicaCount: 1 image: - repository: registry.opensuse.org/isv/suse/edge/metal3/containers/images/ironic + repository: registry.suse.com/suse/nginx pullPolicy: IfNotPresent - tag: 29.0.4.2 + tag: 1.21 imagePullSecrets: [] nameOverride: "" diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index aeed249..c6c23fc 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.16+up0.12.6' + version: '%%CHART_MAJOR%%.0.17+up0.12.7' - prettyName: RancherTurtles releaseName: rancher-turtles chart: '%%CHART_REPO%%/%%CHART_PREFIX%%rancher-turtles' -- 2.51.1