Skip to content

Commit

Permalink
Update CSE installation guide to use CSE v4.1 (vmware#1063)
Browse files Browse the repository at this point in the history
Signed-off-by: abarreiro <[email protected]>
  • Loading branch information
adambarreiro authored Nov 7, 2023
1 parent 0070546 commit b5b1a70
Show file tree
Hide file tree
Showing 35 changed files with 2,073 additions and 819 deletions.
1 change: 1 addition & 0 deletions .changes/v3.11.0/1063-features.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Add support for **Container Service Extension v4.1** by updating the installation guide [GH-1063]
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# ------------------------------------------------------------------------------------------------------------
# WARNING: This CSE installation method is deprecated in favor of CSE v4.x. Please have a look at
# https://registry.terraform.io/providers/vmware/vcd/latest/docs/guides/container_service_extension_4_x_install
# ------------------------------------------------------------------------------------------------------------

# ------------------------------------------------------------------------------------------------------------
# CSE 3.1.x installation example HCL:
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# ------------------------------------------------------------------------------------------------------------
# WARNING: This CSE installation method is deprecated in favor of CSE v4.x. Please have a look at
# https://registry.terraform.io/providers/vmware/vcd/latest/docs/guides/container_service_extension_4_x_install
# ------------------------------------------------------------------------------------------------------------

# Change configuration to your needs and rename to 'terraform.tfvars'

# ------------------------------------------------
Expand Down
5 changes: 5 additions & 0 deletions examples/container-service-extension-3.1.x/variables-cse.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# ------------------------------------------------------------------------------------------------------------
# WARNING: This CSE installation method is deprecated in favor of CSE v4.x. Please have a look at
# https://registry.terraform.io/providers/vmware/vcd/latest/docs/guides/container_service_extension_4_x_install
# ------------------------------------------------------------------------------------------------------------

# These variables are for configuring the CSE installation

variable "org-name" {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# ------------------------------------------------------------------------------------------------------------
# WARNING: This CSE installation method is deprecated in favor of CSE v4.x. Please have a look at
# https://registry.terraform.io/providers/vmware/vcd/latest/docs/guides/container_service_extension_4_x_install
# ------------------------------------------------------------------------------------------------------------

# These variables are for configuring the VCD provider

variable "admin-user" {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
{
"profiles": [
{
"name": "production",
"active": true,
"serverConfig": {
"rdePollIntervalInMin": 1,
"heartbeatWatcherTimeoutInMin": 10,
"staleHeartbeatIntervalInMin": 30
},
"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": "0.6.0"
},
"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.2.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}"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# ------------------------------------------------------------------------------------------------------------
# CSE v4.1 installation, step 1:
#
# * Please read the guide present 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.11.0 and configured with a System administrator account.
terraform {
required_providers {
vcd = {
source = "vmware/vcd"
version = ">= 3.11"
}
}
}

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"
}
Loading

0 comments on commit b5b1a70

Please sign in to comment.