Skip to content

Commit

Permalink
Update RKE2/K3s version to 1.30.5
Browse files Browse the repository at this point in the history
  • Loading branch information
hardys committed Nov 12, 2024
1 parent f372ffe commit af590c3
Show file tree
Hide file tree
Showing 12 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion asciidoc/components/longhorn.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ image:
arch: x86_64
outputImageName: eib-image.iso
kubernetes:
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
helm:
charts:
- name: longhorn
Expand Down
6 changes: 3 additions & 3 deletions asciidoc/components/virtualization.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ This should show something similar to the following:
[,shell]
----
NAME STATUS ROLES AGE VERSION
node1.edge.rdo.wales Ready control-plane,etcd,master 4h20m v1.30.3+rke2r1
node2.edge.rdo.wales Ready control-plane,etcd,master 4h15m v1.30.3+rke2r1
node3.edge.rdo.wales Ready control-plane,etcd,master 4h15m v1.30.3+rke2r1
node1.edge.rdo.wales Ready control-plane,etcd,master 4h20m v1.30.5+rke2r1
node2.edge.rdo.wales Ready control-plane,etcd,master 4h15m v1.30.5+rke2r1
node3.edge.rdo.wales Ready control-plane,etcd,master 4h15m v1.30.5+rke2r1
----

Now you can proceed to install the *KubeVirt* and *Containerized Data Importer (CDI)* Helm charts:
Expand Down
2 changes: 1 addition & 1 deletion asciidoc/day2/migration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ For a full list of the options for the `drain` command, see link:https://kuberne
+
[,bash]
----
curl -sfL https://get.rke2.io | INSTALL_RKE2_VERSION=v1.30.3+rke2r1 sh -
curl -sfL https://get.rke2.io | INSTALL_RKE2_VERSION=v1.30.5+rke2r1 sh -
----

. Restart the `rke2` process:
Expand Down
4 changes: 2 additions & 2 deletions asciidoc/edge-book/version-matrix.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ endif::[]
| SLE Micro | 6 | N/A
| Rancher Prime | 2.9.1 | 2.9.1
| Fleet | 0.10.1 | 104.0.1+up0.10.1
| K3s | 1.30.3 | N/A
| RKE2 | 1.30.3 | N/A
| K3s | 1.30.5 | N/A
| RKE2 | 1.30.5 | N/A
| Metal^3^ | 1.16.0 | 0.8.1
| MetalLB | 0.14.9 | 0.14.9
| Elemental | 1.6.4 | 104.2.0+up1.6.4
Expand Down
26 changes: 13 additions & 13 deletions asciidoc/guides/air-gapped-eib-deployments.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ operatingSystem:
- username: root
encryptedPassword: $6$jHugJNNd3HElGsUZ$eodjVe4te5ps44SVcWshdfWizrP.xAyd71CVEXazBJ/.v799/WRCBXxfYmunlBO2yp1hm/zb4r8EmnrrNCF.P/
kubernetes:
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
embeddedArtifactRegistry:
images:
- ...
Expand All @@ -184,8 +184,8 @@ The `image` section is required, and it specifies the input image, its architect

The `operatingSystem` section is optional, and contains configuration to enable login on the provisioned systems with the `root/eib` username/password.

The `kubernetes` section is optional, and it defines the Kubernetes type and version. We are going to use Kubernetes 1.30.3 and RKE2 by default.
Use `kubernetes.version: v1.30.3+k3s1` if K3s is desired instead. Unless explicitly configured via the `kubernetes.nodes` field, all clusters we bootstrap in this guide will be single-node ones.
The `kubernetes` section is optional, and it defines the Kubernetes type and version. We are going to use Kubernetes 1.30.5 and RKE2 by default.
Use `kubernetes.version: v1.30.5+k3s1` if K3s is desired instead. Unless explicitly configured via the `kubernetes.nodes` field, all clusters we bootstrap in this guide will be single-node ones.

The `embeddedArtifactRegistry` section will include all images which are only referenced and pulled at runtime for the specific component.

