Skip to content

Commit da90688

Browse files
committed
Update docs for beta ClusterResourceSet
1 parent 6daf4ac commit da90688

File tree

7 files changed

+4
-10
lines changed

7 files changed

+4
-10
lines changed

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
- "--leader-elect"
2424
- "--diagnostics-address=${CAPI_DIAGNOSTICS_ADDRESS:=:8443}"
2525
- "--insecure-diagnostics=${CAPI_INSECURE_DIAGNOSTICS:=false}"
26-
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},ClusterResourceSet=${EXP_CLUSTER_RESOURCE_SET:=false},ClusterTopology=${CLUSTER_TOPOLOGY:=false},RuntimeSDK=${EXP_RUNTIME_SDK:=false},MachineSetPreflightChecks=${EXP_MACHINE_SET_PREFLIGHT_CHECKS:=false}"
26+
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},ClusterResourceSet=${EXP_CLUSTER_RESOURCE_SET:=true},ClusterTopology=${CLUSTER_TOPOLOGY:=false},RuntimeSDK=${EXP_RUNTIME_SDK:=false},MachineSetPreflightChecks=${EXP_MACHINE_SET_PREFLIGHT_CHECKS:=false}"
2727
image: controller:latest
2828
name: manager
2929
env:

docs/book/src/developer/testing.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ via [Create the local repository](http://localhost:3000/clusterctl/developers.ht
264264
kustomize_substitutions:
265265
CLUSTER_TOPOLOGY: "true"
266266
EXP_MACHINE_POOL: "true"
267-
EXP_CLUSTER_RESOURCE_SET: "true"
268267
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
269268
EXP_RUNTIME_SDK: "true"
270269
EXP_MACHINE_SET_PREFLIGHT_CHECKS: "true"

docs/book/src/developer/tilt.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ provider's yaml. These substitutions are also used when deploying cluster templa
109109
kustomize_substitutions:
110110
CLUSTER_TOPOLOGY: "true"
111111
EXP_MACHINE_POOL: "true"
112-
EXP_CLUSTER_RESOURCE_SET: "true"
113112
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
114113
EXP_RUNTIME_SDK: "true"
115114
EXP_MACHINE_SET_PREFLIGHT_CHECKS: "true"

docs/book/src/tasks/experimental-features/cluster-resource-set.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Experimental Feature: ClusterResourceSet (alpha)
1+
# Experimental Feature: ClusterResourceSet (beta)
22

33
The `ClusterResourceSet` feature is introduced to provide a way to automatically apply a set of resources (such as CNI/CSI) defined by users to matching newly-created/existing clusters.
44

docs/book/src/tasks/experimental-features/experimental-features.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ temporary location for features which will be moved to their permanent locations
88
Users can enable/disable features by setting OS environment variables before running `clusterctl init`, e.g.:
99

1010
```yaml
11-
export EXP_CLUSTER_RESOURCE_SET=true
11+
export EXP_RUNTIME_SDK=true
1212

1313
clusterctl init --infrastructure vsphere
1414
```
1515

1616
As an alternative to environment variables, it is also possible to set variables in the clusterctl config file located at `$XDG_CONFIG_HOME/cluster-api/clusterctl.yaml`, e.g.:
1717
```yaml
1818
# Values for environment variable substitution
19-
EXP_CLUSTER_RESOURCE_SET: "true"
19+
EXP_RUNTIME_SDK: "true"
2020
```
2121
In case a variable is defined in both the config file and as an OS environment variable, the environment variable takes precedence.
2222
For more information on how to set variables for clusterctl, see [clusterctl Configuration File](../../clusterctl/configuration.md)
@@ -30,7 +30,6 @@ As an example, Cluster API Provider Azure (CAPZ) has support for MachinePool thr
3030
One way is to set experimental variables on the clusterctl config file. For CAPI, these configs are under ./test/e2e/config/... such as `docker.yaml`:
3131
```yaml
3232
variables:
33-
EXP_CLUSTER_RESOURCE_SET: "true"
3433
EXP_MACHINE_POOL: "true"
3534
CLUSTER_TOPOLOGY: "true"
3635
EXP_RUNTIME_SDK: "true"
@@ -45,7 +44,6 @@ On development environments started with `Tilt`, features can be enabled by sett
4544

4645
```yaml
4746
kustomize_substitutions:
48-
EXP_CLUSTER_RESOURCE_SET: 'true'
4947
EXP_MACHINE_POOL: 'true'
5048
CLUSTER_TOPOLOGY: 'true'
5149
EXP_RUNTIME_SDK: 'true'

docs/book/src/user/quick-start.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,6 @@ project][Proxmox getting started guide].
746746
747747
Please follow the Cluster API Provider for [Cloud Director Getting Started Guide](https://github.com/vmware/cluster-api-provider-cloud-director/blob/main/README.md)
748748
749-
EXP_CLUSTER_RESOURCE_SET: "true"
750749
```bash
751750
# Initialize the management cluster
752751
clusterctl init --infrastructure vcd

test/e2e/config/docker.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@ variables:
332332
AUTOSCALER_WORKLOAD: "./data/autoscaler/autoscaler-to-workload-workload.yaml"
333333
NODE_DRAIN_TIMEOUT: "60s"
334334
# Enabling the feature flags by setting the env variables.
335-
EXP_CLUSTER_RESOURCE_SET: "true"
336335
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
337336
EXP_MACHINE_POOL: "true"
338337
CLUSTER_TOPOLOGY: "true"

0 commit comments

Comments
 (0)