From 4693910b0080073440cfae19c1a70f7dae1b7eb1 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 12 Nov 2024 16:41:40 +0000 Subject: [PATCH] Update metal3 to 0.8.3 --- asciidoc/day2/migration.adoc | 18 +++++++++--------- asciidoc/edge-book/version-matrix.adoc | 2 +- asciidoc/product/atip-lifecycle.adoc | 2 +- asciidoc/product/atip-management-cluster.adoc | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/asciidoc/day2/migration.adoc b/asciidoc/day2/migration.adoc index a61bd1ac..9999147f 100644 --- a/asciidoc/day2/migration.adoc +++ b/asciidoc/day2/migration.adoc @@ -525,7 +525,7 @@ _Use-case:_ _Steps:_ -. Locate the desired versions for `Rancher` and `Metal^3^` from the <>. For `Edge 3.1.0`, these versions would be `2.9.3` for _Rancher_ and `0.8.1` for _Metal^3^_. +. Locate the desired versions for `Rancher` and `Metal^3^` from the <>. For `Edge 3.1.0`, these versions would be `2.9.3` for _Rancher_ and `0.8.3` for _Metal^3^_. . Pull the desired chart versions: @@ -541,7 +541,7 @@ helm pull rancher-prime/rancher --version=2.9.3 + [,bash] ---- -helm pull oci://registry.suse.com/edge/3.1/metal3-chart --version=0.8.1 +helm pull oci://registry.suse.com/edge/3.1/metal3-chart --version=0.8.3 ---- . Encode the `Rancher` and `Metal^3^` Helm charts: @@ -549,7 +549,7 @@ helm pull oci://registry.suse.com/edge/3.1/metal3-chart --version=0.8.1 [,bash] ---- base64 -w 0 rancher-2.9.3.tgz > rancher-2.9.3.txt -base64 -w 0 metal3-chart-0.8.1.tgz > metal3-chart-0.8.1.txt +base64 -w 0 metal3-chart-0.8.3.tgz > metal3-chart-0.8.3.txt ---- . The directory structure should look similar to this: @@ -557,8 +557,8 @@ base64 -w 0 metal3-chart-0.8.1.tgz > metal3-chart-0.8.1.txt [,bash] ---- . -├── metal3-chart-0.8.1.tgz -├── metal3-chart-0.8.1.txt +├── metal3-chart-0.8.3.tgz +├── metal3-chart-0.8.3.txt ├── rancher-2.9.3.tgz └── rancher-2.9.3.txt ---- @@ -593,7 +593,7 @@ kubectl get ingress rancher -n cattle-system -o yaml | grep -w ingressClassName kubectl patch helmchart rancher --type=merge -p "{\"spec\":{\"chartContent\":\"$(cat rancher-2.9.3.txt)\", \"version\":\"2.9.3\"}}" -n default # Metal3 deployed in the kube-system namespace -kubectl patch helmchart metal3 --type=merge -p "{\"spec\":{\"chartContent\":\"$(cat metal3-chart-0.8.1.txt)\", \"version\":\"0.8.1\"}}" -n kube-system +kubectl patch helmchart metal3 --type=merge -p "{\"spec\":{\"chartContent\":\"$(cat metal3-chart-0.8.3.txt)\", \"version\":\"0.8.3\"}}" -n kube-system ---- . Locate the `helm-controller` created _Rancher_ and _Metal^3^_ Pods: @@ -647,7 +647,7 @@ kubectl logs helm-install-metal3-57lz5 -n kube-system Upgrading metal3 + echo 'Upgrading metal3' + shift 1 -+ helm_v3 upgrade --namespace metal3-system --create-namespace --version 0.8.1 --set-string global.clusterCIDR=10.42.0.0/16 --set-string global.clusterCIDRv4=10.42.0.0/16 --set-string global.clusterDNS=10.43.0.10 --set-string global.clusterDomain=cluster.local --set-string global.rke2DataDir=/var/lib/rancher/rke2 --set-string global.serviceCIDR=10.43.0.0/16 metal3 /tmp/metal3.tgz --values /config/values-01_HelmChart.yaml ++ helm_v3 upgrade --namespace metal3-system --create-namespace --version 0.8.3 --set-string global.clusterCIDR=10.42.0.0/16 --set-string global.clusterCIDRv4=10.42.0.0/16 --set-string global.clusterDNS=10.43.0.10 --set-string global.clusterDomain=cluster.local --set-string global.rke2DataDir=/var/lib/rancher/rke2 --set-string global.serviceCIDR=10.43.0.0/16 metal3 /tmp/metal3.tgz --values /config/values-01_HelmChart.yaml Release "metal3" has been upgraded. Happy Helming! ... ---- @@ -755,7 +755,7 @@ helm repo add rancher-prime https://charts.rancher.com/server-charts/prime _Steps:_ -. Locate the desired versions for `Rancher` and `Metal^3^` from the <>. For `Edge 3.1.0`, these versions would be `2.9.3` for Rancher and `0.8.1` for Metal^3^. +. Locate the desired versions for `Rancher` and `Metal^3^` from the <>. For `Edge 3.1.0`, these versions would be `2.9.3` for Rancher and `0.8.3` for Metal^3^. . Get the custom values of the currently running `Rancher` and `Metal^3^` helm charts: + @@ -780,7 +780,7 @@ helm get values metal3 -n metal3-system -o yaml > metal3-values.yaml helm upgrade rancher rancher-prime/rancher --version 2.9.3 --set ingress.ingressClassName=nginx --values rancher-values.yaml -n cattle-system # For Metal3 -helm upgrade metal3 oci://registry.suse.com/edge/3.1/metal3-chart --version 0.8.1 --values metal3-values.yaml -n metal3-system +helm upgrade metal3 oci://registry.suse.com/edge/3.1/metal3-chart --version 0.8.3 --values metal3-values.yaml -n metal3-system ---- . Validate that the `Rancher` and Metal^3^ pods are running: diff --git a/asciidoc/edge-book/version-matrix.adoc b/asciidoc/edge-book/version-matrix.adoc index 35527aba..4f6e3867 100644 --- a/asciidoc/edge-book/version-matrix.adoc +++ b/asciidoc/edge-book/version-matrix.adoc @@ -21,7 +21,7 @@ endif::[] | Fleet | 0.10.1 | 104.0.1+up0.10.1 | K3s | 1.30.5 | N/A | RKE2 | 1.30.5 | N/A -| Metal^3^ | 1.16.0 | 0.8.1 +| Metal^3^ | 1.16.0 | 0.8.3 | MetalLB | 0.14.9 | 0.14.9 | Elemental | 1.6.4 | 104.2.0+up1.6.4 | Edge Image Builder | 1.1.0 | N/A diff --git a/asciidoc/product/atip-lifecycle.adoc b/asciidoc/product/atip-lifecycle.adoc index 46524d21..af5d4765 100644 --- a/asciidoc/product/atip-lifecycle.adoc +++ b/asciidoc/product/atip-lifecycle.adoc @@ -38,7 +38,7 @@ helm get values metal3 -n metal3-system -o yaml > metal3-values.yaml helm upgrade metal3 suse-edge/metal3 \ --namespace metal3-system \ -f metal3-values.yaml \ - --version=0.8.1 + --version=0.8.3 ---- === Downstream cluster upgrades diff --git a/asciidoc/product/atip-management-cluster.adoc b/asciidoc/product/atip-management-cluster.adoc index 6a6da040..96f6b675 100644 --- a/asciidoc/product/atip-management-cluster.adoc +++ b/asciidoc/product/atip-management-cluster.adoc @@ -182,7 +182,7 @@ kubernetes: createNamespace: true installationNamespace: kube-system - name: metal3-chart - version: 0.8.1 + version: 0.8.3 repositoryName: suse-edge-charts targetNamespace: metal3-system createNamespace: true @@ -311,7 +311,7 @@ kubernetes: createNamespace: true installationNamespace: kube-system - name: metal3-chart - version: 0.8.1 + version: 0.8.3 repositoryName: suse-edge-charts targetNamespace: metal3-system createNamespace: true @@ -1022,7 +1022,7 @@ kubernetes: createNamespace: true installationNamespace: kube-system - name: metal3-chart - version: 0.8.1 + version: 0.8.3 repositoryName: suse-edge-charts targetNamespace: metal3-system createNamespace: true