From 729dbefe78567a72e3a82bd2aea22c1dc9e065dd0e0b95aaff17fe91f41fef5e Mon Sep 17 00:00:00 2001 From: Atanas Dinov Date: Tue, 19 Nov 2024 19:48:50 +0200 Subject: [PATCH] Fix Edge charts versioning --- release-manifest-image/_service | 2 ++ release-manifest-image/release_manifest.yaml | 22 ++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/release-manifest-image/_service b/release-manifest-image/_service index f0a51fc..d9e13b3 100644 --- a/release-manifest-image/_service +++ b/release-manifest-image/_service @@ -11,5 +11,7 @@ CHART_REPO SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level) SUPPORT_LEVEL + CHART_MAJOR=$(rpm --macros=/root/.rpmmacros -E %{?chart_major}) + CHART_MAJOR diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index f5ad1ba..bd010dc 100644 --- a/release-manifest-image/release_manifest.yaml +++ b/release-manifest-image/release_manifest.yaml @@ -38,19 +38,19 @@ spec: - prettyName: MetalLB releaseName: metallb chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%metallb-chart - version: 0.14.9 + version: %%CHART_MAJOR%%.0.0 - prettyName: CDI releaseName: cdi chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%cdi-chart - version: 0.4.0 + version: %%CHART_MAJOR%%.0.0 - prettyName: KubeVirt releaseName: kubevirt chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%kubevirt-chart - version: 0.4.0 + version: %%CHART_MAJOR%%.0.0 addonCharts: - releaseName: kubevirt-dashboard-extension chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%kubevirt-dashboard-extension-chart - version: 1.2.0 + version: %%CHART_MAJOR%%.0.0 - prettyName: NeuVector releaseName: neuvector chart: neuvector @@ -69,7 +69,7 @@ spec: - prettyName: EndpointCopierOperator releaseName: endpoint-copier-operator chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%endpoint-copier-operator-chart - version: 0.2.1 + version: %%CHART_MAJOR%%.0.0 - prettyName: Elemental releaseName: elemental-operator chart: oci://registry.suse.com/rancher/elemental-operator-chart @@ -81,24 +81,24 @@ spec: - prettyName: SRIOV releaseName: sriov-network-operator chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%sriov-network-operator-chart - version: 1.4.0 + version: %%CHART_MAJOR%%.0.0 dependencyCharts: - releaseName: sriov-crd chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%sriov-crd-chart - version: 1.4.0 + version: %%CHART_MAJOR%%.0.0 - prettyName: Akri releaseName: akri chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%akri-chart - version: 0.12.20 + version: %%CHART_MAJOR%%.0.0 addonCharts: - releaseName: akri-dashboard-extension chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%akri-dashboard-extension-chart - version: 1.1.0 + version: %%CHART_MAJOR%%.0.0 - prettyName: Metal3 releaseName: metal3 chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%metal3-chart - version: 0.9.0 + version: %%CHART_MAJOR%%.0.0 - prettyName: RancherTurtles releaseName: rancher-turtles chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%rancher-turtles-chart - version: 0.4.0 + version: %%CHART_MAJOR%%.0.0