Skip to content

Commit 16fa586

Browse files
authored
Replace subnetwork name with vpc (#971)
* Add A3 Ultra Cluster * fix legacy module warning * Add infra switch logic using Meta argument Count * fix error * Cleanup * Add back default value * Fix pip3 not found issue: the infra Manager image does not have python installed. k8s jobs in lanuchpad recipes already have the necessary tcpx/tcpxo config. * Use vpc instead of subnetwork name
1 parent b1e34ab commit 16fa586

File tree

2 files changed

+4
-4
lines changed
  • applications/hcc/modules/embedded/modules/scheduler

2 files changed

+4
-4
lines changed

applications/hcc/modules/embedded/modules/scheduler/gke-cluster/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -382,15 +382,15 @@ module "kubectl_apply" {
382382
{
383383
source = "${path.module}/templates/gke-network-paramset.yaml.tftpl",
384384
template_vars = {
385-
name = network_info.subnetwork,
385+
name = "vpc${idx + 1}",
386386
network_name = network_info.network
387387
subnetwork_name = network_info.subnetwork,
388388
device_mode = strcontains(upper(network_info.nic_type), "RDMA") ? "RDMA" : "NetDevice"
389389
}
390390
},
391391
{
392392
source = "${path.module}/templates/network-object.yaml.tftpl",
393-
template_vars = { name = network_info.subnetwork }
393+
template_vars = { name = "vpc${idx + 1}" }
394394
}
395395
]
396396
])

applications/hcc/modules/embedded/modules/scheduler/pre-existing-gke-cluster/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ locals {
4646
{
4747
source = "${path.module}/templates/gke-network-paramset.yaml.tftpl",
4848
template_vars = {
49-
name = network_info.subnetwork
49+
name = "vpc${idx + 1}"
5050
network_name = network_info.network
5151
subnetwork_name = network_info.subnetwork
5252
device_mode = "NetDevice"
5353
}
5454
},
5555
{
5656
source = "${path.module}/templates/network-object.yaml.tftpl",
57-
template_vars = { name = network_info.subnetwork }
57+
template_vars = { name = "vpc${idx + 1}" }
5858
}
5959
]
6060
])

0 commit comments

Comments
 (0)