Expand Down Expand Up @@ -215,7 +215,7 @@ operatingSystem:
- username: root
encryptedPassword: $6$jHugJNNd3HElGsUZ$eodjVe4te5ps44SVcWshdfWizrP.xAyd71CVEXazBJ/.v799/WRCBXxfYmunlBO2yp1hm/zb4r8EmnrrNCF.P/
kubernetes:
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
network:
apiVIP: 192.168.100.151
manifests:
Expand Down Expand Up @@ -258,12 +258,12 @@ embeddedArtifactRegistry:
- name: registry.rancher.com/rancher/hardened-etcd:v3.5.13-k3s1-build20240531
- name: registry.rancher.com/rancher/hardened-flannel:v0.25.4-build20240610
- name: registry.rancher.com/rancher/hardened-k8s-metrics-server:v0.7.1-build20240401
- name: registry.rancher.com/rancher/hardened-kubernetes:v1.30.3-rke2r1-build20240717
- name: registry.rancher.com/rancher/hardened-kubernetes:v1.30.5-rke2r1-build20240717
- name: registry.rancher.com/rancher/hardened-multus-cni:v4.0.2-build20240612
- name: registry.rancher.com/rancher/hardened-node-feature-discovery:v0.15.4-build20240513
- name: registry.rancher.com/rancher/hardened-whereabouts:v0.7.0-build20240429
- name: registry.rancher.com/rancher/helm-project-operator:v0.2.1
- name: registry.rancher.com/rancher/k3s-upgrade:v1.30.3-k3s1
- name: registry.rancher.com/rancher/k3s-upgrade:v1.30.5-k3s1
- name: registry.rancher.com/rancher/klipper-helm:v0.8.4-build20240523
- name: registry.rancher.com/rancher/klipper-lb:v0.4.7
- name: registry.rancher.com/rancher/kube-api-auth:v0.2.2
Expand All @@ -281,12 +281,12 @@ embeddedArtifactRegistry:
- name: registry.rancher.com/rancher/rancher:v2.9.1
- name: registry.rancher.com/rancher/rke-tools:v0.1.100
- name: registry.rancher.com/rancher/rke2-cloud-provider:v1.29.3-build20240515
- name: registry.rancher.com/rancher/rke2-runtime:v1.30.3-rke2r1
- name: registry.rancher.com/rancher/rke2-upgrade:v1.30.3-rke2r1
- name: registry.rancher.com/rancher/rke2-runtime:v1.30.5-rke2r1
- name: registry.rancher.com/rancher/rke2-upgrade:v1.30.5-rke2r1
- name: registry.rancher.com/rancher/security-scan:v0.2.16
- name: registry.rancher.com/rancher/shell:v0.2.1
- name: registry.rancher.com/rancher/system-agent-installer-k3s:v1.30.3-k3s1
- name: registry.rancher.com/rancher/system-agent-installer-rke2:v1.30.3-rke2r1
- name: registry.rancher.com/rancher/system-agent-installer-k3s:v1.30.5-k3s1
- name: registry.rancher.com/rancher/system-agent-installer-rke2:v1.30.5-rke2r1
- name: registry.rancher.com/rancher/system-agent:v0.3.8-suc
- name: registry.rancher.com/rancher/system-upgrade-controller:v0.13.4
- name: registry.rancher.com/rancher/ui-plugin-catalog:2.0.1
Expand Down Expand Up @@ -415,7 +415,7 @@ operatingSystem:
- username: root
encryptedPassword: $6$jHugJNNd3HElGsUZ$eodjVe4te5ps44SVcWshdfWizrP.xAyd71CVEXazBJ/.v799/WRCBXxfYmunlBO2yp1hm/zb4r8EmnrrNCF.P/
kubernetes:
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
helm:
charts:
- name: neuvector-crd
Expand Down Expand Up @@ -547,7 +547,7 @@ operatingSystem:
packageList:
- open-iscsi
kubernetes:
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
helm:
charts:
- name: longhorn
Expand Down Expand Up @@ -715,7 +715,7 @@ operatingSystem:
- username: root
encryptedPassword: $6$jHugJNNd3HElGsUZ$eodjVe4te5ps44SVcWshdfWizrP.xAyd71CVEXazBJ/.v799/WRCBXxfYmunlBO2yp1hm/zb4r8EmnrrNCF.P/
kubernetes:
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
helm:
charts:
- name: kubevirt-chart
Expand Down
4 changes: 2 additions & 2 deletions asciidoc/integrations/nvidia-slemicro.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ This should show something similar to the following:
[,shell]
----
NAME STATUS ROLES AGE VERSION
node0001 Ready control-plane,etcd,master 13d v1.30.3+rke2r1
node0001 Ready control-plane,etcd,master 13d v1.30.5+rke2r1
----

What you should find is that your k3s/rke2 installation has detected the NVIDIA Container Toolkit on the host and auto-configured the NVIDIA runtime integration into `containerd` (the Container Runtime Interface that k3s/rke2 use). Confirm this by checking the containerd `config.toml` file:
Expand Down Expand Up @@ -467,7 +467,7 @@ operatingSystem:
- url: https://nvidia.github.io/libnvidia-container/stable/rpm/x86_64
sccRegistrationCode: <snip>
kubernetes:
version: v1.30.3+k3s1
version: v1.30.5+k3s1
helm:
charts:
- name: nvidia-device-plugin
Expand Down
2 changes: 1 addition & 1 deletion asciidoc/misc/rke2-selinux.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Install RKE2 Using Install Script
[,bash]
----
curl -sfL https://get.rke2.io | INSTALL_RKE2_EXEC="server" \
RKE2_SELINUX=true INSTALL_RKE2_VERSION=v1.30.3+rke2r1 sh -
RKE2_SELINUX=true INSTALL_RKE2_VERSION=v1.30.5+rke2r1 sh -
# Enable and Start RKE2
systemctl enable --now rke2-server.service
Expand Down
6 changes: 3 additions & 3 deletions asciidoc/product/atip-automated-provision.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ The `RKE2ControlPlane` object specifies the control-plane configuration to be us
Also, it contains the information about the number of replicas to be used (in this case, one) and the `CNI` plug-in to be used (in this case, `Cilium`).
The agentConfig block contains the `Ignition` format to be used and the `additionalUserData` to be used to configure the `RKE2` node with information like a systemd named `rke2-preinstall.service` to replace automatically the `BAREMETALHOST_UUID` and `node-name` during the provisioning process using the Ironic information.
To enable multus with cilium a file is created in the `rke2` server manifests directory named `rke2-cilium-config.yaml` with the configuration to be used.
The last block of information contains the Kubernetes version to be used. `$\{RKE2_VERSION\}` is the version of `RKE2` to be used replacing this value (for example, `v1.30.3+rke2r1`).
The last block of information contains the Kubernetes version to be used. `$\{RKE2_VERSION\}` is the version of `RKE2` to be used replacing this value (for example, `v1.30.5+rke2r1`).

[,yaml]
----
Expand Down Expand Up @@ -983,7 +983,7 @@ The `RKE2ControlPlane` object specifies the control-plane configuration to be us
** The `storage` block which contains the Helm charts to be used to install the `MetalLB` and the `endpoint-copier-operator`.
** The `metalLB` custom resource file with the `IPaddressPool` and the `L2Advertisement` to be used (replacing `$\{EDGE_VIP_ADDRESS\}` with the `VIP` address).
** The `endpoint-svc.yaml` file to be used to configure the `kubernetes-vip` service to be used by the `MetalLB` to manage the `VIP` address.
* The last block of information contains the Kubernetes version to be used. The `$\{RKE2_VERSION\}` is the version of `RKE2` to be used replacing this value (for example, `v1.30.3+rke2r1`).
* The last block of information contains the Kubernetes version to be used. The `$\{RKE2_VERSION\}` is the version of `RKE2` to be used replacing this value (for example, `v1.30.5+rke2r1`).

