-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a specific resource and data source to create, read, update and d…
…elete CSE Kubernetes clusters (#1195) * New Resource: 'vcd_cse_kubernetes_cluster' to create and manage Kubernetes clusters in a VCD with Container Service Extension 4.2.1, 4.2.0, 4.1.1 or 4.1.0 installed and running * New Data Source: 'vcd_cse_kubernetes_cluster' to read Kubernetes clusters from a VCD with Container Service Extension 4.2.1, 4.2.0, 4.1.1 or 4.1.0 installed and running * New Data Source: 'vcd_version' to get the VCD version and perform additional checks with version constraints Signed-off-by: abarreiro <[email protected]>
- Loading branch information
1 parent
fb7d5ff
commit 72a3677
Showing
47 changed files
with
5,554 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| * Resource `vcd_cse_kubernetes_cluster` deprecates the Container Service Extension cluster management guide, | ||
| so users should not use `vcd_rde` resources to create a Kubernetes cluster anymore [GH-1195] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| * **New Resource:** `vcd_cse_kubernetes_cluster` to create and manage Kubernetes clusters in a VCD with Container Service Extension | ||
| 4.2.1, 4.2.0, 4.1.1 or 4.1.0 installed and running [GH-1195] | ||
| * **New Data Source:** `vcd_cse_kubernetes_cluster` to read Kubernetes clusters from a VCD with Container Service Extension | ||
| 4.2.1, 4.2.0, 4.1.1 or 4.1.0 installed and running [GH-1195] | ||
| * **New Data Source:** `vcd_version` to get the VCD version and perform additional checks with version constraints [GH-1195] |
2 changes: 1 addition & 1 deletion
2
examples/container-service-extension/v4.1/cluster/3.11-cluster-creation.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../container-service-extension/v4.1/install/step1/3.11-cse-install-3-cse-server-settings.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
examples/container-service-extension/v4.1/install/step2/3.11-cse-install-5-infrastructure.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
examples/container-service-extension/v4.1/install/step2/3.11-cse-install-6-ovas.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ples/container-service-extension/v4.1/install/step2/3.11-cse-install-7-cse-server-init.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
examples/container-service-extension/v4.1/install/step2/3.11-cse-install-8-optionals.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
examples/container-service-extension/v4.2/entities/vcdkeconfig.json.template
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| { | ||
| "profiles": [ | ||
| { | ||
| "name": "production", | ||
| "active": true, | ||
| "serverConfig": { | ||
| "rdePollIntervalInMin": 1, | ||
| "heartbeatWatcherTimeoutInMin": 10, | ||
| "staleHeartbeatIntervalInMin": 30 | ||
| }, | ||
| "vcdKeInstances": [ | ||
| { | ||
| "name": "vcd-container-service-extension" | ||
| } | ||
| ], | ||
| "K8Config": { | ||
| "certificateAuthorities": [ | ||
| ${k8s_cluster_certificates} | ||
| ], | ||
| "cni": { | ||
| "name": "antrea", | ||
| "version": "" | ||
| }, | ||
| "cpi": { | ||
| "name": "cpi for cloud director", | ||
| "version": "${cpi_version}" | ||
| }, | ||
| "csi": [ | ||
| { | ||
| "name": "csi for cloud director", | ||
| "version": "${csi_version}" | ||
| } | ||
| ], | ||
| "mhc": { | ||
| "maxUnhealthyNodes": ${max_unhealthy_node_percentage}, | ||
| "nodeStartupTimeout": "${node_startup_timeout}", | ||
| "nodeNotReadyTimeout": "${node_not_ready_timeout}", | ||
| "nodeUnknownTimeout": "${node_unknown_timeout}" | ||
| }, | ||
| "rdeProjectorVersion": "${rde_projector_version}" | ||
| }, | ||
| "vcdConfig": { | ||
| "sysLogger": { | ||
| "host": "${syslog_host}", | ||
| "port": "${syslog_port}" | ||
| } | ||
| }, | ||
| "githubConfig": { | ||
| "githubPersonalAccessToken": "" | ||
| }, | ||
| "bootstrapClusterConfig": { | ||
| "capiEcosystem": { | ||
| "infraProvider": { | ||
| "name": "capvcd", | ||
| "version": "v${capvcd_version}", | ||
| "capvcdRde": { | ||
| "nss": "capvcdCluster", | ||
| "vendor": "vmware", | ||
| "version": "1.3.0" | ||
| } | ||
| }, | ||
| "coreCapiVersion": "v1.4.0", | ||
| "bootstrapProvider": { | ||
| "name": "CAPBK", | ||
| "version": "v1.4.0" | ||
| }, | ||
| "controlPlaneProvider": { | ||
| "name": "KCP", | ||
| "version": "v1.4.0" | ||
| }, | ||
| "certManagerVersion": "v1.11.1" | ||
| }, | ||
| "certificateAuthorities": [ | ||
| ${bootstrap_vm_certificates} | ||
| ], | ||
| "clusterctl": { | ||
| "version": "v1.4.0", | ||
| "clusterctlyaml": "" | ||
| }, | ||
| "dockerVersion": "", | ||
| "kindVersion": "v0.19.0", | ||
| "kindestNodeVersion": "v1.27.1", | ||
| "kubectlVersion": "", | ||
| "proxyConfig": { | ||
| "noProxy": "${no_proxy}", | ||
| "httpProxy": "${http_proxy}", | ||
| "httpsProxy": "${https_proxy}" | ||
| }, | ||
| "sizingPolicy": "${bootstrap_vm_sizing_policy}" | ||
| }, | ||
| "containerRegistryUrl": "${container_registry_url}" | ||
| } | ||
| ] | ||
| } |
46 changes: 46 additions & 0 deletions
46
...ples/container-service-extension/v4.2/install/step1/3.11-cse-install-1-provider-config.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # ------------------------------------------------------------------------------------------------------------ | ||
| # CSE 4.2 installation, step 1: | ||
| # | ||
| # * Please read the guide at https://registry.terraform.io/providers/vmware/vcd/latest/docs/guides/container_service_extension_4_x_install | ||
| # before applying this configuration. | ||
| # | ||
| # * The installation process is split into two steps as the first one creates a CSE admin user that needs to be | ||
| # used in a "provider" block in the second one. | ||
| # | ||
| # * Rename "terraform.tfvars.example" to "terraform.tfvars" and adapt the values to your needs. | ||
| # Other than that, this snippet should be applied as it is. | ||
| # ------------------------------------------------------------------------------------------------------------ | ||
|
|
||
| # VCD Provider configuration. It must be at least v3.12.0 and configured with a System administrator account. | ||
| terraform { | ||
| required_providers { | ||
| vcd = { | ||
| source = "vmware/vcd" | ||
| version = ">= 3.12" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| provider "vcd" { | ||
| url = "${var.vcd_url}/api" | ||
| user = var.administrator_user | ||
| password = var.administrator_password | ||
| auth_type = "integrated" | ||
| sysorg = var.administrator_org | ||
| org = var.administrator_org | ||
| allow_unverified_ssl = var.insecure_login | ||
| logging = true | ||
| logging_file = "cse_install_step1.log" | ||
| } | ||
|
|
||
| # Minimum supported version for CSE | ||
| data "vcd_version" "cse_minimum_supported" { | ||
| condition = ">= 10.4.2" | ||
| fail_if_not_match = true | ||
| } | ||
|
|
||
| # There are some special rights and elements introduced in VCD 10.5.1 | ||
| data "vcd_version" "gte_1051" { | ||
| condition = ">= 10.5.1" | ||
| fail_if_not_match = false | ||
| } |
Oops, something went wrong.