From d2d08ccb83afb59a879ff0c749ea98a0baa20b10 Mon Sep 17 00:00:00 2001 From: dprodanov4 Date: Tue, 4 Aug 2026 12:13:23 +0300 Subject: [PATCH 1/5] feat: Add 3.7.0 release configuration Moves the day2 fleets, bundles and scripts to Edge 3.7.0. Edge chart templates move to the 307 prefix, the OS upgrade plans and bundle go to 3.7.0, and kubectl references switch to registry.suse.com/edge/3.7. GitRepo revisions now point at release-3.7.0 so the upgrade fleets are sourced from this branch. --- .../os-upgrade/os-upgrade-bundle.yaml | 6 ++--- fleets/day2/chart-templates/cdi/fleet.yaml | 2 +- .../endpoint-copier-operator/fleet.yaml | 2 +- .../kubevirt-dashboard-extension/fleet.yaml | 2 +- .../day2/chart-templates/kubevirt/fleet.yaml | 2 +- .../longhorn/longhorn/fleet.yaml | 11 +++----- fleets/day2/chart-templates/metal3/fleet.yaml | 2 +- .../day2/chart-templates/metallb/fleet.yaml | 2 +- .../rancher-turtles-providers/fleet.yaml | 2 +- .../sriov/sriov-crd/fleet.yaml | 2 +- .../sriov/sriov-network-operator/fleet.yaml | 2 +- fleets/day2/eib-charts-upgrader/base/job.yaml | 2 +- .../os-upgrade/plan-control-plane.yaml | 2 +- .../os-upgrade/plan-worker.yaml | 4 +-- gitrepos/day2/k3s-upgrade-gitrepo.yaml | 2 +- gitrepos/day2/os-upgrade-gitrepo.yaml | 2 +- gitrepos/day2/rke2-upgrade-gitrepo.yaml | 2 +- .../system-upgrade-controller-gitrepo.yaml | 2 +- .../day2/edge-release-helm-oci-artefacts.txt | 20 +++++++------- scripts/day2/edge-release-images.txt | 26 +++++++++---------- 20 files changed, 47 insertions(+), 50 deletions(-) diff --git a/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml index d1c7d42..9a84abf 100644 --- a/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml +++ b/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml @@ -26,9 +26,9 @@ spec: - name: os-upgrade-script path: /host/run/system-upgrade/secrets/os-upgrade-script cordon: true - version: "3.6.1" + version: "3.7.0" prepare: - image: registry.suse.com/edge/3.6/kubectl:1.35.4 + image: registry.suse.com/edge/3.7/kubectl:1.35.4 command: ["/bin/sh", "-c"] args: - | @@ -94,7 +94,7 @@ spec: - name: os-upgrade-script path: /host/run/system-upgrade/secrets/os-upgrade-script cordon: true - version: "3.6.1" + version: "3.7.0" upgrade: image: registry.suse.com/bci/bci-base:15.6 command: ["chroot", "/host"] diff --git a/fleets/day2/chart-templates/cdi/fleet.yaml b/fleets/day2/chart-templates/cdi/fleet.yaml index 3affe59..2344c4f 100644 --- a/fleets/day2/chart-templates/cdi/fleet.yaml +++ b/fleets/day2/chart-templates/cdi/fleet.yaml @@ -3,7 +3,7 @@ defaultNamespace: cdi-system helm: releaseName: cdi chart: "oci://registry.suse.com/edge/charts/cdi" - version: "306.0.2+up0.7.0" + version: "307.0.2+up0.7.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/endpoint-copier-operator/fleet.yaml b/fleets/day2/chart-templates/endpoint-copier-operator/fleet.yaml index 6dd8f41..d43a600 100644 --- a/fleets/day2/chart-templates/endpoint-copier-operator/fleet.yaml +++ b/fleets/day2/chart-templates/endpoint-copier-operator/fleet.yaml @@ -3,6 +3,6 @@ defaultNamespace: endpoint-copier helm: releaseName: endpoint-copier-operator chart: "oci://registry.suse.com/edge/charts/endpoint-copier-operator" - version: "306.0.1+up0.3.0" + version: "307.0.1+up0.3.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/kubevirt-dashboard-extension/fleet.yaml b/fleets/day2/chart-templates/kubevirt-dashboard-extension/fleet.yaml index cff66e9..026b6aa 100644 --- a/fleets/day2/chart-templates/kubevirt-dashboard-extension/fleet.yaml +++ b/fleets/day2/chart-templates/kubevirt-dashboard-extension/fleet.yaml @@ -3,6 +3,6 @@ defaultNamespace: cattle-ui-plugin-system helm: releaseName: kubevirt-dashboard-extension chart: "oci://registry.suse.com/edge/charts/kubevirt-dashboard-extension" - version: "306.0.4+up1.3.3" + version: "307.0.4+up1.3.3" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/kubevirt/fleet.yaml b/fleets/day2/chart-templates/kubevirt/fleet.yaml index e13ccd7..c2cf408 100644 --- a/fleets/day2/chart-templates/kubevirt/fleet.yaml +++ b/fleets/day2/chart-templates/kubevirt/fleet.yaml @@ -3,7 +3,7 @@ defaultNamespace: kubevirt-system helm: releaseName: kubevirt chart: "oci://registry.suse.com/edge/charts/kubevirt" - version: "306.0.2+up0.7.0" + version: "307.0.2+up0.7.0" # kubevirt namespace is created by kubevirt as well, we need to take ownership of it, otherwise it fails takeOwnership: true # custom chart value overrides diff --git a/fleets/day2/chart-templates/longhorn/longhorn/fleet.yaml b/fleets/day2/chart-templates/longhorn/longhorn/fleet.yaml index dcfe8f0..313f429 100644 --- a/fleets/day2/chart-templates/longhorn/longhorn/fleet.yaml +++ b/fleets/day2/chart-templates/longhorn/longhorn/fleet.yaml @@ -2,15 +2,12 @@ defaultNamespace: longhorn-system helm: releaseName: "longhorn" - chart: "suse-storage" - repo: "oci://dp.apps.rancher.io/charts" - version: "1.11.2" + chart: "longhorn" + repo: "https://charts.longhorn.io" + version: "1.12.0" takeOwnership: true # custom chart value overrides - values: - global: - imagePullSecrets: - - application-collection + values: {} # https://fleet.rancher.io/bundle-diffs diff: diff --git a/fleets/day2/chart-templates/metal3/fleet.yaml b/fleets/day2/chart-templates/metal3/fleet.yaml index 548aaf1..31df104 100644 --- a/fleets/day2/chart-templates/metal3/fleet.yaml +++ b/fleets/day2/chart-templates/metal3/fleet.yaml @@ -3,6 +3,6 @@ defaultNamespace: metal3-system helm: releaseName: metal3 chart: "oci://registry.suse.com/edge/charts/metal3" - version: "306.0.29+up0.15.0" + version: "307.0.28+up0.15.1" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/metallb/fleet.yaml b/fleets/day2/chart-templates/metallb/fleet.yaml index 955b856..9529f3b 100644 --- a/fleets/day2/chart-templates/metallb/fleet.yaml +++ b/fleets/day2/chart-templates/metallb/fleet.yaml @@ -3,7 +3,7 @@ defaultNamespace: metallb-system helm: releaseName: metallb chart: "oci://registry.suse.com/edge/charts/metallb" - version: "306.0.2+up0.15.3" + version: "307.0.3+up0.16.1" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/rancher-turtles-providers/fleet.yaml b/fleets/day2/chart-templates/rancher-turtles-providers/fleet.yaml index ec451ca..3ba2507 100644 --- a/fleets/day2/chart-templates/rancher-turtles-providers/fleet.yaml +++ b/fleets/day2/chart-templates/rancher-turtles-providers/fleet.yaml @@ -3,7 +3,7 @@ defaultNamespace: rancher-turtles-providers-system helm: releaseName: rancher-turtles-providers chart: "oci://registry.suse.com/edge/charts/rancher-turtles-providers" - version: "306.0.7+up0.26.2" + version: "307.0.7+up0.26.2" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/sriov/sriov-crd/fleet.yaml b/fleets/day2/chart-templates/sriov/sriov-crd/fleet.yaml index dbe389b..e23aa8b 100644 --- a/fleets/day2/chart-templates/sriov/sriov-crd/fleet.yaml +++ b/fleets/day2/chart-templates/sriov/sriov-crd/fleet.yaml @@ -3,6 +3,6 @@ defaultNamespace: sriov-network-operator helm: releaseName: sriov-crd chart: "oci://registry.suse.com/edge/charts/sriov-crd" - version: "306.0.4+up1.6.0" + version: "307.1.0+up1.6.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/sriov/sriov-network-operator/fleet.yaml b/fleets/day2/chart-templates/sriov/sriov-network-operator/fleet.yaml index c506af8..cf0139d 100644 --- a/fleets/day2/chart-templates/sriov/sriov-network-operator/fleet.yaml +++ b/fleets/day2/chart-templates/sriov/sriov-network-operator/fleet.yaml @@ -3,6 +3,6 @@ defaultNamespace: sriov-network-operator helm: releaseName: sriov-network-operator chart: "oci://registry.suse.com/edge/charts/sriov-network-operator" - version: "306.0.4+up1.6.0" + version: "307.1.0+up1.6.0" # custom chart value overrides values: {} diff --git a/fleets/day2/eib-charts-upgrader/base/job.yaml b/fleets/day2/eib-charts-upgrader/base/job.yaml index f2438be..c0863cd 100644 --- a/fleets/day2/eib-charts-upgrader/base/job.yaml +++ b/fleets/day2/eib-charts-upgrader/base/job.yaml @@ -8,7 +8,7 @@ spec: serviceAccountName: eib-charts-upgrader containers: - name: kubectl-container - image: registry.suse.com/edge/3.6/kubectl:1.35.4 + image: registry.suse.com/edge/3.7/kubectl:1.35.4 command: ["/bin/sh", "-c"] args: ["/tmp/scripts/chartPatch.sh"] volumeMounts: diff --git a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-control-plane.yaml b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-control-plane.yaml index 727d84c..6a284af 100644 --- a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-control-plane.yaml +++ b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-control-plane.yaml @@ -28,7 +28,7 @@ spec: - name: os-upgrade-script path: /host/run/system-upgrade/secrets/os-upgrade-script cordon: true - version: "3.6.1" + version: "3.7.0" upgrade: image: registry.suse.com/bci/bci-base:15.6 command: ["chroot", "/host"] diff --git a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml index b3ffcd5..589b266 100644 --- a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml +++ b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml @@ -17,9 +17,9 @@ spec: - name: os-upgrade-script path: /host/run/system-upgrade/secrets/os-upgrade-script cordon: true - version: "3.6.1" + version: "3.7.0" prepare: - image: registry.suse.com/edge/3.6/kubectl:1.35.4 + image: registry.suse.com/edge/3.7/kubectl:1.35.4 command: ["/bin/sh", "-c"] args: - | diff --git a/gitrepos/day2/k3s-upgrade-gitrepo.yaml b/gitrepos/day2/k3s-upgrade-gitrepo.yaml index d7c8c32..fb61f21 100644 --- a/gitrepos/day2/k3s-upgrade-gitrepo.yaml +++ b/gitrepos/day2/k3s-upgrade-gitrepo.yaml @@ -4,7 +4,7 @@ metadata: name: k3s-upgrade namespace: fleet-default spec: - revision: release-3.6.1 + revision: release-3.7.0 paths: - fleets/day2/system-upgrade-controller-plans/k3s-upgrade repo: https://github.com/suse-edge/fleet-examples.git diff --git a/gitrepos/day2/os-upgrade-gitrepo.yaml b/gitrepos/day2/os-upgrade-gitrepo.yaml index 4d2c7f0..dc8f1ed 100644 --- a/gitrepos/day2/os-upgrade-gitrepo.yaml +++ b/gitrepos/day2/os-upgrade-gitrepo.yaml @@ -4,7 +4,7 @@ metadata: name: os-upgrade namespace: fleet-default spec: - revision: release-3.6.1 + revision: release-3.7.0 paths: - fleets/day2/system-upgrade-controller-plans/os-upgrade repo: https://github.com/suse-edge/fleet-examples.git diff --git a/gitrepos/day2/rke2-upgrade-gitrepo.yaml b/gitrepos/day2/rke2-upgrade-gitrepo.yaml index 0852abc..908edd5 100644 --- a/gitrepos/day2/rke2-upgrade-gitrepo.yaml +++ b/gitrepos/day2/rke2-upgrade-gitrepo.yaml @@ -4,7 +4,7 @@ metadata: name: rke2-upgrade namespace: fleet-default spec: - revision: release-3.6.1 + revision: release-3.7.0 paths: - fleets/day2/system-upgrade-controller-plans/rke2-upgrade repo: https://github.com/suse-edge/fleet-examples.git diff --git a/gitrepos/day2/system-upgrade-controller-gitrepo.yaml b/gitrepos/day2/system-upgrade-controller-gitrepo.yaml index 3db7242..1e2f512 100644 --- a/gitrepos/day2/system-upgrade-controller-gitrepo.yaml +++ b/gitrepos/day2/system-upgrade-controller-gitrepo.yaml @@ -4,7 +4,7 @@ metadata: name: system-upgrade-controller namespace: fleet-default spec: - revision: release-3.6.1 + revision: release-3.7.0 paths: - fleets/day2/system-upgrade-controller repo: https://github.com/suse-edge/fleet-examples.git diff --git a/scripts/day2/edge-release-helm-oci-artefacts.txt b/scripts/day2/edge-release-helm-oci-artefacts.txt index 0e4e7e3..5e80a00 100644 --- a/scripts/day2/edge-release-helm-oci-artefacts.txt +++ b/scripts/day2/edge-release-helm-oci-artefacts.txt @@ -1,10 +1,10 @@ -edge/charts/cdi:306.0.2+up0.7.0 -edge/charts/endpoint-copier-operator:306.0.1+up0.3.0 -edge/charts/kubevirt:306.0.2+up0.7.0 -edge/charts/kubevirt-dashboard-extension:306.0.4+up1.3.3 -edge/charts/metal3:306.0.29+up0.15.0 -edge/charts/metallb:306.0.2+up0.15.3 -edge/charts/sriov-crd:306.0.4+up1.6.0 -edge/charts/sriov-network-operator:306.0.4+up1.6.0 -edge/charts/rancher-turtles-providers:306.0.7+up0.26.2 -edge/charts/upgrade-controller:306.0.4+up0.1.3 +edge/charts/cdi:307.0.2+up0.7.0 +edge/charts/endpoint-copier-operator:307.0.1+up0.3.0 +edge/charts/kubevirt:307.0.2+up0.7.0 +edge/charts/kubevirt-dashboard-extension:307.0.4+up1.3.3 +edge/charts/metal3:307.0.28+up0.15.1 +edge/charts/metallb:307.0.3+up0.16.1 +edge/charts/sriov-crd:307.1.0+up1.6.0 +edge/charts/sriov-network-operator:307.1.0+up1.6.0 +edge/charts/rancher-turtles-providers:307.0.7+up0.26.2 +edge/charts/upgrade-controller:307.0.4+up0.1.3 diff --git a/scripts/day2/edge-release-images.txt b/scripts/day2/edge-release-images.txt index f9c3a1a..51ca46e 100644 --- a/scripts/day2/edge-release-images.txt +++ b/scripts/day2/edge-release-images.txt @@ -1,14 +1,14 @@ -edge/3.6/baremetal-operator:0.12.3.0 -edge/3.6/edge-image-builder:1.3.3.1 -edge/3.6/endpoint-copier-operator:0.3.0 -edge/3.6/frr:10.2.1 -edge/3.6/frr-k8s:v0.0.20 -edge/3.6/ironic:35.0.0.2 -edge/3.6/ironic-ipa-downloader:3.1.2 -edge/3.6/kube-rbac-proxy:0.20.1 +edge/3.7/baremetal-operator:0.12.3.0 +edge/3.7/edge-image-builder:1.3.3.1 +edge/3.7/endpoint-copier-operator:0.3.0 +edge/3.7/frr:10.2.1 +edge/3.7/frr-k8s:v0.0.25 +edge/3.7/ironic:35.0.0.2 +edge/3.7/ironic-ipa-downloader:3.1.2 +edge/3.7/kube-rbac-proxy:0.21.2 edge/mariadb:10.6.15.1 -edge/3.6/metallb-controller:v0.15.3 -edge/3.6/metallb-speaker:v0.15.3 +edge/3.7/metallb-controller:v0.16.1 +edge/3.7/metallb-speaker:v0.16.1 suse/sles/15.7/cdi-operator:1.64.0-150700.9.6.1 suse/sles/15.7/cdi-controller:1.64.0-150700.9.6.1 suse/sles/15.7/cdi-importer:1.64.0-150700.9.6.1 @@ -23,6 +23,6 @@ suse/sles/15.7/virt-controller:1.7.0-150700.3.16.2 suse/sles/15.7/virt-api:1.7.0-150700.3.16.2 suse/sles/15.7/virt-exportproxy:1.7.0-150700.3.16.2 suse/sles/15.7/virt-exportserver:1.7.0-150700.3.16.2 -edge/3.6/upgrade-controller:0.1.3 -edge/3.6/kubectl:1.35.4 -edge/3.6/release-manifest:3.6.1 +edge/3.7/upgrade-controller:0.1.3 +edge/3.7/kubectl:1.35.4 +edge/3.7/release-manifest:3.7.0 From 73f3ac705e07e56cd666cf1250ef31c03b4b1612 Mon Sep 17 00:00:00 2001 From: dprodanov4 Date: Wed, 5 Aug 2026 12:55:48 +0300 Subject: [PATCH 2/5] Bump NeuVector to 110.0.0+up2.11.0 for 3.7.0 --- fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml | 2 +- fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml index f23abbd..342a8d7 100644 --- a/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml +++ b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml @@ -4,6 +4,6 @@ helm: releaseName: "neuvector-crd" chart: "neuvector-crd" repo: "https://charts.rancher.io" - version: "109.0.2+up2.10.2" + version: "110.0.0+up2.11.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml index 7d72d91..a4aba01 100644 --- a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml +++ b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml @@ -4,7 +4,7 @@ helm: releaseName: "neuvector" chart: "neuvector" repo: "https://charts.rancher.io" - version: "109.0.2+up2.10.2" + version: "110.0.0+up2.11.0" # custom chart value overrides values: {} From 1ab301596a279be20fe744260657a2e59b8acf93 Mon Sep 17 00:00:00 2001 From: dprodanov4 Date: Wed, 5 Aug 2026 17:00:54 +0300 Subject: [PATCH 3/5] Use NeuVector chart 109.0.4+up2.11.0 for 3.7.0 --- fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml | 2 +- fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml index 342a8d7..3e1cc38 100644 --- a/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml +++ b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml @@ -4,6 +4,6 @@ helm: releaseName: "neuvector-crd" chart: "neuvector-crd" repo: "https://charts.rancher.io" - version: "110.0.0+up2.11.0" + version: "109.0.4+up2.11.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml index a4aba01..eb583e5 100644 --- a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml +++ b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml @@ -4,7 +4,7 @@ helm: releaseName: "neuvector" chart: "neuvector" repo: "https://charts.rancher.io" - version: "110.0.0+up2.11.0" + version: "109.0.4+up2.11.0" # custom chart value overrides values: {} From d674e263a7ca50aee40ed58025bc768b1bdedfd4 Mon Sep 17 00:00:00 2001 From: dprodanov4 Date: Fri, 7 Aug 2026 16:19:03 +0300 Subject: [PATCH 4/5] Bump Rancher, NeuVector and Elemental for 3.7.0 Rancher 2.15.x is only published on rancher-latest until Prime catches up with the 3.7.0 baseline. NeuVector moves to the 110.x line that tracks Rancher 2.15 and Elemental to 1.9.2. --- .../elemental/elemental-operator-crds/fleet.yaml | 2 +- .../chart-templates/elemental/elemental-operator/fleet.yaml | 2 +- .../day2/chart-templates/neuvector/neuvector-crd/fleet.yaml | 2 +- fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml | 2 +- fleets/day2/chart-templates/rancher/fleet.yaml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fleets/day2/chart-templates/elemental/elemental-operator-crds/fleet.yaml b/fleets/day2/chart-templates/elemental/elemental-operator-crds/fleet.yaml index 7adaa7b..b4a52d1 100644 --- a/fleets/day2/chart-templates/elemental/elemental-operator-crds/fleet.yaml +++ b/fleets/day2/chart-templates/elemental/elemental-operator-crds/fleet.yaml @@ -3,6 +3,6 @@ defaultNamespace: cattle-elemental-system helm: releaseName: elemental-operator-crds chart: "oci://registry.suse.com/rancher/elemental-operator-crds-chart" - version: "1.9.0" + version: "1.9.2" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/elemental/elemental-operator/fleet.yaml b/fleets/day2/chart-templates/elemental/elemental-operator/fleet.yaml index ed7e305..34afcc5 100644 --- a/fleets/day2/chart-templates/elemental/elemental-operator/fleet.yaml +++ b/fleets/day2/chart-templates/elemental/elemental-operator/fleet.yaml @@ -3,7 +3,7 @@ defaultNamespace: cattle-elemental-system helm: releaseName: elemental-operator chart: "oci://registry.suse.com/rancher/elemental-operator-chart" - version: "1.9.0" + version: "1.9.2" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml index 3e1cc38..342a8d7 100644 --- a/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml +++ b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml @@ -4,6 +4,6 @@ helm: releaseName: "neuvector-crd" chart: "neuvector-crd" repo: "https://charts.rancher.io" - version: "109.0.4+up2.11.0" + version: "110.0.0+up2.11.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml index eb583e5..a4aba01 100644 --- a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml +++ b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml @@ -4,7 +4,7 @@ helm: releaseName: "neuvector" chart: "neuvector" repo: "https://charts.rancher.io" - version: "109.0.4+up2.11.0" + version: "110.0.0+up2.11.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/rancher/fleet.yaml b/fleets/day2/chart-templates/rancher/fleet.yaml index fceeb7a..5587830 100644 --- a/fleets/day2/chart-templates/rancher/fleet.yaml +++ b/fleets/day2/chart-templates/rancher/fleet.yaml @@ -3,7 +3,7 @@ defaultNamespace: cattle-system helm: releaseName: "rancher" chart: "rancher" - repo: "https://charts.rancher.com/server-charts/prime" - version: "2.14.2" + repo: "https://releases.rancher.com/server-charts/latest" + version: "2.15.0" # custom chart value overrides values: {} From 80eed76230aab828c09db7483eaf49b472653b42 Mon Sep 17 00:00:00 2001 From: dprodanov4 Date: Mon, 10 Aug 2026 19:30:17 +0300 Subject: [PATCH 5/5] Bump Kubernetes to 1.36.3 for 3.7.0 Regenerates the Day 2 SUC plans, bundles and release artifact lists from the 3.7.0 release manifest, moving RKE2 and K3s to v1.36.3 and the kubectl image to 1.36.3. The same regeneration picks up the kube-rbac-proxy 0.22.1 bump that had already landed in Factory. --- .../k3s-upgrade/plan-bundle.yaml | 4 ++-- .../os-upgrade/os-upgrade-bundle.yaml | 2 +- .../rke2-upgrade/plan-bundle.yaml | 4 ++-- fleets/day2/eib-charts-upgrader/base/job.yaml | 2 +- .../k3s-upgrade/plan-control-plane.yaml | 2 +- .../k3s-upgrade/plan-worker.yaml | 2 +- .../os-upgrade/plan-worker.yaml | 2 +- .../rke2-upgrade/plan-control-plane.yaml | 2 +- .../rke2-upgrade/plan-worker.yaml | 2 +- scripts/day2/edge-release-images.txt | 4 ++-- scripts/day2/edge-release-rke2-images.txt | 12 ++++++------ 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml index 0ec8fd9..582feee 100644 --- a/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml +++ b/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml @@ -35,7 +35,7 @@ spec: cordon: true upgrade: image: rancher/k3s-upgrade - version: v1.35.4+k3s1 + version: v1.36.3+k3s1 --- # SUC Plan related to upgrading the K3s version of worker nodes apiVersion: upgrade.cattle.io/v1 @@ -60,7 +60,7 @@ spec: cordon: true upgrade: image: rancher/k3s-upgrade - version: v1.35.4+k3s1 + version: v1.36.3+k3s1 name: k3s-upgrade-bundle.yaml targets: # Match nothing, user needs to specify targets diff --git a/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml index 9a84abf..ee50b42 100644 --- a/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml +++ b/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml @@ -28,7 +28,7 @@ spec: cordon: true version: "3.7.0" prepare: - image: registry.suse.com/edge/3.7/kubectl:1.35.4 + image: registry.suse.com/edge/3.7/kubectl:1.36.3 command: ["/bin/sh", "-c"] args: - | diff --git a/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml index 6daa12e..d171d4f 100644 --- a/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml +++ b/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml @@ -35,7 +35,7 @@ spec: cordon: true upgrade: image: rancher/rke2-upgrade - version: v1.35.4+rke2r1 + version: v1.36.3+rke2r1 --- # SUC Plan related to upgrading the RKE2 version of worker nodes apiVersion: upgrade.cattle.io/v1 @@ -62,7 +62,7 @@ spec: force: true upgrade: image: rancher/rke2-upgrade - version: v1.35.4+rke2r1 + version: v1.36.3+rke2r1 name: rke2-upgrade-bundle.yaml targets: # Match nothing, user needs to specify targets diff --git a/fleets/day2/eib-charts-upgrader/base/job.yaml b/fleets/day2/eib-charts-upgrader/base/job.yaml index c0863cd..cdfa6a4 100644 --- a/fleets/day2/eib-charts-upgrader/base/job.yaml +++ b/fleets/day2/eib-charts-upgrader/base/job.yaml @@ -8,7 +8,7 @@ spec: serviceAccountName: eib-charts-upgrader containers: - name: kubectl-container - image: registry.suse.com/edge/3.7/kubectl:1.35.4 + image: registry.suse.com/edge/3.7/kubectl:1.36.3 command: ["/bin/sh", "-c"] args: ["/tmp/scripts/chartPatch.sh"] volumeMounts: diff --git a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml index 337c3db..65b3344 100644 --- a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml +++ b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml @@ -26,4 +26,4 @@ spec: cordon: true upgrade: image: rancher/k3s-upgrade - version: v1.35.4+k3s1 + version: v1.36.3+k3s1 diff --git a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-worker.yaml b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-worker.yaml index e300547..2979127 100644 --- a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-worker.yaml +++ b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-worker.yaml @@ -20,4 +20,4 @@ spec: cordon: true upgrade: image: rancher/k3s-upgrade - version: v1.35.4+k3s1 + version: v1.36.3+k3s1 diff --git a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml index 589b266..6820070 100644 --- a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml +++ b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-worker.yaml @@ -19,7 +19,7 @@ spec: cordon: true version: "3.7.0" prepare: - image: registry.suse.com/edge/3.7/kubectl:1.35.4 + image: registry.suse.com/edge/3.7/kubectl:1.36.3 command: ["/bin/sh", "-c"] args: - | diff --git a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml index becf8bd..4400460 100644 --- a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml +++ b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml @@ -26,4 +26,4 @@ spec: cordon: true upgrade: image: rancher/rke2-upgrade - version: v1.35.4+rke2r1 + version: v1.36.3+rke2r1 diff --git a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-worker.yaml b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-worker.yaml index c56209c..5b2cfc8 100644 --- a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-worker.yaml +++ b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-worker.yaml @@ -22,4 +22,4 @@ spec: force: true upgrade: image: rancher/rke2-upgrade - version: v1.35.4+rke2r1 + version: v1.36.3+rke2r1 diff --git a/scripts/day2/edge-release-images.txt b/scripts/day2/edge-release-images.txt index 51ca46e..6c59888 100644 --- a/scripts/day2/edge-release-images.txt +++ b/scripts/day2/edge-release-images.txt @@ -5,7 +5,7 @@ edge/3.7/frr:10.2.1 edge/3.7/frr-k8s:v0.0.25 edge/3.7/ironic:35.0.0.2 edge/3.7/ironic-ipa-downloader:3.1.2 -edge/3.7/kube-rbac-proxy:0.21.2 +edge/3.7/kube-rbac-proxy:0.22.1 edge/mariadb:10.6.15.1 edge/3.7/metallb-controller:v0.16.1 edge/3.7/metallb-speaker:v0.16.1 @@ -24,5 +24,5 @@ suse/sles/15.7/virt-api:1.7.0-150700.3.16.2 suse/sles/15.7/virt-exportproxy:1.7.0-150700.3.16.2 suse/sles/15.7/virt-exportserver:1.7.0-150700.3.16.2 edge/3.7/upgrade-controller:0.1.3 -edge/3.7/kubectl:1.35.4 +edge/3.7/kubectl:1.36.3 edge/3.7/release-manifest:3.7.0 diff --git a/scripts/day2/edge-release-rke2-images.txt b/scripts/day2/edge-release-rke2-images.txt index 7399f39..d6e26ee 100644 --- a/scripts/day2/edge-release-rke2-images.txt +++ b/scripts/day2/edge-release-rke2-images.txt @@ -1,6 +1,6 @@ -https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/sha256sum-amd64.txt -https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2.linux-amd64.tar.gz -https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images.linux-amd64.tar.zst -https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst -https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-core.linux-amd64.tar.zst -https://github.com/rancher/rke2/releases/download/v1.35.4%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst +https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/sha256sum-amd64.txt +https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2.linux-amd64.tar.gz +https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images.linux-amd64.tar.zst +https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst +https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-core.linux-amd64.tar.zst +https://github.com/rancher/rke2/releases/download/v1.36.3%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst