Merge pull request #8723 from Prajyot-Parab/main

IBMCLOUD: Update terraform configurations

Author: k8s-ci-robot

infra/ibmcloud/terraform/k8s-power-build-cluster/bastion.tf

@@ -27,7 +27,7 @@ data "ibm_pi_key" "key" {
 data "ibm_sm_arbitrary_secret" "secret" {
   instance_id       = var.secrets_manager_id
   region            = "us-south"
-  name              = "powervs-ssh-private-key"
+  name              = "build-cluster-ssh-private-key"
   secret_group_name = "default"
 }
 
@@ -45,6 +45,12 @@ resource "ibm_pi_network" "private_network" {
 }
 
 resource "ibm_pi_network" "public_network" {
+  lifecycle {
+    ignore_changes = [
+      pi_advertise,
+      pi_arp_broadcast,
+    ]
+  }
   pi_network_name      = "public-net"
   pi_cloud_instance_id = var.service_instance_id
   pi_network_type      = "pub-vlan"

infra/ibmcloud/terraform/k8s-power-build-cluster/modules/load_balancer/load_balancer.tf

@@ -28,6 +28,11 @@ data "ibm_resource_group" "group" {
 }
 
 resource "ibm_is_lb" "load_balancer_external" {
+  lifecycle {
+    ignore_changes = [
+      resource_group
+    ]
+  }
   name           = "k8s-control-plane-api-lb"
   resource_group = data.ibm_resource_group.group.id
   subnets        = data.ibm_is_vpc.vpc.subnets.*.id

infra/ibmcloud/terraform/k8s-power-build-cluster/variables.tf

@@ -146,15 +146,15 @@ variable "bastion" {
   type = object({ memory = string, processors = string })
   default = {
     memory     = "8"
-    processors = "0.5"
+    processors = "0.25"
   }
 }
 
 variable "control_plane" {
   default = {
     count      = 3
     memory     = "8"
-    processors = "0.5"
+    processors = "0.25"
   }
   validation {
     condition     = var.control_plane["count"] == 3
@@ -164,9 +164,9 @@ variable "control_plane" {
 
 variable "compute" {
   default = {
-    count      = 2
-    memory     = "8"
-    processors = "0.5"
+    count      = 5
+    memory     = "42"
+    processors = "2"
   }
 }
 

infra/ibmcloud/terraform/k8s-power-conformance/pvs.tf

@@ -53,6 +53,17 @@ module "powervs_workspace_lon06" {
   image_name        = var.image_name
 }
 
+module "powervs_workspace_lon06_1" {
+  providers = {
+    ibm = ibm.powervs_lon06
+  }
+  source            = "./modules/pvs_workspace"
+  datacenter        = "lon06"
+  pi_workspace_name = "k8s-boskos-powervs-lon06-01"
+  resource_group_id = module.resource_group.k8s_rg_id
+  image_name        = var.image_name
+}
+
 module "powervs_workspace_syd04" {
   providers = {
     ibm = ibm.powervs_syd04