From 996ee3b2218a33b9d1936c5ba984d23e5d014c69780b92bb598e10bbeedc6a39 Mon Sep 17 00:00:00 2001 From: Atanas Dinov Date: Tue, 19 Nov 2024 17:00:37 +0200 Subject: [PATCH 1/3] Bump release manifest to 3.2.0 --- release-manifest-image/Dockerfile | 6 ++-- release-manifest-image/release_manifest.yaml | 30 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/release-manifest-image/Dockerfile b/release-manifest-image/Dockerfile index cdced5d..e14d21c 100644 --- a/release-manifest-image/Dockerfile +++ b/release-manifest-image/Dockerfile @@ -1,4 +1,4 @@ -#!BuildTag: %%IMG_PREFIX%%release-manifest:3.1.1 +#!BuildTag: %%IMG_PREFIX%%release-manifest:3.2.0 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION @@ -7,11 +7,11 @@ FROM registry.suse.com/bci/bci-micro:$SLE_VERSION LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SUSE Edge Release Manifest" LABEL org.opencontainers.image.description="Release Manifest containing information about a specific SUSE Edge release" -LABEL org.opencontainers.image.version="3.1.1" +LABEL org.opencontainers.image.version="3.2.0" LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%release-manifest:3.1.1" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%release-manifest:3.2.0" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index ce4d839..f5ad1ba 100644 --- a/release-manifest-image/release_manifest.yaml +++ b/release-manifest-image/release_manifest.yaml @@ -1,15 +1,15 @@ apiVersion: lifecycle.suse.com/v1alpha1 kind: ReleaseManifest metadata: - name: release-manifest-3-1-1 + name: release-manifest-3-2-0 spec: - releaseVersion: 3.1.1 + releaseVersion: 3.2.0 components: kubernetes: k3s: - version: v1.30.5+k3s1 + version: v1.31.2+k3s1 rke2: - version: v1.30.5+rke2r1 + version: v1.31.2+rke2r1 operatingSystem: version: "6.0" zypperID: "SL-Micro" @@ -23,17 +23,17 @@ spec: - prettyName: Rancher releaseName: rancher chart: rancher - version: v2.9.3 - repository: https://charts.rancher.com/server-charts/prime + version: v2.10.0 + repository: https://releases.rancher.com/server-charts/stable - prettyName: Longhorn releaseName: longhorn chart: longhorn - version: 104.2.0+up1.7.1 + version: 104.2.1+up1.7.2 repository: https://charts.rancher.io dependencyCharts: - releaseName: longhorn-crd chart: longhorn-crd - version: 104.2.0+up1.7.1 + version: 104.2.1+up1.7.2 repository: https://charts.rancher.io - prettyName: MetalLB releaseName: metallb @@ -50,7 +50,7 @@ spec: addonCharts: - releaseName: kubevirt-dashboard-extension chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%kubevirt-dashboard-extension-chart - version: 1.1.0 + version: 1.2.0 - prettyName: NeuVector releaseName: neuvector chart: neuvector @@ -73,19 +73,19 @@ spec: - prettyName: Elemental releaseName: elemental-operator chart: oci://registry.suse.com/rancher/elemental-operator-chart - version: 1.6.4 + version: 1.6.5 dependencyCharts: - releaseName: elemental-operator-crds chart: oci://registry.suse.com/rancher/elemental-operator-crds-chart - version: 1.6.4 + version: 1.6.5 - prettyName: SRIOV releaseName: sriov-network-operator chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%sriov-network-operator-chart - version: 1.3.0 + version: 1.4.0 dependencyCharts: - releaseName: sriov-crd chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%sriov-crd-chart - version: 1.3.0 + version: 1.4.0 - prettyName: Akri releaseName: akri chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%akri-chart @@ -97,8 +97,8 @@ spec: - prettyName: Metal3 releaseName: metal3 chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%metal3-chart - version: 0.8.3 + version: 0.9.0 - prettyName: RancherTurtles releaseName: rancher-turtles chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%rancher-turtles-chart - version: 0.3.3 + version: 0.4.0 From 729dbefe78567a72e3a82bd2aea22c1dc9e065dd0e0b95aaff17fe91f41fef5e Mon Sep 17 00:00:00 2001 From: Atanas Dinov Date: Tue, 19 Nov 2024 19:48:50 +0200 Subject: [PATCH 2/3] 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 From 40010f5c4fad33630a148a2d9845cc08592ed3c7688b88512f113a8725eadedd Mon Sep 17 00:00:00 2001 From: Atanas Dinov Date: Wed, 20 Nov 2024 11:18:07 +0200 Subject: [PATCH 3/3] Fix chart tags --- release-manifest-image/release_manifest.yaml | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/release-manifest-image/release_manifest.yaml b/release-manifest-image/release_manifest.yaml index bd010dc..7775a98 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: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up0.14.9 - prettyName: CDI releaseName: cdi chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%cdi-chart - version: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up0.4.0 - prettyName: KubeVirt releaseName: kubevirt chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%kubevirt-chart - version: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up0.4.0 addonCharts: - releaseName: kubevirt-dashboard-extension chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%kubevirt-dashboard-extension-chart - version: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up1.2.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: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up0.2.1 - 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: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up1.4.0 dependencyCharts: - releaseName: sriov-crd chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%sriov-crd-chart - version: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up1.4.0 - prettyName: Akri releaseName: akri chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%akri-chart - version: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up0.12.20 addonCharts: - releaseName: akri-dashboard-extension chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%akri-dashboard-extension-chart - version: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up1.1.0 - prettyName: Metal3 releaseName: metal3 chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%metal3-chart - version: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up0.9.0 - prettyName: RancherTurtles releaseName: rancher-turtles chart: %%CHART_REPO%%/%%IMAGE_PREFIX%%rancher-turtles-chart - version: %%CHART_MAJOR%%.0.0 + version: %%CHART_MAJOR%%.0.0+up0.4.0