release-manifest-image/_service

@@ -4,7 +4,7 @@
     <param name="file">Dockerfile</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>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
     <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
     <param name="var">SUPPORT_LEVEL</param>

release-manifest-image/release_manifest.yaml

@@ -7,7 +7,7 @@ spec:
   components:
     kubernetes:
       k3s:
-        version: v1.31.3+k3s1
+        version: v1.31.2+k3s1
         coreComponents:
         - name: traefik-crd
           version: 27.0.201+up27.0.2
@@ -31,34 +31,34 @@ spec:
             image: rancher/mirrored-metrics-server:v0.7.2
           type: Deployment
       rke2:
-        version: v1.31.3+rke2r1
+        version: v1.31.2+rke2r1
         coreComponents:
         - name: rke2-cilium
-          version: 1.16.303
+          version: 1.16.201
           type: HelmChart
         - name: rke2-canal
-          version: v3.29.0-build2024110400
+          version: v3.28.2-build2024101601
           type: HelmChart
         - name: rke2-calico-crd
-          version: v3.29.000
+          version: v3.28.200
           type: HelmChart
         - name: rke2-calico
-          version: v3.29.000
+          version: v3.28.200
           type: HelmChart
         - name: rke2-coredns
-          version: 1.33.005
+          version: 1.33.002
           type: HelmChart
         - name: rke2-ingress-nginx
-          version: 4.10.502
+          version: 4.10.501
           type: HelmChart
         - name: rke2-metrics-server
           version: 3.12.004
           type: HelmChart
         - name: rancher-vsphere-csi
-          version: 3.3.1-rancher700
+          version: 3.3.1-rancher100
           type: HelmChart
         - name: rancher-vsphere-cpi
-          version: 1.9.100
+          version: 1.9.000
           type: HelmChart
         - name: harvester-cloud-provider
           version: 0.2.600
@@ -88,11 +88,8 @@ spec:
         - prettyName: Rancher
           releaseName: rancher
           chart: rancher
-          version: 2.10.1
-          repository: https://charts.rancher.com/server-charts/prime
-          values:
-            postDelete:
-              enabled: false
+          version: v2.10.0
+          repository: https://releases.rancher.com/server-charts/stable
         - prettyName: Longhorn
           releaseName: longhorn
           chart: longhorn

upgrade-controller-chart/_service

@@ -6,8 +6,6 @@
     <param name="var">IMG_PREFIX</param>
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
-    <param name="eval">MANIFEST_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
-    <param name="var">MANIFEST_REPO</param>
   </service>
   <service name="replace_using_env" mode="buildtime">
     <param name="file">Chart.yaml</param>
@@ -17,3 +15,4 @@
     <param name="var">CHART_MAJOR</param>
   </service>
 </services>
+

upgrade-controller-chart/values.yaml

@@ -12,7 +12,7 @@ image:
 
 env:
   releaseManifest:
-    image: %%MANIFEST_REPO%%/%%IMG_PREFIX%%release-manifest
+    image: %%IMG_REPO%%/%%IMG_PREFIX%%release-manifest
   kubectl:
     image: %%IMG_REPO%%/%%IMG_PREFIX%%kubectl
     version: 1.30.3