Merge pull request #83 from furkatgofurov7/update-chart-config

Update Chart configuration with latest changes
rancher · Apr 5, 2024 · e3d69da · e3d69da
2 parents a86ab2c + 6629fc5
commit e3d69da
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 28 deletions.
diff --git a/docs/reference-guides/architecture/intro.md b/docs/reference-guides/architecture/intro.md
@@ -12,8 +12,7 @@ For guidance about setting up Rancher, refer to
 [Rancher Setup](../../getting-started/rancher.md)
 
 For information on how to install Rancher Turtles, refer to 
-[Install Rancher Turtles with Cluster API Operator as a Helm 
-dependency](../../getting-started/install-rancher-turtles/using_rancher_dashboard.md)
+[Install Rancher Turtles using Rancher Dashboard](../../getting-started/install-rancher-turtles/using_rancher_dashboard.md)
 :::
 
 **A Rancher User will use Rancher to manage clusters. Rancher will be able to use 

diff --git a/docs/reference-guides/rancher-turtles-chart/values.md b/docs/reference-guides/rancher-turtles-chart/values.md
@@ -45,10 +45,9 @@ Currently the available set of values for the `cluster-api-operator` setup in th
 cluster-api-operator:
   enabled: true # indicates if CAPI operator should be installed (default: true)
   cert-manager:
-    enabled: true # indicates if cert-manager should be installed (default: true)
+    enabled: false # indicates if cert-manager should be installed (default: false)
   cluster-api:
     enabled: true # indicates if core CAPI controllers should be installed (default: true)
-    version: v1.4.6 # version of CAPI to install (default: v1.4.6)
     configSecret:
       name: "" # (provide only if using a user-managed secret) name of the config secret to use for core CAPI controllers, used by the CAPI operator. See https://github.com/kubernetes-sigs/cluster-api-operator/tree/main/docs#installing-azure-infrastructure-provider docs for more details.
       defaultName: "capi-env-variables" # default name for the automatically created secret.
@@ -57,14 +56,17 @@ cluster-api-operator:
       fetchConfig: # (only required for airgapped environments)
         url: ""  # url to fetch config from, used by the CAPI operator. See https://github.com/kubernetes-sigs/cluster-api-operator/tree/main/docs#provider-spec docs for more details.
         selector: ""  # selector to use for fetching config, used by the CAPI operator.
-    kubeadmBootstrap:
-      namespace: capi-kubeadm-bootstrap-system
-      fetchConfig:
-        url: ""
-        selector: ""
-    kubeadmControlPlane:
-      namespace: capi-kubeadm-control-plane-system
-      fetchConfig:
-        url: ""
-        selector: ""
+    rke2:
+      enabled: true # indicates if RKE2 provider for Cluster API should be installed (default: true)
+      version: "" # version of Cluster API Provider RKE2 (CAPRKE2) to install
+      bootstrap: # CAPRKE2 Bootstrap Provider
+        namespace: rke2-bootstrap-system
+        fetchConfig: # (only required for airgapped environments)
+          url: ""  # url to fetch config from, used by the CAPI operator. See https://github.com/kubernetes-sigs/cluster-api-operator/tree/main/docs#provider-spec docs for more details.
+          selector: ""  # selector to use for fetching config, used by the CAPI operator.
+      controlPlane: # CAPRKE2 Control Plane Provider
+        namespace: rke2-control-plane-system
+        fetchConfig: # (only required for airgapped environments)
+          url: "" # url to fetch config from, used by the CAPI operator. See https://github.com/kubernetes-sigs/cluster-api-operator/tree/main/docs#provider-spec docs for more details.
+          selector: ""  # selector to use for fetching config, used by the CAPI operator.
 ```
diff --git a/versioned_docs/version-0.6/reference-guides/architecture/intro.md b/versioned_docs/version-0.6/reference-guides/architecture/intro.md
@@ -12,8 +12,7 @@ For guidance about setting up Rancher, refer to
 [Rancher Setup](../../getting-started/rancher.md)
 
 For information on how to install Rancher Turtles, refer to 
-[Install Rancher Turtles with Cluster API Operator as a Helm 
-dependency](../../getting-started/install-rancher-turtles/using_rancher_dashboard.md)
+[Install Rancher Turtles using Rancher Dashboard](../../getting-started/install-rancher-turtles/using_rancher_dashboard.md)
 :::
 
 **A Rancher User will use Rancher to manage clusters. Rancher will be able to use 

diff --git a/versioned_docs/version-0.6/reference-guides/rancher-turtles-chart/values.md b/versioned_docs/version-0.6/reference-guides/rancher-turtles-chart/values.md
@@ -45,10 +45,9 @@ Currently the available set of values for the `cluster-api-operator` setup in th
 cluster-api-operator:
   enabled: true # indicates if CAPI operator should be installed (default: true)
   cert-manager:
-    enabled: true # indicates if cert-manager should be installed (default: true)
+    enabled: false # indicates if cert-manager should be installed (default: false)
   cluster-api:
     enabled: true # indicates if core CAPI controllers should be installed (default: true)
-    version: v1.4.6 # version of CAPI to install (default: v1.4.6)
     configSecret:
       name: "" # (provide only if using a user-managed secret) name of the config secret to use for core CAPI controllers, used by the CAPI operator. See https://github.com/kubernetes-sigs/cluster-api-operator/tree/main/docs#installing-azure-infrastructure-provider docs for more details.
       defaultName: "capi-env-variables" # default name for the automatically created secret.
@@ -57,14 +56,17 @@ cluster-api-operator:
       fetchConfig: # (only required for airgapped environments)
         url: ""  # url to fetch config from, used by the CAPI operator. See https://github.com/kubernetes-sigs/cluster-api-operator/tree/main/docs#provider-spec docs for more details.
         selector: ""  # selector to use for fetching config, used by the CAPI operator.
-    kubeadmBootstrap:
-      namespace: capi-kubeadm-bootstrap-system
-      fetchConfig:
-        url: ""
-        selector: ""
-    kubeadmControlPlane:
-      namespace: capi-kubeadm-control-plane-system
-      fetchConfig:
-        url: ""
-        selector: ""
+    rke2:
+      enabled: true # indicates if RKE2 provider for Cluster API should be installed (default: true)
+      version: "" # version of Cluster API Provider RKE2 (CAPRKE2) to install
+      bootstrap: # CAPRKE2 Bootstrap Provider
+        namespace: rke2-bootstrap-system
+        fetchConfig: # (only required for airgapped environments)
+          url: ""  # url to fetch config from, used by the CAPI operator. See https://github.com/kubernetes-sigs/cluster-api-operator/tree/main/docs#provider-spec docs for more details.
+          selector: ""  # selector to use for fetching config, used by the CAPI operator.
+      controlPlane: # CAPRKE2 Control Plane Provider
+        namespace: rke2-control-plane-system
+        fetchConfig: # (only required for airgapped environments)
+          url: "" # url to fetch config from, used by the CAPI operator. See https://github.com/kubernetes-sigs/cluster-api-operator/tree/main/docs#provider-spec docs for more details.
+          selector: ""  # selector to use for fetching config, used by the CAPI operator.
 ```