Skip to content

Commit 6799be5

Browse files
Merge pull request #352 from anmazzotti/revert_rancher_2-12
Revert "Bump Rancher to v2.12.0 (#348)"
2 parents 3d5ebbd + 50e7220 commit 6799be5

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

docs/next/modules/en/pages/operator/certificationsuite.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ variables:
7777
SKIP_RESOURCE_CLEANUP: "false"
7878
ARTIFACTS_FOLDER: "_artifacts"
7979
MANAGEMENT_CLUSTER_ENVIRONMENT: "kind" # supported options are eks, isolated-kind, kind
80-
RANCHER_VERSION: "v2.12.0"
80+
RANCHER_VERSION: "v2.11.0"
8181
KUBERNETES_VERSION: "{kubernetes-version}"
8282
KUBERNETES_MANAGEMENT_VERSION: "{kubernetes-version}"
8383
KUBERNETES_MANAGEMENT_AWS_REGION: "eu-west-2"

docs/next/modules/en/pages/overview/features.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This section describes features and feature stages in {product_name}.
2222
|===
2323

2424
=== Add-on Provider for Fleet
25-
This feature installs Cluster API Add-on Provider for Fleet (CAAPF) to provide integration with link:https://github.com/rancher/fleet[Fleet] and enable the easy deployment of applications to CAPI provisioned clusters. CAAPF automatically installs Fleet in the management cluster and registers newly provisioned CAPI clusters with Fleet, so that applications can be deployed to these clusters via GitOps, `Bundle` or `HelmOp` resources. CAAPF also includes support for grouping CAPI clusters that reference the same ClusterClass through Fleet's ClusterGroup, essentially simplifying application deployments to large groups of clusters. This feature is in GA stage and enabled by default.
25+
This feature installs Cluster API Add-on Provider for Fleet (CAAPF) to provide integration with link:https://github.com/rancher/fleet[Fleet] and enable the easy deployment of applications to CAPI provisioned clusters. CAAPF automatically installs Fleet in the management cluster and registers newly provisioned CAPI clusters with Fleet, so that applications can be deployed to these clusters via GitOps, `Bundle` or `HelmApp` resources. CAAPF also includes support for grouping CAPI clusters that reference the same ClusterClass through Fleet's ClusterGroup, essentially simplifying application deployments to large groups of clusters. This feature is in GA stage and enabled by default.
2626

2727
=== Agent TLS Mode
2828
This feature gate is used to instruct Turtles on whether it should follow Rancher's `agent-tls-mode` setting, when retrieving cluster registration manifests for importing clusters. When enabled, Turtles will lookup the value of Rancher's `agent-tls-mode` setting to determine whether it has been set to `system-store` or `strict`. If set to `system-store`, Turtles will trust any certificate generated by a public Certificate Authority contained in the operating system's trust store, including those signed by authorities such as Let's Encrypt. If set to `strict`, Turtles will only trust certificates generated by the Certificate Authority contained in Rancher's `cacerts` setting. When this setting is disabled, Turtles will fallback to work in `system-store` mode. This feature is in beta stage and enabled by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Before you can install {product_name}, you need to have the following components
2323
| Follow the official https://helm.sh/docs/intro/install[installation docs]
2424

2525
| Rancher
26-
| `v2.12.0`
26+
| `v2.11.0`
2727
| Install using https://ranchermanager.docs.rancher.com/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster#install-the-rancher-helm-chart[Helm] on any Kubernetes cluster, whether self-hosted or on a managed service from https://ranchermanager.docs.rancher.com/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks[Amazon], https://ranchermanager.docs.rancher.com/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks[Azure], or https://ranchermanager.docs.rancher.com/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke[Google].
2828

2929
| Cert-manager

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ spec:
410410

411411
[WARNING]
412412
====
413-
The experimental `HelmApp` CRD introduced in Rancher `v2.11` has been renamed to `HelmOp` in Rancher `v2.12`.
413+
Examples using `HelmApps` need at least Rancher `v2.11`, or otherwise Fleet `v0.12` or higher.
414414
====
415415

