Skip to content

Commit 6835756

Browse files
Merge pull request #364 from furkatgofurov7/align-dep-versions
Align dependency versions in next version of docs
2 parents bdeec8c + cd2c313 commit 6835756

File tree

3 files changed

+47
-47
lines changed

3 files changed

+47
-47
lines changed

docs/next/modules/en/pages/reference/clusterctlconfig.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ metadata:
2626
spec:
2727
providers:
2828
- name: metal3
29-
url: https://github.com/metal3-io/cluster-api-provider-metal3/releases/v1.7.1/infrastructure-components.yaml
29+
url: https://github.com/metal3-io/cluster-api-provider-metal3/releases/v1.10.1/infrastructure-components.yaml
3030
type: InfrastructureProvider
3131
images:
3232
- name: metal3
@@ -42,7 +42,7 @@ The key fields in the `ClusterctlConfig` spec are:
4242

4343
* `providers[].name` - Name of the provider (e.g. metal3)
4444
* `providers[].url` - URL of the provider configuration (e.g.
45-
https://github.com/metal3-io/cluster-api-provider-metal3/releases/v1.7.1/infrastructure-components.yaml). This can use `latest` release, if supported, or pin the maximum version to `v1.7.1` for example.
45+
https://github.com/metal3-io/cluster-api-provider-metal3/releases/v1.10.1/infrastructure-components.yaml). This can use `latest` release, if supported, or pin the maximum version to `v1.10.1` for example.
4646
* `providers[].type` - Type of the provider (e.g. InfrastructureProvider)
4747

4848
* `images[].name` - The image name to override (e.g. infrastructure-metal3, cluster-api, bootstrap-rke2, control-plane-rke2)
@@ -72,10 +72,10 @@ metadata:
7272
spec:
7373
providers:
7474
- name: rke2
75-
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.16.0/control-plane-components.yaml"
75+
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.20.1/control-plane-components.yaml"
7676
type: ControlPlaneProvider
7777
- name: rke2
78-
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.16.0/bootstrap-components.yaml"
78+
url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.20.1/bootstrap-components.yaml"
7979
type: BootstrapProvider
8080
images:
8181
- name: control-plane-rke2

docs/next/modules/en/pages/tutorials/quickstart.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ If you're customizing the installation parameters, please make sure that you are
4444
| Name | Version
4545

4646
| Cluster API
47-
| `v1.9.5`
47+
| `v1.10.5`
4848

4949
| Cluster API Provider RKE2
50-
| `v0.19.0`
50+
| `v0.20.1`
5151
|===
5252

5353
== Install {product_name} using Rancher Dashboard

docs/next/modules/en/pages/user/clusterclass.adoc

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ An Azure RKE2 ClusterClass and associated applications can be applied using the
439439
+
440440
[source,bash]
441441
----
442-
go run github.com/rancher/turtles/examples@v0.21.0 -r azure-rke2 | kubectl apply -f -
442+
go run github.com/rancher/turtles/examples@v0.23.0 -r azure-rke2 | kubectl apply -f -
443443
----
444444

445445
kubectl::
@@ -448,7 +448,7 @@ kubectl::
448448
+
449449
[source,bash]
450450
----
451-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/azure/rke2/clusterclass-rke2-example.yaml
451+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/azure/rke2/clusterclass-rke2-example.yaml
452452
----
453453
+
454454
* Additionally, the https://capz.sigs.k8s.io/self-managed/cloud-provider-config[Azure Cloud Provider] will need to be installed on each downstream Cluster, for the nodes to be initialized correctly. +
@@ -460,8 +460,8 @@ Two `HelmOps` need to be created first, to be applied on the new Cluster via lab
460460
+
461461
[source,bash]
462462
----
463-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/ccm/azure/helm-chart.yaml
464-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/cni/calico/helm-chart.yaml
463+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/ccm/azure/helm-chart.yaml
464+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/cni/calico/helm-chart.yaml
465465
----
466466
=======
467467
@@ -519,7 +519,7 @@ An Azure AKS ClusterClass and associated applications can be applied using the e
519519
+
520520
[source,bash]
521521
----
522-
go run github.com/rancher/turtles/examples@v0.21.0 -r azure-aks | kubectl apply -f -
522+
go run github.com/rancher/turtles/examples@v0.23.0 -r azure-aks | kubectl apply -f -
523523
----
524524

525525
kubectl::
@@ -528,7 +528,7 @@ kubectl::
528528
+
529529
[source,bash]
530530
----
531-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/azure/aks/clusterclass-aks-example.yaml
531+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/azure/aks/clusterclass-aks-example.yaml
532532
----
533533
=======
534534
@@ -586,7 +586,7 @@ An Azure ClusterClass and associated applications can be applied using the examp
586586
+
587587
[source,bash]
588588
----
589-
go run github.com/rancher/turtles/examples@v0.21.0 -r azure-kubeadm | kubectl apply -f -
589+
go run github.com/rancher/turtles/examples@v0.23.0 -r azure-kubeadm | kubectl apply -f -
590590
----
591591

592592
kubectl::
@@ -595,7 +595,7 @@ kubectl::
595595
+
596596
[source,bash]
597597
----
598-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/azure/kubeadm/clusterclass-kubeadm-example.yaml
598+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/azure/kubeadm/clusterclass-kubeadm-example.yaml
599599
----
600600
+
601601
* Additionally, the https://capz.sigs.k8s.io/self-managed/cloud-provider-config[Azure Cloud Provider] will need to be installed on each downstream Cluster, for the nodes to be initialized correctly. +
@@ -607,8 +607,8 @@ Two `HelmOps` need to be created first, to be applied on the new Cluster via lab
607607
+
608608
[source,bash]
609609
----
610-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/ccm/azure/helm-chart.yaml
611-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/cni/calico/helm-chart.yaml
610+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/ccm/azure/helm-chart.yaml
611+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/cni/calico/helm-chart.yaml
612612
----
613613
=======
614614
+
@@ -667,7 +667,7 @@ An AWS Kubeadm ClusterClass and associated applications can be applied using the
667667
+
668668
[source,bash]
669669
----
670-
go run github.com/rancher/turtles/examples@v0.21.0 -r aws-kubeadm | kubectl apply -f -
670+
go run github.com/rancher/turtles/examples@v0.23.0 -r aws-kubeadm | kubectl apply -f -
671671
----
672672

673673
kubectl::
@@ -676,7 +676,7 @@ kubectl::
676676
+
677677
[source,bash]
678678
----
679-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/aws/kubeadm/clusterclass-kubeadm-example.yaml
679+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/aws/kubeadm/clusterclass-kubeadm-example.yaml
680680
----
681681
+
682682
* For this example we are also going to install https://docs.tigera.io/calico/latest/about/[Calico] as the default CNI. +
@@ -689,9 +689,9 @@ The `HelmOps` need to be created first, to be applied on the new Cluster via lab
689689
+
690690
[source,bash]
691691
----
692-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/csi/aws/helm-chart.yaml
693-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/cni/aws/calico/helm-chart.yaml
694-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/ccm/aws/helm-chart.yaml
692+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/csi/aws/helm-chart.yaml
693+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/cni/aws/calico/helm-chart.yaml
694+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/ccm/aws/helm-chart.yaml
695695
----
696696
=======
697697
+
@@ -758,7 +758,7 @@ An AWS RKE2 ClusterClass and associated applications can be applied using the ex
758758
+
759759
[source,bash]
760760
----
761-
go run github.com/rancher/turtles/examples@v0.21.0 -r aws-rke2 | kubectl apply -f -
761+
go run github.com/rancher/turtles/examples@v0.23.0 -r aws-rke2 | kubectl apply -f -
762762
----
763763

764764
kubectl::
@@ -767,7 +767,7 @@ kubectl::
767767
+
768768
[source,bash]
769769
----
770-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/aws/rke2/clusterclass-ec2-rke2-example.yaml
770+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/aws/rke2/clusterclass-ec2-rke2-example.yaml
771771
----
772772
+
773773
* For this example we are also going to install https://docs.tigera.io/calico/latest/about/[Calico] as the default CNI. +
@@ -780,9 +780,9 @@ The `HelmOps` need to be created first, to be applied on the new Cluster via lab
780780
+
781781
[source,bash]
782782
----
783-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/csi/aws/helm-chart.yaml
784-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/cni/aws/calico/helm-chart.yaml
785-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/ccm/aws/helm-chart.yaml
783+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/csi/aws/helm-chart.yaml
784+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/cni/aws/calico/helm-chart.yaml
785+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/ccm/aws/helm-chart.yaml
786786
----
787787
=======
788788
+
@@ -853,7 +853,7 @@ A GCP Kubeadm ClusterClass and associated applications can be applied using the
853853
+
854854
[source,bash]
855855
----
856-
go run github.com/rancher/turtles/examples@v0.21.0 -r gcp-kubeadm | kubectl apply -f -
856+
go run github.com/rancher/turtles/examples@v0.23.0 -r gcp-kubeadm | kubectl apply -f -
857857
----
858858

859859
kubectl::
@@ -862,7 +862,7 @@ kubectl::
862862
+
863863
[source,bash]
864864
----
865-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/gcp/kubeadm/clusterclass-kubeadm-example.yaml
865+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/gcp/kubeadm/clusterclass-kubeadm-example.yaml
866866
----
867867
+
868868
* For this example we are also going to install https://docs.tigera.io/calico/latest/about/[Calico] as the default CNI. +
@@ -874,14 +874,14 @@ The `HelmOps` need to be created first, to be applied on the new Cluster via lab
874874
+
875875
[source,bash]
876876
----
877-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/cni/calico/helm-chart.yaml
877+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/cni/calico/helm-chart.yaml
878878
----
879879
+
880880
A `Bundle` will take care of deploying GCP Cloud Controller Manager. The reason for not using Add-on Provider Fleet is that https://github.com/kubernetes/cloud-provider-gcp[GCP Cloud Controller Manager] does not provide a Helm chart, so we opt for creating the Fleet `Bundle` resource directly. +
881881
+
882882
[source,bash]
883883
----
884-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/ccm/gcp/bundle.yaml
884+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/ccm/gcp/bundle.yaml
885885
----
886886
=======
887887
+
@@ -946,7 +946,7 @@ A Docker Kubeadm ClusterClass and associated applications can be applied using t
946946
+
947947
[source,bash]
948948
----
949-
go run github.com/rancher/turtles/examples@v0.21.0 -r docker-kubeadm | kubectl apply -f -
949+
go run github.com/rancher/turtles/examples@v0.23.0 -r docker-kubeadm | kubectl apply -f -
950950
----
951951

952952
kubectl::
@@ -955,7 +955,7 @@ kubectl::
955955
+
956956
[source,bash]
957957
----
958-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/docker/kubeadm/clusterclass-docker-kubeadm.yaml
958+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/docker/kubeadm/clusterclass-docker-kubeadm.yaml
959959
----
960960
+
961961
* For this example we are also going to install Calico as the default CNI.
@@ -966,7 +966,7 @@ Two `HelmOps` need to be created first, to be applied on the new Cluster via lab
966966
+
967967
[source,bash]
968968
----
969-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/cni/calico/helm-chart.yaml
969+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/cni/calico/helm-chart.yaml
970970
----
971971
=======
972972
+
@@ -1017,7 +1017,7 @@ A Docker RKE2 ClusterClass and associated applications can be applied using the
10171017
+
10181018
[source,bash]
10191019
----
1020-
go run github.com/rancher/turtles/examples@v0.21.0 -r docker-rke2 | kubectl apply -f -
1020+
go run github.com/rancher/turtles/examples@v0.23.0 -r docker-rke2 | kubectl apply -f -
10211021
----
10221022

10231023
kubectl::
@@ -1026,7 +1026,7 @@ kubectl::
10261026
+
10271027
[source,bash]
10281028
----
1029-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/docker/rke2/clusterclass-docker-rke2.yaml
1029+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/docker/rke2/clusterclass-docker-rke2.yaml
10301030
----
10311031
+
10321032
* For this example we are also going to install Calico as the default CNI.
@@ -1037,14 +1037,14 @@ Two `HelmOps` need to be created first, to be applied on the new Cluster via lab
10371037
+
10381038
[source,bash]
10391039
----
1040-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/cni/calico/helm-chart.yaml
1040+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/cni/calico/helm-chart.yaml
10411041
----
10421042
+
10431043
* Create the LoadBalancer ConfigMap for Docker RKEv2 Cluster +
10441044
+
10451045
[source,bash]
10461046
----
1047-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/lb/docker/configmap.yaml
1047+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/lb/docker/configmap.yaml
10481048
----
10491049
=======
10501050
+
@@ -1100,7 +1100,7 @@ A vSphere Kubeadm ClusterClass and associated applications can be applied using
11001100
+
11011101
[source,bash]
11021102
----
1103-
go run github.com/rancher/turtles/examples@v0.21.0 -r vsphere-kubeadm | kubectl apply -f -
1103+
go run github.com/rancher/turtles/examples@v0.23.0 -r vsphere-kubeadm | kubectl apply -f -
11041104
----
11051105

11061106
kubectl::
@@ -1109,7 +1109,7 @@ kubectl::
11091109
+
11101110
[source,bash]
11111111
----
1112-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/vsphere/kubeadm/clusterclass-kubeadm-example.yaml
1112+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/vsphere/kubeadm/clusterclass-kubeadm-example.yaml
11131113
----
11141114
+
11151115
* Additionally, the https://github.com/kubernetes/cloud-provider-vsphere[vSphere Cloud Provider] will need to be installed on each downstream Cluster, for the nodes to be initialized correctly. +
@@ -1122,15 +1122,15 @@ Two `HelmOps` need to be created first, to be applied on the new Cluster via lab
11221122
+
11231123
[source,bash]
11241124
----
1125-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/ccm/vsphere/helm-chart.yaml
1126-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/cni/calico/helm-chart.yaml
1125+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/ccm/vsphere/helm-chart.yaml
1126+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/cni/calico/helm-chart.yaml
11271127
----
11281128
+
11291129
Since the vSphere CSI driver is not packaged in Helm, we are going to include its entire manifest in a Fleet Bundle, that will be applied to the downstream Cluster.
11301130
+
11311131
[source,bash]
11321132
----
1133-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/csi/vsphere/bundle.yaml
1133+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/csi/vsphere/bundle.yaml
11341134
----
11351135
=======
11361136
+
@@ -1278,7 +1278,7 @@ A vSphere RKE2 ClusterClass and associated applications can be applied using the
12781278
+
12791279
[source,bash]
12801280
----
1281-
go run github.com/rancher/turtles/examples@v0.21.0 -r vsphere-rke2 | kubectl apply -f -
1281+
go run github.com/rancher/turtles/examples@v0.23.0 -r vsphere-rke2 | kubectl apply -f -
12821282
----
12831283

12841284
kubectl::
@@ -1287,7 +1287,7 @@ kubectl::
12871287
+
12881288
[source,bash]
12891289
----
1290-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/clusterclasses/vsphere/rke2/clusterclass-rke2-example.yaml
1290+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/clusterclasses/vsphere/rke2/clusterclass-rke2-example.yaml
12911291
----
12921292
+
12931293
* Additionally, the https://github.com/kubernetes/cloud-provider-vsphere[vSphere Cloud Provider] will need to be installed on each downstream Cluster, for the nodes to be initialized correctly. +
@@ -1300,15 +1300,15 @@ Two `HelmOps` need to be created first, to be applied on the new Cluster via lab
13001300
+
13011301
[source,bash]
13021302
----
1303-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/ccm/vsphere/helm-chart.yaml
1304-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/cni/calico/helm-chart.yaml
1303+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/ccm/vsphere/helm-chart.yaml
1304+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/cni/calico/helm-chart.yaml
13051305
----
13061306
+
13071307
Since the vSphere CSI driver is not packaged in Helm, we are going to include its entire manifest in a Fleet Bundle, that will be applied to the downstream Cluster.
13081308
+
13091309
[source,bash]
13101310
----
1311-
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.21.0/examples/applications/csi/vsphere/bundle.yaml
1311+
kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.23.0/examples/applications/csi/vsphere/bundle.yaml
13121312
----
13131313

13141314
=======

0 commit comments

Comments
 (0)