From 576eff18ec33e43ef80ec8a75c54f016474a495f Mon Sep 17 00:00:00 2001 From: nikolay-spectro Date: Tue, 17 Oct 2023 19:12:00 -0700 Subject: [PATCH] PLT-641: remove usage of deprecated cluster type. --- docs/resources/cluster_eks.md | 3 ++- docs/resources/cluster_profile.md | 2 +- spectrocloud/resource_cluster_profile.go | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/resources/cluster_eks.md b/docs/resources/cluster_eks.md index c7216525..cf2f717b 100644 --- a/docs/resources/cluster_eks.md +++ b/docs/resources/cluster_eks.md @@ -139,7 +139,8 @@ Optional: - `azs` (List of String) Mutually exclusive with `az_subnets`. Use for Dynamic provisioning. - `encryption_config_arn` (String) - `endpoint_access` (String) -- `public_access_cidrs` (Set of String) +- `private_access_cidrs` (Set of String) List of CIDR blocks that define the allowed private access to the resource. Only requests originating from addresses within these CIDR blocks will be permitted to access the resource. +- `public_access_cidrs` (Set of String) List of CIDR blocks that define the allowed public access to the resource. Requests originating from addresses within these CIDR blocks will be permitted to access the resource. All other addresses will be denied access. - `ssh_key_name` (String) - `vpc_id` (String) diff --git a/docs/resources/cluster_profile.md b/docs/resources/cluster_profile.md index 5bc5924a..4a3208e1 100644 --- a/docs/resources/cluster_profile.md +++ b/docs/resources/cluster_profile.md @@ -152,7 +152,7 @@ resource "spectrocloud_cluster_profile" "profile" { ### Optional -- `cloud` (String) Specify the infrastructure provider the cluster profile is for. Only Palette supported infrastructure providers can be used. The supported cloud types are - `all, aws, azure, gcp, vsphere, openstack, maas, nested, baremetal, eks, aks, edge, edge-native, libvirt, tencent, tke, coxedge, generic, and gke`,If the value is set to `all`, then the type must be set to `add-on`. Otherwise, the cluster profile may be incompatible with other providers. Default value is `all`. +- `cloud` (String) Specify the infrastructure provider the cluster profile is for. Only Palette supported infrastructure providers can be used. The supported cloud types are - `all, aws, azure, gcp, vsphere, openstack, maas, virtual, baremetal, eks, aks, edge, edge-native, libvirt, tencent, tke, coxedge, generic, and gke`,If the value is set to `all`, then the type must be set to `add-on`. Otherwise, the cluster profile may be incompatible with other providers. Default value is `all`. - `context` (String) The context of the cluster profile. Allowed values are `project` or `tenant`. Default value is `project`. - `description` (String) - `pack` (Block List) For packs of type `spectro`, `helm`, and `manifest`, at least one pack must be specified. (see [below for nested schema](#nestedblock--pack)) diff --git a/spectrocloud/resource_cluster_profile.go b/spectrocloud/resource_cluster_profile.go index 6ec188f2..71fe1d78 100644 --- a/spectrocloud/resource_cluster_profile.go +++ b/spectrocloud/resource_cluster_profile.go @@ -67,9 +67,9 @@ func resourceClusterProfile() *schema.Resource { Type: schema.TypeString, Default: "all", Optional: true, - ValidateFunc: validation.StringInSlice([]string{"all", "aws", "azure", "gcp", "vsphere", "openstack", "maas", "nested", "baremetal", "eks", "aks", "edge", "edge-native", "libvirt", "tencent", "tke", "coxedge", "generic", "gke"}, false), + ValidateFunc: validation.StringInSlice([]string{"all", "aws", "azure", "gcp", "vsphere", "openstack", "maas", "virtual", "baremetal", "eks", "aks", "edge", "edge-native", "libvirt", "tencent", "tke", "coxedge", "generic", "gke"}, false), ForceNew: true, - Description: "Specify the infrastructure provider the cluster profile is for. Only Palette supported infrastructure providers can be used. The supported cloud types are - `all, aws, azure, gcp, vsphere, openstack, maas, nested, baremetal, eks, aks, edge, edge-native, libvirt, tencent, tke, coxedge, generic, and gke`," + + Description: "Specify the infrastructure provider the cluster profile is for. Only Palette supported infrastructure providers can be used. The supported cloud types are - `all, aws, azure, gcp, vsphere, openstack, maas, virtual, baremetal, eks, aks, edge, edge-native, libvirt, tencent, tke, coxedge, generic, and gke`," + "If the value is set to `all`, then the type must be set to `add-on`. Otherwise, the cluster profile may be incompatible with other providers. Default value is `all`.", }, "type": {