416416
[tabs]
@@ -448,7 +448,7 @@ For this example we are also going to install https://docs.tigera.io/calico/late
448448
+
449449
We can do this automatically at Cluster creation using the https://rancher.github.io/cluster-api-addon-provider-fleet/[Cluster API Add-on Provider Fleet]. +
450450
This Add-on provider is installed by default with {product_name}. +
451-
Two `HelmOps` need to be created first, to be applied on the new Cluster via label selectors. +
451+
Two `HelmApps` need to be created first, to be applied on the new Cluster via label selectors. +
452452
+
453453
[source,bash]
454454
----
@@ -595,7 +595,7 @@ For this example we are also going to install https://docs.tigera.io/calico/late
595595
+
596596
We can do this automatically at Cluster creation using the https://rancher.github.io/cluster-api-addon-provider-fleet/[Cluster API Add-on Provider Fleet]. +
597597
This Add-on provider is installed by default with {product_name}. +
598-
Two `HelmOps` need to be created first, to be applied on the new Cluster via label selectors. +
598+
Two `HelmApps` need to be created first, to be applied on the new Cluster via label selectors. +
599599
+
600600
[source,bash]
601601
----
@@ -677,7 +677,7 @@ kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.
677677
+
678678
We can do this automatically at Cluster creation using the https://rancher.github.io/cluster-api-addon-provider-fleet/[Cluster API Add-on Provider Fleet]. +
679679
This Add-on provider is installed by default with {product_name}. +
680-
The `HelmOps` need to be created first, to be applied on the new Cluster via label selectors. This will take care of deploying Calico, the EBS CSI Driver, and the AWS Cloud Controller Manager in the workload cluster. +
680+
The `HelmApps` need to be created first, to be applied on the new Cluster via label selectors. This will take care of deploying Calico, the EBS CSI Driver, and the AWS Cloud Controller Manager in the workload cluster. +
681681
+
682682
[source,bash]
683683
----
@@ -768,7 +768,7 @@ kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.
768768
+
769769
We can do this automatically at Cluster creation using the https://rancher.github.io/cluster-api-addon-provider-fleet/[Cluster API Add-on Provider Fleet]. +
770770
This Add-on provider is installed by default with {product_name}. +
771-
The `HelmOps` need to be created first, to be applied on the new Cluster via label selectors. This will take care of deploying Calico, the EBS CSI Driver, and the AWS Cloud Controller Manager in the workload cluster. +
771+
The `HelmApps` need to be created first, to be applied on the new Cluster via label selectors. This will take care of deploying Calico, the EBS CSI Driver, and the AWS Cloud Controller Manager in the workload cluster. +
772772
+
773773
[source,bash]
774774
----
@@ -862,7 +862,7 @@ kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.
862862
+
863863
We can do this automatically at Cluster creation using a combination of https://rancher.github.io/cluster-api-addon-provider-fleet/[Cluster API Add-on Provider Fleet] and https://fleet.rancher.io/bundle-add[Fleet Bundle]. +
864864
The Add-on provider is installed by default with {product_name}. +
865-
The `HelmOps` need to be created first, to be applied on the new Cluster via label selectors. This will take care of deploying Calico. +
865+
The `HelmApps` need to be created first, to be applied on the new Cluster via label selectors. This will take care of deploying Calico. +
866866
+
867867
[source,bash]
868868
----
@@ -954,7 +954,7 @@ kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.
954954
+
955955
We can do this automatically at Cluster creation using the https://rancher.github.io/cluster-api-addon-provider-fleet/[Cluster API Add-on Provider Fleet]. +
956956
This Add-on provider is installed by default with {product_name}. +
957-
Two `HelmOps` need to be created first, to be applied on the new Cluster via label selectors. +
957+
Two `HelmApps` need to be created first, to be applied on the new Cluster via label selectors. +
958958
+
959959
[source,bash]
960960
----
@@ -1025,7 +1025,7 @@ kubectl apply -f https://raw.githubusercontent.com/rancher/turtles/refs/tags/v0.
10251025
+
10261026
We can do this automatically at Cluster creation using the https://rancher.github.io/cluster-api-addon-provider-fleet/[Cluster API Add-on Provider Fleet]. +
10271027
This Add-on provider is installed by default with {product_name}. +
1028-
Two `HelmOps` need to be created first, to be applied on the new Cluster via label selectors. +
1028+
Two `HelmApps` need to be created first, to be applied on the new Cluster via label selectors. +
10291029
+
10301030
[source,bash]
10311031
----
@@ -1110,7 +1110,7 @@ Finally, for this example we are going to install https://docs.tigera.io/calico/
11101110
+
11111111
We can install all applications automatically at Cluster creation using the https://rancher.github.io/cluster-api-addon-provider-fleet/[Cluster API Add-on Provider Fleet]. +
11121112
This Add-on provider is installed by default with {product_name}. +
1113-
Two `HelmOps` need to be created first, to be applied on the new Cluster via label selectors. +
1113+
Two `HelmApps` need to be created first, to be applied on the new Cluster via label selectors. +
11141114
+
11151115
[source,bash]
11161116
----
@@ -1288,7 +1288,7 @@ Finally, for this example we are going to install https://docs.tigera.io/calico/
12881288
+
12891289
We can install all applications automatically at Cluster creation using the https://rancher.github.io/cluster-api-addon-provider-fleet/[Cluster API Add-on Provider Fleet]. +
12901290
This Add-on provider is installed by default with {product_name}. +
1291-
Two `HelmOps` need to be created first, to be applied on the new Cluster via label selectors. +
1291+
Two `HelmApps` need to be created first, to be applied on the new Cluster via label selectors. +
12921292
+
12931293
[source,bash]
12941294
----

0 commit comments

Comments
 (0)