[,yaml]
----
Expand Down Expand Up @@ -1398,7 +1398,7 @@ To make the process clear, the changes required on that block (`RKE2ControlPlane
** `performance-settings.service` to enable the CPU performance tuning.
** `sriov-custom-auto-vfs.service` to install the `sriov` Helm chart, wait until custom resources are created and run the `/var/sriov-auto-filler.sh` to replace the values in the config map `sriov-custom-auto-config` and create the `sriovnetworknodepolicy` to be used by the workloads.

* The `$\{RKE2_VERSION\}` is the version of `RKE2` to be used replacing this value (for example, `v1.30.3+rke2r1`).
* The `$\{RKE2_VERSION\}` is the version of `RKE2` to be used replacing this value (for example, `v1.30.5+rke2r1`).

With all these changes mentioned, the `RKE2ControlPlane` block in the `capi-provisioning-example.yaml` will look like the following:

Expand Down
14 changes: 7 additions & 7 deletions asciidoc/product/atip-management-cluster.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ kubernetes:
# type: server
----

where `version` is the version of Kubernetes to be installed. In our case, we are using an RKE2 cluster, so the version must be minor less than 1.29 to be compatible with `Rancher` (for example, `v1.30.3+rke2r1`).
where `version` is the version of Kubernetes to be installed. In our case, we are using an RKE2 cluster, so the version must be minor less than 1.29 to be compatible with `Rancher` (for example, `v1.30.5+rke2r1`).

The `helm` section contains the list of Helm charts to be installed, the repositories to be used, and the version configuration for all of them.

Expand Down Expand Up @@ -1100,12 +1100,12 @@ embeddedArtifactRegistry:
- name: registry.rancher.com/rancher/hardened-etcd:v3.5.13-k3s1-build20240531
- name: registry.rancher.com/rancher/hardened-flannel:v0.25.4-build20240610
- name: registry.rancher.com/rancher/hardened-k8s-metrics-server:v0.7.1-build20240401
- name: registry.rancher.com/rancher/hardened-kubernetes:v1.30.3-rke2r1-build20240717
- name: registry.rancher.com/rancher/hardened-kubernetes:v1.30.5-rke2r1-build20240717
- name: registry.rancher.com/rancher/hardened-multus-cni:v4.0.2-build20240612
- name: registry.rancher.com/rancher/hardened-node-feature-discovery:v0.15.4-build20240513
- name: registry.rancher.com/rancher/hardened-whereabouts:v0.7.0-build20240429
- name: registry.rancher.com/rancher/helm-project-operator:v0.2.1
- name: registry.rancher.com/rancher/k3s-upgrade:v1.30.3-k3s1
- name: registry.rancher.com/rancher/k3s-upgrade:v1.30.5-k3s1
- name: registry.rancher.com/rancher/klipper-helm:v0.8.4-build20240523
- name: registry.rancher.com/rancher/klipper-lb:v0.4.7
- name: registry.rancher.com/rancher/kube-api-auth:v0.2.2
Expand All @@ -1123,12 +1123,12 @@ embeddedArtifactRegistry:
- name: registry.rancher.com/rancher/rancher:v2.9.1
- name: registry.rancher.com/rancher/rke-tools:v0.1.100
- name: registry.rancher.com/rancher/rke2-cloud-provider:v1.29.3-build20240515
- name: registry.rancher.com/rancher/rke2-runtime:v1.30.3-rke2r1
- name: registry.rancher.com/rancher/rke2-upgrade:v1.30.3-rke2r1
- name: registry.rancher.com/rancher/rke2-runtime:v1.30.5-rke2r1
- name: registry.rancher.com/rancher/rke2-upgrade:v1.30.5-rke2r1
- name: registry.rancher.com/rancher/security-scan:v0.2.16
- name: registry.rancher.com/rancher/shell:v0.2.1
- name: registry.rancher.com/rancher/system-agent-installer-k3s:v1.30.3-k3s1
- name: registry.rancher.com/rancher/system-agent-installer-rke2:v1.30.3-rke2r1
- name: registry.rancher.com/rancher/system-agent-installer-k3s:v1.30.5-k3s1
- name: registry.rancher.com/rancher/system-agent-installer-rke2:v1.30.5-rke2r1
- name: registry.rancher.com/rancher/system-agent:v0.3.8-suc
- name: registry.rancher.com/rancher/system-upgrade-controller:v0.13.4
- name: registry.rancher.com/rancher/ui-plugin-catalog:2.0.1
Expand Down
4 changes: 2 additions & 2 deletions asciidoc/quickstart/eib.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ In this next example, we're going to take our existing image definition and will
[,yaml]
----
kubernetes:
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
manifests:
urls:
- https://k8s.io/examples/application/nginx-app.yaml
Expand Down Expand Up @@ -242,7 +242,7 @@ operatingSystem:
additionalRepos:
- url: https://nvidia.github.io/libnvidia-container/stable/rpm/x86_64
kubernetes:
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
manifests:
urls:
- https://k8s.io/examples/application/nginx-app.yaml
Expand Down
4 changes: 2 additions & 2 deletions asciidoc/quickstart/elemental.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ metadata:
name: location-123
namespace: fleet-default
spec:
kubernetesVersion: v1.30.3+k3s1
kubernetesVersion: v1.30.5+k3s1
rkeConfig:
machinePools:
- name: pool1
Expand All @@ -370,7 +370,7 @@ The UI extension allows for a few shortcuts to be taken. Note that managing mult
. As before, open the left three-dot menu and select "OS Management." This brings you back to the main screen for managing your Elemental systems.
. On the left sidebar, click "Inventory of Machines." This opens the inventory of machines that have registered.
. To create a cluster from these machines, select the systems you want, click the "Actions" drop-down list, then "Create Elemental Cluster." This opens the Cluster Creation dialog while also creating a MachineSelectorTemplate to use in the background.
. On this screen, configure the cluster you want to be built. For this quick start, K3s v1.30.3+k3s1 is selected and the rest of the options are left as is.
. On this screen, configure the cluster you want to be built. For this quick start, K3s v1.30.5+k3s1 is selected and the rest of the options are left as is.
+
[TIP]
====
Expand Down
6 changes: 3 additions & 3 deletions asciidoc/quickstart/metal3.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ spec:
ExecStartPost=/bin/sh -c "umount /mnt"
[Install]
WantedBy=multi-user.target
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: Metal3MachineTemplate
Expand Down Expand Up @@ -633,7 +633,7 @@ spec:
kind: Metal3MachineTemplate
name: sample-cluster-workers
nodeDrainTimeout: 0s
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
---
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha1
kind: RKE2ConfigTemplate
Expand All @@ -645,7 +645,7 @@ spec:
spec:
agentConfig:
format: ignition
version: v1.30.3+rke2r1
version: v1.30.5+rke2r1
kubelet:
extraArgs:
- provider-id=metal3://BAREMETALHOST_UUID
Expand Down

0 comments on commit af590c3

Please sign in to comment.