Skip to content

Commit

Permalink
Update dependency versions in the next/v0.16 version of the docs
Browse files Browse the repository at this point in the history
Signed-off-by: Furkat Gofurov <[email protected]>
  • Loading branch information
furkatgofurov7 committed Jan 30, 2025
1 parent 47335ac commit bc67aee
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 36 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This section describes how to install `Cluster API Operator` in the Kubernetes c

=== Install manually with Helm (alternative)

To install `Cluster API Operator` with version `1.9.3` of the `CAPI` + `Docker` provider using helm, follow these steps:
To install `Cluster API Operator` with version `1.9.4` of the `CAPI` + `Docker` provider using helm, follow these steps:

. Add the Helm repository for the `Cluster API Operator`:
+
Expand Down Expand Up @@ -45,8 +45,8 @@ helm install cert-manager jetstack/cert-manager --namespace cert-manager --creat
----
helm install capi-operator capi-operator/cluster-api-operator \
--create-namespace -n capi-operator-system \
--set infrastructure=docker:v1.9.3 \
--set core=cluster-api:v1.9.3 \
--set infrastructure=docker:v1.9.4 \
--set core=cluster-api:v1.9.4 \
--timeout 90s --wait # Core Cluster API with kubeadm bootstrap and control plane providers will also be installed
----

