Release 0.20.0 (#451)

* PLT-971:Added warning log for review repave (#449) * PLT-971:Added warning log for review repave * PLT-971: Added Warning message for repave approval attribute * PLT-1098: Resolved duplicated pack UID on day 2 operations on cluster profile (#446) * PLT-1128:Remove word master from TF examples and docs. (#452) * Updated SDK dependencies. (#453) (#454)
spectrocloud · May 13, 2024 · 995ade6 · 995ade6
1 parent 176d966
commit 995ade6
Show file tree

Hide file tree

Showing 62 changed files with 130 additions and 83 deletions.
diff --git a/docs/resources/cluster_aws.md b/docs/resources/cluster_aws.md
@@ -81,11 +81,11 @@ resource "spectrocloud_cluster_aws" "cluster" {
     additional_labels = {
       "owner"   = "siva"
       "purpose" = "testing"
-      "type"    = "master"
+      "type"    = "cp"
     }
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
     instance_type           = "m4.large"
     disk_size_gb            = 60

diff --git a/docs/resources/cluster_azure.md b/docs/resources/cluster_azure.md
@@ -61,7 +61,7 @@ resource "spectrocloud_cluster_azure" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
     instance_type           = "Standard_D2_v3"
     azs                     = [""]

diff --git a/docs/resources/cluster_custom_cloud.md b/docs/resources/cluster_custom_cloud.md
@@ -44,7 +44,7 @@ description: |-
         additional_labels = {
           "owner"   = "tf"
           "purpose" = "testing"
-          "type"    = "master"
+          "type"    = "cp"
         }
         control_plane           = true
         control_plane_as_worker = true

diff --git a/docs/resources/cluster_edge_native.md b/docs/resources/cluster_edge_native.md
@@ -33,7 +33,7 @@ resource "spectrocloud_cluster_edge_native" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
 
     edge_host {
       host_uid  = spectrocloud_appliance.appliance0.uid

diff --git a/docs/resources/cluster_gcp.md b/docs/resources/cluster_gcp.md
@@ -62,7 +62,7 @@ resource "spectrocloud_cluster_gcp" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
     instance_type           = "e2-standard-2"
     disk_size_gb            = 62

diff --git a/docs/resources/cluster_openstack.md b/docs/resources/cluster_openstack.md
@@ -49,7 +49,7 @@ resource "spectrocloud_cluster_openstack" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
     instance_type           = "spectro-xlarge"
     azs                     = ["zone1"]

diff --git a/examples/e2e/aws/resource_cluster.tf b/examples/e2e/aws/resource_cluster.tf
@@ -34,7 +34,7 @@ resource "spectrocloud_cluster_aws" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
     instance_type           = "t3.large"
     disk_size_gb            = 62

diff --git a/examples/e2e/aws_spot/resource_cluster.tf b/examples/e2e/aws_spot/resource_cluster.tf
@@ -36,7 +36,7 @@ resource "spectrocloud_cluster_aws" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
     instance_type           = "t3.large"
     disk_size_gb            = 62

diff --git a/examples/e2e/azure/resource_cluster.tf b/examples/e2e/azure/resource_cluster.tf
@@ -36,7 +36,7 @@ resource "spectrocloud_cluster_azure" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
     instance_type           = "Standard_D2_v3"
     azs                     = []

diff --git a/examples/e2e/edge-native/variables.tf b/examples/e2e/edge-native/variables.tf
@@ -3,6 +3,6 @@ variable "cluster_ssh_key_name" {
   default = "spectro2020"
 }
 
-#variable "master_appliance_name" {}
+#variable "cp_appliance_name" {}
 
 #variable "worker_appliance_name" {}
diff --git a/examples/e2e/edge-vsphere/resource_cluster.tf b/examples/e2e/edge-vsphere/resource_cluster.tf
@@ -74,7 +74,7 @@ resource "spectrocloud_cluster_edge_vsphere" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
 
     placement {

diff --git a/examples/e2e/eks-static/resource_cluster.tf b/examples/e2e/eks-static/resource_cluster.tf
@@ -21,15 +21,15 @@ resource "spectrocloud_cluster_eks" "cluster" {
     region       = var.aws_region
     vpc_id       = var.aws_vpc_id
     azs          = var.azs != [] ? var.azs : null
-    az_subnets   = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets   = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
   }
 
   machine_pool {
     name          = "worker-basic"
     count         = 3
     instance_type = "t3.large"
     azs           = var.azs != [] ? var.azs : null
-    az_subnets    = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets    = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
     disk_size_gb  = 60
   }
 

diff --git a/examples/e2e/eks-static/terraform.template.tfvars b/examples/e2e/eks-static/terraform.template.tfvars
@@ -57,7 +57,7 @@ cloud_account_type = "{enter AWS Cloud Account Type}" #eg. "secret" or "sts"
 # Static provisioning requires specifying the exiting VPC-ID and all subnets to target
 aws_vpc_id = "{enter AWS VPC ID}" #e.g: vpc-123456
 
-master_azs_subnets_map = {
+cp_azs_subnets_map = {
   "{enter AWS Availability Zone A}" = "{enter Subnet for AZ A, ...}"
   "{enter AWS Availability Zone B}" = "{enter Subnet for AZ A, ...}"
 }

diff --git a/examples/e2e/eks-static/variables.tf b/examples/e2e/eks-static/variables.tf
@@ -32,7 +32,7 @@ variable "azs" {
 }
 
 # Provisioning Option B (Static)
-variable "master_azs_subnets_map" {
+variable "cp_azs_subnets_map" {
   default = {}
   type    = map(string)
 }

diff --git a/examples/e2e/eks/resource_cluster.tf b/examples/e2e/eks/resource_cluster.tf
@@ -21,15 +21,15 @@ resource "spectrocloud_cluster_eks" "cluster" {
     region       = var.aws_region
     vpc_id       = var.aws_vpc_id
     azs          = var.azs != [] ? var.azs : null
-    az_subnets   = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets   = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
   }
 
   machine_pool {
     name          = "worker-basic"
     count         = 3
     instance_type = "t3.large"
     azs           = var.azs != [] ? var.azs : null
-    az_subnets    = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets    = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
     disk_size_gb  = 60
   }
 

diff --git a/examples/e2e/eks/terraform.template.tfvars b/examples/e2e/eks/terraform.template.tfvars
@@ -75,7 +75,7 @@ cloud_account_type = "{enter AWS Cloud Account Type}" #eg. "secret" or "sts"
 # (for STATIC, uncomment the following 9 lines)
 #aws_vpc_id = "{enter AWS VPC ID}" #e.g: vpc-123456
 
-#master_azs_subnets_map = {
+#cp_azs_subnets_map = {
 #  "{enter AWS Availability Zone A}" = "{enter Subnet for AZ A, ...}"
 #  "{enter AWS Availability Zone B}" = "{enter Subnet for AZ A, ...}"
 #}
@@ -85,7 +85,7 @@ cloud_account_type = "{enter AWS Cloud Account Type}" #eg. "secret" or "sts"
 #}
 
 ## e.g:
-## master_azs_subnets_map = {
+## cp_azs_subnets_map = {
 ##   "us-west-2a" = "subnet-12345,subnet-4567"
 ##   "us-west-2b" = "subnet-12345,subnet-4567"
 ## }
diff --git a/examples/e2e/eks/variables.tf b/examples/e2e/eks/variables.tf
@@ -32,7 +32,7 @@ variable "azs" {
 }
 
 # Provisioning Option B (Static)
-variable "master_azs_subnets_map" {
+variable "cp_azs_subnets_map" {
   default = {}
   type    = map(string)
 }

diff --git a/examples/e2e/eks_rbac_namespaces/resource_cluster.tf b/examples/e2e/eks_rbac_namespaces/resource_cluster.tf
@@ -65,7 +65,7 @@ resource "spectrocloud_cluster_eks" "cluster" {
     region          = var.aws_region
     vpc_id          = var.aws_vpc_id
     azs             = var.azs != [] ? var.azs : null
-    az_subnets      = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets      = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
   }
 
   machine_pool {
@@ -75,7 +75,7 @@ resource "spectrocloud_cluster_eks" "cluster" {
     max           = 3
     instance_type = "t3.large"
     azs           = var.azs != [] ? var.azs : null
-    az_subnets    = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets    = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
     disk_size_gb  = 30
   }
 }
diff --git a/examples/e2e/eks_rbac_namespaces/terraform.template.tfvars b/examples/e2e/eks_rbac_namespaces/terraform.template.tfvars
@@ -75,7 +75,7 @@ cloud_account_type = "{enter AWS Cloud Account Type}" #eg. "secret" or "sts"
 # (for STATIC, uncomment the following 9 lines)
 #aws_vpc_id = "{enter AWS VPC ID}" #e.g: vpc-123456
 
-#master_azs_subnets_map = {
+#cp_azs_subnets_map = {
 #  "{enter AWS Availability Zone A}" = "{enter Subnet for AZ A, ...}"
 #  "{enter AWS Availability Zone B}" = "{enter Subnet for AZ A, ...}"
 #}
@@ -85,7 +85,7 @@ cloud_account_type = "{enter AWS Cloud Account Type}" #eg. "secret" or "sts"
 #}
 
 ## e.g:
-## master_azs_subnets_map = {
+## cp_azs_subnets_map = {
 ##   "us-west-2a" = "subnet-12345,subnet-4567"
 ##   "us-west-2b" = "subnet-12345,subnet-4567"
 ## }
diff --git a/examples/e2e/eks_rbac_namespaces/variables.tf b/examples/e2e/eks_rbac_namespaces/variables.tf
@@ -32,7 +32,7 @@ variable "azs" {
 }
 
 # Provisioning Option B (Static)
-variable "master_azs_subnets_map" {
+variable "cp_azs_subnets_map" {
   default = {}
   type    = map(string)
 }

diff --git a/examples/e2e/eks_spot/resource_cluster.tf b/examples/e2e/eks_spot/resource_cluster.tf
@@ -21,7 +21,7 @@ resource "spectrocloud_cluster_eks" "cluster" {
     region       = var.aws_region
     vpc_id       = var.aws_vpc_id
     azs          = var.azs != [] ? var.azs : null
-    az_subnets   = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets   = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
   }
 
   machine_pool {
@@ -31,7 +31,7 @@ resource "spectrocloud_cluster_eks" "cluster" {
     capacity_type = "spot"
     max_price     = "0.015"
     azs           = var.azs != [] ? var.azs : null
-    az_subnets    = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets    = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
     disk_size_gb  = 60
   }
 

diff --git a/examples/e2e/eks_spot/terraform.template.tfvars b/examples/e2e/eks_spot/terraform.template.tfvars
@@ -75,7 +75,7 @@ cloud_account_type = "{enter AWS Cloud Account Type}" #eg. "secret" or "sts"
 # (for STATIC, uncomment the following 9 lines)
 #aws_vpc_id = "{enter AWS VPC ID}" #e.g: vpc-123456
 
-#master_azs_subnets_map = {
+#cp_azs_subnets_map = {
 #  "{enter AWS Availability Zone A}" = "{enter Subnet for AZ A, ...}"
 #  "{enter AWS Availability Zone B}" = "{enter Subnet for AZ A, ...}"
 #}
@@ -85,7 +85,7 @@ cloud_account_type = "{enter AWS Cloud Account Type}" #eg. "secret" or "sts"
 #}
 
 ## e.g:
-## master_azs_subnets_map = {
+## cp_azs_subnets_map = {
 ##   "us-west-2a" = "subnet-12345,subnet-4567"
 ##   "us-west-2b" = "subnet-12345,subnet-4567"
 ## }
diff --git a/examples/e2e/eks_spot/variables.tf b/examples/e2e/eks_spot/variables.tf
@@ -32,7 +32,7 @@ variable "azs" {
 }
 
 # Provisioning Option B (Static)
-variable "master_azs_subnets_map" {
+variable "cp_azs_subnets_map" {
   default = {}
   type    = map(string)
 }

diff --git a/examples/e2e/eks_taints_labels/resource_cluster.tf b/examples/e2e/eks_taints_labels/resource_cluster.tf
@@ -65,15 +65,15 @@ resource "spectrocloud_cluster_eks" "cluster" {
     region          = var.aws_region
     vpc_id          = var.aws_vpc_id
     azs             = var.azs != [] ? var.azs : null
-    az_subnets      = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets      = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
   }
 
   machine_pool {
     name          = "worker-basic"
     count         = 1
     instance_type = "t3.large"
     azs           = var.azs != [] ? var.azs : null
-    az_subnets    = var.master_azs_subnets_map != {} ? var.master_azs_subnets_map : null
+    az_subnets    = var.cp_azs_subnets_map != {} ? var.cp_azs_subnets_map : null
     disk_size_gb  = 30
 
     additional_labels = {

diff --git a/examples/e2e/eks_taints_labels/terraform.template.tfvars b/examples/e2e/eks_taints_labels/terraform.template.tfvars
@@ -75,7 +75,7 @@ cloud_account_type = "{enter AWS Cloud Account Type}" #eg. "secret" or "sts"
 # (for STATIC, uncomment the following 9 lines)
 #aws_vpc_id = "{enter AWS VPC ID}" #e.g: vpc-123456
 
-#master_azs_subnets_map = {
+#cp_azs_subnets_map = {
 #  "{enter AWS Availability Zone A}" = "{enter Subnet for AZ A, ...}"
 #  "{enter AWS Availability Zone B}" = "{enter Subnet for AZ A, ...}"
 #}
@@ -85,7 +85,7 @@ cloud_account_type = "{enter AWS Cloud Account Type}" #eg. "secret" or "sts"
 #}
 
 ## e.g:
-## master_azs_subnets_map = {
+## cp_azs_subnets_map = {
 ##   "us-west-2a" = "subnet-12345,subnet-4567"
 ##   "us-west-2b" = "subnet-12345,subnet-4567"
 ## }
diff --git a/examples/e2e/eks_taints_labels/variables.tf b/examples/e2e/eks_taints_labels/variables.tf
@@ -32,7 +32,7 @@ variable "azs" {
 }
 
 # Provisioning Option B (Static)
-variable "master_azs_subnets_map" {
+variable "cp_azs_subnets_map" {
   default = {}
   type    = map(string)
 }

diff --git a/examples/e2e/gcp/resource_cluster.tf b/examples/e2e/gcp/resource_cluster.tf
@@ -19,11 +19,11 @@ resource "spectrocloud_cluster_gcp" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
-    count                   = var.master_nodes.count
-    instance_type           = var.master_nodes.instance_type
-    disk_size_gb            = var.master_nodes.disk_size_gb
-    azs                     = var.master_nodes.availability_zones
+    name                    = "cp-pool"
+    count                   = var.cp_nodes.count
+    instance_type           = var.cp_nodes.instance_type
+    disk_size_gb            = var.cp_nodes.disk_size_gb
+    azs                     = var.cp_nodes.availability_zones
   }
 
   machine_pool {

diff --git a/examples/e2e/gcp/variables.tf b/examples/e2e/gcp/variables.tf
@@ -5,14 +5,14 @@ variable "gcp-cloud-account-name" {
   description = "The name of your GCP account as assigned in Palette"
 }
 
-variable "master_nodes" {
+variable "cp_nodes" {
   type = object({
     count              = string
     instance_type      = string
     disk_size_gb       = string
     availability_zones = list(string)
   })
-  description = "Master nodes configuration."
+  description = "Control Plane nodes configuration."
 }
 
 variable "worker_nodes" {

diff --git a/examples/e2e/libvirt_rbac_labels/resource_cluster.tf b/examples/e2e/libvirt_rbac_labels/resource_cluster.tf
@@ -65,7 +65,7 @@ resource "spectrocloud_cluster_libvirt" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
 
     placements {

diff --git a/examples/e2e/libvirt_rbac_labels/variables.tf b/examples/e2e/libvirt_rbac_labels/variables.tf
@@ -3,6 +3,6 @@ variable "cluster_ssh_key_name" {
   default = "spectro2020"
 }
 
-#variable "master_appliance_name" {}
+#variable "cp_appliance_name" {}
 
 #variable "worker_appliance_name" {}
diff --git a/examples/e2e/maas/resource_cluster.tf b/examples/e2e/maas/resource_cluster.tf
@@ -14,7 +14,7 @@ resource "spectrocloud_cluster_maas" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
+    name                    = "cp-pool"
     count                   = 1
     placement {
       resource_pool = var.maas_resource_pool

diff --git a/examples/e2e/openstack/resource_openstack_cluster_static_create.tf b/examples/e2e/openstack/resource_openstack_cluster_static_create.tf
@@ -79,9 +79,9 @@ resource "spectrocloud_cluster_openstack" "cluster" {
   machine_pool {
     control_plane           = true
     control_plane_as_worker = true
-    name                    = "master-pool"
-    count                   = var.master_inst_count
-    instance_type           = var.master_inst_type
+    name                    = "cp-pool"
+    count                   = var.cp_inst_count
+    instance_type           = var.cp_inst_type
     azs                     = ["nova"]
   }