diff --git a/docs/book/src/developer/tilt.md b/docs/book/src/developer/tilt.md index 1908e1f69..2c2bfb96c 100644 --- a/docs/book/src/developer/tilt.md +++ b/docs/book/src/developer/tilt.md @@ -84,7 +84,6 @@ enable_providers: - kubeadm-control-plane kustomize_substitutions: IBMCLOUD_API_KEY: "XXXXXXXXXXXXXXXXXX" - EXP_CLUSTER_RESOURCE_SET: "true" ``` Add following extra_args to log PowerVS REST API Requests/Responses @@ -101,7 +100,7 @@ extra_args: ### 1. Configuration to deploy workload cluster from ClusterClass template -To deploy workload cluster with [clusterclass-template](../topics/powervs/creating-a-cluster.md#deploy-a-powervs-cluster-with-cluster-class), enable the feature gates `EXP_CLUSTER_RESOURCE_SET` and `CLUSTER_TOPOLOGY` to `true` under kustomize_substitutions. +To deploy workload cluster with [clusterclass-template](../topics/powervs/creating-a-cluster.md#deploy-a-powervs-cluster-with-cluster-class), enable the feature gate `CLUSTER_TOPOLOGY` to `true` under kustomize_substitutions. ```yaml default_registry: "localhost:5001" @@ -113,7 +112,6 @@ enable_providers: - kubeadm-control-plane kustomize_substitutions: IBMCLOUD_API_KEY: "XXXXXXXXXXXXXXXXXX" - EXP_CLUSTER_RESOURCE_SET: "true" CLUSTER_TOPOLOGY: "true" ``` @@ -153,7 +151,6 @@ enable_providers: - kubeadm-control-plane kustomize_substitutions: IBMCLOUD_API_KEY: "XXXXXXXXXXXXXXXXXX" - EXP_CLUSTER_RESOURCE_SET: "true" extra_args: core: - "--logging-format=json" diff --git a/docs/book/src/topics/powervs/creating-a-cluster.md b/docs/book/src/topics/powervs/creating-a-cluster.md index 292c2630d..46d94f307 100644 --- a/docs/book/src/topics/powervs/creating-a-cluster.md +++ b/docs/book/src/topics/powervs/creating-a-cluster.md @@ -38,7 +38,6 @@ following the steps below. **Replace the following snippet with the template of your choice.** > **Note:** - > - Set `EXP_CLUSTER_RESOURCE_SET` to `true` as the cluster will be deployed with external cloud provider which will create the resources to run the cloud controller manager. > - The `IBMPOWERVS_IMAGE_NAME` value below should reflect the name of the custom image and the `kubernetes-version` value below should reflect the kubernetes version of the custom image. > - While working with unreleased versions like from main branch, instead of `--flavor=powervs` use `--from=./templates/cluster-template-powervs.yaml`. > - Refer detailed information on PowerVS variables [here](#note-refer-below-for-more-detailed-information-on-powervs-variables) diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh index 82d76b0d9..85c83c2a4 100755 --- a/scripts/ci-e2e.sh +++ b/scripts/ci-e2e.sh @@ -177,7 +177,6 @@ main(){ # Set common variables export DOCKER_BUILDKIT=1 export PROVIDER_ID_FORMAT=v2 - export EXP_CLUSTER_RESOURCE_SET=true export IBMACCOUNT_ID=${IBMACCOUNT_ID:-"7cfbd5381a434af7a09289e795840d4e"} export BASE64_API_KEY=$(tr -d '\n' <<<"$IBMCLOUD_API_KEY" | base64) export CUSTOM_KIND_NODE_IMAGE=${CUSTOM_KIND_NODE_IMAGE:-} diff --git a/templates/README.md b/templates/README.md index 508ddb657..7542dfd6a 100644 --- a/templates/README.md +++ b/templates/README.md @@ -1,9 +1,6 @@ Render the template via clusterctl ================================== -> **Note:** -> Set `EXP_CLUSTER_RESOURCE_SET` to `true` as the cluster will be deployed with external cloud provider for both VPC and PowerVS, which will create the resources to run the cloud controller manager. - ## VPC ```