Expand All @@ -62,8 +62,8 @@ To provide additional environment variables, enable feature gates, or supply clo
----
helm install capi-operator capi-operator/cluster-api-operator \
--create-namespace -n capi-operator-system \
--set infrastructure=docker:v1.9.3 \
--set core=cluster-api:v1.9.3 \
--set infrastructure=docker:v1.9.4 \
--set core=cluster-api:v1.9.4 \
--timeout 90s \
--secret-name <secret_name> \
--wait
Expand All @@ -88,10 +88,10 @@ To select more than one desired provider to be installed together with the `Clus

[source,bash]
----
helm install ... --set infrastructure="docker:v1.9.3;aws:v2.7.1"
helm install ... --set infrastructure="docker:v1.9.4;aws:v2.7.1"
----

The `infrastructure` flag is set to `docker:v1.9.3;aws:v2.7.1`, representing the desired provider names. This means that the `Cluster API Operator` will install and manage multiple providers, `Docker` and `AWS`, with versions `v1.9.3` and `v2.7.1` respectively.
The `infrastructure` flag is set to `docker:v1.9.4;aws:v2.7.1`, representing the desired provider names. This means that the `Cluster API Operator` will install and manage multiple providers, `Docker` and `AWS`, with versions `v1.9.4` and `v2.7.1` respectively.

The cluster is now ready to install {product_name}. The default behavior when installing the chart is to install Cluster API Operator as a Helm dependency. Since we decided to install it manually before installing {product_name}, the feature `cluster-api-operator.enabled` must be explicitly disabled as otherwise it would conflict with the existing installation. You can refer to xref:../developer-guide/install_capi_operator.adoc#_install_suse_rancher_prime_cluster_api_without_cluster_api_operator_as_a_helm_dependency[Install {product_name} without Cluster API Operator] to see next steps.

Expand Down Expand Up @@ -120,7 +120,7 @@ and then it can be installed into the `rancher-turtles-system` namespace with:

[source,bash]
----
helm install rancher-turtles turtles/rancher-turtles --version v0.15.0 \
helm install rancher-turtles turtles/rancher-turtles --version v0.16.0 \
-n rancher-turtles-system \
--set cluster-api-operator.enabled=false \
--set cluster-api-operator.cluster-api.enabled=false \
Expand Down Expand Up @@ -181,7 +181,7 @@ metadata:
spec:
name: cluster-api
type: core
version: v1.9.3
version: v1.9.4
additionalManifests:
name: capi-additional-rbac-roles
namespace: capi-system
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ As mentioned before, installing {product_name} requires the https://github.com/k

[source,bash]
----
helm install rancher-turtles turtles/rancher-turtles --version v0.13.0 \
helm install rancher-turtles turtles/rancher-turtles --version v0.16.0 \
-n rancher-turtles-system \
--dependency-update \
--create-namespace --wait \
Expand Down
18 changes: 11 additions & 7 deletions docs/next/modules/en/pages/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,35 @@ This demo shows how to use the Rancher UI to install {product_name}, create/impo
| Name | Version | Details

| Kubernetes cluster
| `>=1.30.0`
| `v1.30.0`
|

| Helm
| `>=3.12.0`
| `v3.12.0`
|

| Rancher
| `>=2.10.0`
| `v2.10.0`
| Using https://ranchermanager.docs.rancher.com/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster#install-the-rancher-helm-chart[helm based] installation on any kubernetes cluster directly or on a newly created 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] service based options.

| Cert-manager
| `>=v1.15.2`
| `v1.15.2`
| Using https://cert-manager.io/docs/installation/helm/#installing-with-helm[helm] based installation or via https://cert-manager.io/docs/installation/#default-static-install[kubectl apply].

| Cluster API Operator
| `>=v0.14.0`
| `v0.16.0`
| Using xref:./getting-started/install-rancher-turtles/using_rancher_dashboard.adoc[Rancher UI] (recommended) or https://github.com/kubernetes-sigs/cluster-api-operator/blob/main/docs/README.md#method-2-use-helm-charts[Helm install] (for development use cases)

| Cluster API
| `v1.7.7`
| `v1.9.4`
|

| Cluster API Provider RKE2
| `v0.11.0`
|

| {product_name}
| `>v0.13.0`
| `v0.16.0`
| Using xref:./getting-started/install-rancher-turtles/using_rancher_dashboard.adoc[Rancher UI] (recommended) or xref:./getting-started/install-rancher-turtles/using_helm.adoc[Helm install] (for advanced use cases)
|===

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ metadata:
name: cluster-api
namespace: capi-system
spec:
version: v1.7.7
version: v1.9.4
type: core # required
----
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This section describes how to install `Cluster API Operator` in the Kubernetes c

=== Install manually with Helm (alternative)

To install `Cluster API Operator` with version `1.9.3` of the `CAPI` + `Docker` provider using helm, follow these steps:
To install `Cluster API Operator` with version `1.9.4` of the `CAPI` + `Docker` provider using helm, follow these steps:

. Add the Helm repository for the `Cluster API Operator`:
+
Expand Down Expand Up @@ -45,8 +45,8 @@ helm install cert-manager jetstack/cert-manager --namespace cert-manager --creat
----
helm install capi-operator capi-operator/cluster-api-operator \
--create-namespace -n capi-operator-system \
--set infrastructure=docker:v1.9.3 \
--set core=cluster-api:v1.9.3 \
--set infrastructure=docker:v1.9.4 \
--set core=cluster-api:v1.9.4 \
--timeout 90s --wait # Core Cluster API with kubeadm bootstrap and control plane providers will also be installed
----

Expand All @@ -62,8 +62,8 @@ To provide additional environment variables, enable feature gates, or supply clo
----
helm install capi-operator capi-operator/cluster-api-operator \
--create-namespace -n capi-operator-system \
--set infrastructure=docker:v1.9.3 \
--set core=cluster-api:v1.9.3 \
--set infrastructure=docker:v1.9.4 \
--set core=cluster-api:v1.9.4 \
--timeout 90s \
--secret-name <secret_name> \
--wait
Expand All @@ -88,10 +88,10 @@ To select more than one desired provider to be installed together with the `Clus

[source,bash]
----
helm install ... --set infrastructure="docker:v1.9.3;aws:v2.7.1"
helm install ... --set infrastructure="docker:v1.9.4;aws:v2.7.1"
----

