Merge branch 'master' into chore/update-crypto-deps

IBM-Cloud · Jan 2, 2025 · 43b0cd5 · 43b0cd5
2 parents 168c8e1 + 78489b1
commit 43b0cd5
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 3 deletions.
diff --git a/...iders/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.golden b/...iders/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.golden
@@ -21,9 +21,17 @@
  ├─ VPC Container Work Zone flavor: (bx2.4x16) region: (eu-de) name: (eu-de-1) x(3) workers        2,190  hours        $1,039.78 
  └─ VPC Container Work Zone flavor: (bx2.4x16) region: (eu-de) name: (eu-de-2) x(3) workers        2,190  hours        $1,039.78 
 
- OVERALL TOTAL                                                                                                         $8,226.30 
+ roks-no-entitlement                                                                                                             
+ ├─ VPC Container Work Zone flavor: (bx2.4x16) region: (eu-de) name: (eu-de-1) x(3) workers            3  hours            $1.42 
+ └─ VPC Container Work Zone flavor: (bx2.4x16) region: (eu-de) name: (eu-de-2) x(3) workers            3  hours            $1.42 
+
+ roks-with-entitlement                                                                                                           
+ ├─ VPC Container Work Zone flavor: (bx2.4x16) region: (eu-de) name: (eu-de-1) x(3) workers            3  hours            $0.91 
+ └─ VPC Container Work Zone flavor: (bx2.4x16) region: (eu-de) name: (eu-de-2) x(3) workers            3  hours            $0.91 
+
+ OVERALL TOTAL                                                                                                         $8,230.97 
 ──────────────────────────────────
-6 cloud resources were detected:
-∙ 4 were estimated, 1 of which usage-based costs, see https://infracost.io/usage-file
+8 cloud resources were detected:
+∙ 6 were estimated, 1 of which usage-based costs, see https://infracost.io/usage-file
 ∙ 2 were free:
   ∙ 2 x ibm_is_subnet
diff --git a/...providers/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.tf b/...providers/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.tf
@@ -77,3 +77,36 @@ resource "ibm_container_vpc_cluster" "roks_cluster_with_usage" {
     name      = "eu-de-2"
   }
 }
+
+resource "ibm_container_vpc_cluster" "roks_with_entitlement" {
+  name         = "roks-with-entitlement"
+  vpc_id       = ibm_is_vpc.vpc1.id
+  flavor       = "bx2.4x16"
+  worker_count = 3
+  kube_version = "4.13_openshift"
+  entitlement  = "cloud_pak"
+  zones {
+    subnet_id = ibm_is_subnet.subnet1.id
+    name      = "eu-de-1"
+  }
+  zones {
+    subnet_id = ibm_is_subnet.subnet1.id
+    name      = "eu-de-2"
+  }
+}
+
+resource "ibm_container_vpc_cluster" "roks_no_entitlement" {
+  name         = "roks-no-entitlement"
+  vpc_id       = ibm_is_vpc.vpc1.id
+  flavor       = "bx2.4x16"
+  worker_count = 3
+  kube_version = "4.13_openshift"
+  zones {
+    subnet_id = ibm_is_subnet.subnet1.id
+    name      = "eu-de-1"
+  }
+  zones {
+    subnet_id = ibm_is_subnet.subnet1.id
+    name      = "eu-de-2"
+  }
+}
diff --git a/internal/resources/ibm/container_vpc_cluster.go b/internal/resources/ibm/container_vpc_cluster.go
@@ -77,6 +77,10 @@ func (r *ContainerVpcCluster) BuildResource() *schema.Resource {
 		attributeFilters = append(attributeFilters, &schema.AttributeFilter{
 			Key: "ocpIncluded", Value: strPtr("true"),
 		})
+	} else {
+		attributeFilters = append(attributeFilters, &schema.AttributeFilter{
+			Key: "ocpIncluded", Value: strPtr("false"),
+		})
 	}
 	WorkerCount := decimalPtr(decimal.NewFromInt(1))
 	if r.WorkerCount != 0 {

diff --git a/internal/resources/ibm/container_vpc_worker_pool.go b/internal/resources/ibm/container_vpc_worker_pool.go
@@ -70,6 +70,10 @@ func (r *ContainerVpcWorkerPool) BuildResource() *schema.Resource {
 		attributeFilters = append(attributeFilters, &schema.AttributeFilter{
 			Key: "ocpIncluded", Value: strPtr("true"),
 		})
+	} else {
+		attributeFilters = append(attributeFilters, &schema.AttributeFilter{
+			Key: "ocpIncluded", Value: strPtr("false"),
+		})
 	}
 	WorkerCount := decimalPtr(decimal.NewFromInt(1))
 	if r.WorkerCount != 0 {