Merge branch 'main' into network-pools

Signed-off-by: Giuseppe Maxia <[email protected]>

.changes/v3.11.0/1063-features.md

@@ -0,0 +1 @@
+* Add support for **Container Service Extension v4.1** by updating the installation guide [GH-1063]

.changes/v3.11.0/1120-deprecations.md

@@ -0,0 +1,3 @@
+* Resource `vcd_org_vdc` deprecates `edge_cluster_id` in favor of new resource
+  `vcd_org_vdc_nsxt_network_profile` that can configure NSX-T Edge Clusters and default Segment
+  Profile Templates for NSX-T VDCs [GH-1120]

.changes/v3.11.0/1120-features.md

@@ -0,0 +1,13 @@
+* **New Data Source:** `vcd_nsxt_segment_ip_discovery_profile` to read NSX-T IP Discovery Segment Profiles [GH-1120]
+* **New Data Source:** `vcd_nsxt_segment_mac_discovery_profile` to read NSX-T MAC Discovery Segment Profiles [GH-1120]
+* **New Data Source:** `vcd_nsxt_segment_spoof_guard_profile` to read NSX-T Spoof Guard Profiles [GH-1120]
+* **New Data Source:** `vcd_nsxt_segment_qos_profile` to read NSX-T QoS Profiles [GH-1120]
+* **New Data Source:** `vcd_nsxt_segment_security_profile` to read NSX-T Segment Security Profiles [GH-1120]
+* **New Resource:** `vcd_nsxt_segment_profile_template` to manage NSX-T Segment Profile Templates [GH-1120]
+* **New Data Source:** `vcd_nsxt_segment_profile_template` to read NSX-T Segment Profile Templates [GH-1120]
+* **New Resource:** `vcd_nsxt_global_default_segment_profile_template` to manage NSX-T Global Default Segment Profile Templates [GH-1120]
+* **New Data Source:** `vcd_nsxt_global_default_segment_profile_template` to read NSX-T Global Default Segment Profile Templates [GH-1120]
+* **New Resource:** `vcd_org_vdc_nsxt_network_profile` to manage default Segment Profile Templates for NSX-T VDCs [GH-1120]
+* **New Data Source:** `vcd_org_vdc_nsxt_network_profile` to read default Segment Profile Templates for NSX-T VDCs [GH-1120]
+* **New Resource:** `vcd_nsxt_network_segment_profile` to manage individual Segment Profiles or Segment Profile Templates for NSX-T Org VDC Networks [GH-1120]
+* **New Data Source:** `vcd_nsxt_network_segment_profile` to read individual Segment Profiles or Segment Profile Templates for NSX-T Org VDC Networks [GH-1120]

examples/container-service-extension-3.1.x/3.8-cse-3.1.x-install.tf

@@ -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:
 #

examples/container-service-extension-3.1.x/terraform.tfvars.example

@@ -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'
 
 # ------------------------------------------------

examples/container-service-extension-3.1.x/variables-cse.tf

@@ -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" {

examples/container-service-extension-3.1.x/variables-provider.tf

@@ -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" {

examples/container-service-extension/v4.1/entities/vcdkeconfig.json.template

@@ -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}"
+        }
+    ]
+}

examples/container-service-extension/v4.1/install/step1/3.11-cse-install-1-provider-config.tf

@@ -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"
+}