The `infrastructure` flag is set to `docker:v1.9.3;aws:v2.7.1`, representing the desired provider names. This means that the `Cluster API Operator` will install and manage multiple providers, `Docker` and `AWS`, with versions `v1.9.3` and `v2.7.1` respectively.
The `infrastructure` flag is set to `docker:v1.9.4;aws:v2.7.1`, representing the desired provider names. This means that the `Cluster API Operator` will install and manage multiple providers, `Docker` and `AWS`, with versions `v1.9.4` and `v2.7.1` respectively.

The cluster is now ready to install {product_name}. The default behavior when installing the chart is to install Cluster API Operator as a Helm dependency. Since we decided to install it manually before installing {product_name}, the feature `cluster-api-operator.enabled` must be explicitly disabled as otherwise it would conflict with the existing installation. You can refer to xref:../developer-guide/install_capi_operator.adoc#_install_suse_rancher_prime_cluster_api_without_cluster_api_operator_as_a_helm_dependency[Install {product_name} without Cluster API Operator] to see next steps.

Expand Down Expand Up @@ -120,7 +120,7 @@ and then it can be installed into the `rancher-turtles-system` namespace with:

[source,bash]
----
helm install rancher-turtles turtles/rancher-turtles --version v0.15.0 \
helm install rancher-turtles turtles/rancher-turtles --version v0.16.0 \
-n rancher-turtles-system \
--set cluster-api-operator.enabled=false \
--set cluster-api-operator.cluster-api.enabled=false \
Expand Down Expand Up @@ -181,7 +181,7 @@ metadata:
spec:
name: cluster-api
type: core
version: v1.9.3
version: v1.9.4
additionalManifests:
name: capi-additional-rbac-roles
namespace: capi-system
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ As mentioned before, installing {product_name} requires the https://github.com/k

[source,bash]
----
helm install rancher-turtles turtles/rancher-turtles --version v0.13.0 \
helm install rancher-turtles turtles/rancher-turtles --version v0.16.0 \
-n rancher-turtles-system \
--dependency-update \
--create-namespace --wait \
Expand Down
18 changes: 11 additions & 7 deletions docs/v0.16/modules/en/pages/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,35 @@ This demo shows how to use the Rancher UI to install {product_name}, create/impo
| Name | Version | Details

| Kubernetes cluster
| `>=1.30.0`
| `v1.30.0`
|

| Helm
| `>=3.12.0`
| `v3.12.0`
|

| Rancher
| `>=2.10.0`
| `v2.10.0`
| Using https://ranchermanager.docs.rancher.com/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster#install-the-rancher-helm-chart[helm based] installation on any kubernetes cluster directly or on a newly created 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] service based options.

| Cert-manager
| `>=v1.15.2`
| `v1.15.2`
| Using https://cert-manager.io/docs/installation/helm/#installing-with-helm[helm] based installation or via https://cert-manager.io/docs/installation/#default-static-install[kubectl apply].

| Cluster API Operator
| `>=v0.14.0`
| `v0.16.0`
| Using xref:./getting-started/install-rancher-turtles/using_rancher_dashboard.adoc[Rancher UI] (recommended) or https://github.com/kubernetes-sigs/cluster-api-operator/blob/main/docs/README.md#method-2-use-helm-charts[Helm install] (for development use cases)

| Cluster API
| `v1.7.7`
| `v1.9.4`
|

| Cluster API Provider RKE2
| `v0.11.0`
|

| {product_name}
| `>v0.13.0`
| `v0.16.0`
| Using xref:./getting-started/install-rancher-turtles/using_rancher_dashboard.adoc[Rancher UI] (recommended) or xref:./getting-started/install-rancher-turtles/using_helm.adoc[Helm install] (for advanced use cases)
|===

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ metadata:
name: cluster-api
namespace: capi-system
spec:
version: v1.7.7
version: v1.9.4
type: core # required
----

0 comments on commit bc67aee

Please sign in to comment.