Skip to content

Commit 56bb87f

Browse files
rodrigcdevoncrouse
authored andcommitted
docs: improve formatting of examples/workers tfvars
Instead of putting multiple variables on one line, put variables on separate lines. These examples get rendered into documentation, so this makes these files more readable. Signed-off-by: Craig Rodrigues <[email protected]>
1 parent 6dc2af5 commit 56bb87f

9 files changed

+120
-42
lines changed

examples/workers/vars-workers-advanced.auto.tfvars

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,46 @@ worker_pool_mode = "node-pool"
1818
worker_pool_size = 1
1919

2020
worker_pools = {
21-
np1 = { mode = "node-pool", size = 1, shape = "VM.Standard.E4.Flex", create = false },
21+
np1 = {
22+
mode = "node-pool",
23+
size = 1,
24+
shape = "VM.Standard.E4.Flex",
25+
create = false
26+
},
2227
wg_np-vm-ol7 = {
23-
description = "OKE-managed Node Pool with OKE Oracle Linux 7 image", create = false,
24-
mode = "node-pool", size = 1, size_max = 2, os = "Oracle Linux", os_version = "7", autoscale = true,
28+
description = "OKE-managed Node Pool with OKE Oracle Linux 7 image",
29+
create = false,
30+
mode = "node-pool",
31+
size = 1,
32+
size_max = 2,
33+
os = "Oracle Linux",
34+
os_version = "7",
35+
autoscale = true,
2536
},
2637
wg_np-vm-ol8 = {
27-
description = "OKE-managed Node Pool with OKE Oracle Linux 8 image", create = false,
28-
mode = "node-pool", size = 1, size_max = 3, os = "Oracle Linux", os_version = "8", autoscale = true,
38+
description = "OKE-managed Node Pool with OKE Oracle Linux 8 image",
39+
create = false,
40+
mode = "node-pool",
41+
size = 1,
42+
size_max = 3,
43+
os = "Oracle Linux",
44+
os_version = "8",
45+
autoscale = true,
2946
},
3047
wg_np-vm-custom = {
31-
description = "OKE-managed Node Pool with custom image", create = true,
32-
mode = "node-pool", image_type = "custom", size = 1, allow_autoscaler = true,
48+
description = "OKE-managed Node Pool with custom image",
49+
create = true,
50+
mode = "node-pool",
51+
image_type = "custom",
52+
size = 1,
53+
allow_autoscaler = true,
3354
},
3455
shielded_instances = {
35-
description = "Self-managed Shielded VM Instance", create = false,
36-
size = 1, mode = "instance", shape = "VM.Standard2.4",
56+
description = "Self-managed Shielded VM Instance",
57+
create = false,
58+
size = 1,
59+
mode = "instance",
60+
shape = "VM.Standard2.4",
3761
platform_config = {
3862
is_measured_boot_enabled = true,
3963
is_secure_boot_enabled = true,

examples/workers/vars-workers-autoscaling.auto.tfvars

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
worker_pools = {
77
np-autoscaled = {
88
description = "Node pool managed by cluster autoscaler",
9-
size = 1, size_max = 2, autoscale = true,
9+
size = 1,
10+
size_max = 2,
11+
autoscale = true,
1012
},
1113
np-autoscaler = {
12-
description = "Node pool with cluster autoscaler scheduling allowed",
13-
size = 1, allow_autoscaler = true,
14+
description = "Node pool with cluster autoscaler scheduling allowed",
15+
size = 1,
16+
allow_autoscaler = true,
1417
},
1518
}

examples/workers/vars-workers-basic.auto.tfvars

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ worker_pools = {
88
oke-vm-standard = {},
99

1010
oke-vm-standard-large = {
11-
description = "OKE-managed Node Pool with OKE Oracle Linux 8 image",
12-
shape = "VM.Standard.E4.Flex", create = true,
13-
ocpus = 8, memory = 128, boot_volume_size = 200,
14-
os = "Oracle Linux", os_version = "8",
11+
description = "OKE-managed Node Pool with OKE Oracle Linux 8 image",
12+
shape = "VM.Standard.E4.Flex",
13+
create = true,
14+
ocpus = 8,
15+
memory = 128,
16+
boot_volume_size = 200,
17+
os = "Oracle Linux",
18+
os_version = "8",
1519
},
1620
}

examples/workers/vars-workers-clusternetwork.auto.tfvars

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@
33

44
worker_pools = {
55
oke-vm-standard = {
6-
description = "Managed node pool for operational workloads without GPU toleration"
7-
mode = "node-pool", size = 1, shape = "VM.Standard.E4.Flex",
8-
ocpus = 2, memory = 16, boot_volume_size = 50,
6+
description = "Managed node pool for operational workloads without GPU toleration"
7+
mode = "node-pool",
8+
size = 1,
9+
shape = "VM.Standard.E4.Flex",
10+
ocpus = 2,
11+
memory = 16,
12+
boot_volume_size = 50,
913
},
1014

1115
oke-bm-gpu-rdma = {
1216
description = "Self-managed nodes in a Cluster Network with RDMA networking",
13-
mode = "cluster-network", size = 1, shape = "BM.GPU.B4.8",
14-
placement_ads = [1], image_id = "ocid1.image..."
17+
mode = "cluster-network",
18+
size = 1,
19+
shape = "BM.GPU.B4.8",
20+
placement_ads = [1],
21+
image_id = "ocid1.image..."
1522
cloud_init = [
1623
{
1724
content = <<-EOT
@@ -21,7 +28,10 @@ worker_pools = {
2128
},
2229
],
2330
secondary_vnics = {
24-
"vnic-display-name" = { nic_index = 1, subnet_id = "ocid1.subnet..." },
31+
"vnic-display-name" = {
32+
nic_index = 1,
33+
subnet_id = "ocid1.subnet..."
34+
},
2535
},
2636
}
2737
}

examples/workers/vars-workers-drain.auto.tfvars

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ worker_pool_size = 1
66

77
worker_pools = {
88
oke-vm-active = {
9-
description = "Node pool with active workers", size = 2,
9+
description = "Node pool with active workers",
10+
size = 2,
1011
},
1112
oke-vm-draining = {
1213
description = "Node pool with scheduling disabled and draining",

examples/workers/vars-workers-instance.auto.tfvars

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
worker_pools = {
55
oke-vm-instance = {
66
description = "Self-managed Instances",
7-
mode = "instance", size = 1,
8-
node_labels = { "keya" : "valuea", "keyb" : "valueb" },
7+
mode = "instance",
8+
size = 1,
9+
node_labels = {
10+
"keya" = "valuea",
11+
"keyb" = "valueb"
12+
},
913
secondary_vnics = {
1014
"vnic-display-name" = {},
1115
},

examples/workers/vars-workers-instancepool.auto.tfvars

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
worker_pools = {
55
oke-vm-instance-pool = {
66
description = "Self-managed Instance Pool with custom image",
7-
mode = "instance-pool", size = 1,
8-
node_labels = { "keya" : "valuea", "keyb" : "valueb" },
7+
mode = "instance-pool",
8+
size = 1,
9+
node_labels = {
10+
"keya" = "valuea",
11+
"keyb" = "valueb"
12+
},
913
secondary_vnics = {
1014
"vnic-display-name" = {},
1115
},

examples/workers/vars-workers-network-vnics.auto.tfvars

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,52 @@ pod_nsg_ids = [] // when cni_type = "npn"
1414

1515
worker_pools = {
1616
oke-vm-custom-network-flannel = {
17-
assign_public_ip = false, create = false,
17+
assign_public_ip = false,
18+
create = false,
1819
subnet_id = "ocid1.subnet..."
1920
nsg_ids = ["ocid1.networksecuritygroup..."]
2021
},
2122

2223
oke-vm-custom-network-npn = {
23-
assign_public_ip = false, create = false,
24+
assign_public_ip = false,
25+
create = false,
2426
subnet_id = "ocid1.subnet..."
2527
pod_subnet_id = "ocid1.subnet..."
2628
nsg_ids = ["ocid1.networksecuritygroup..."]
2729
pod_nsg_ids = ["ocid1.networksecuritygroup..."]
2830
},
2931

3032
oke-vm-vnics = {
31-
mode = "instance-pool", size = 1, create = false,
33+
mode = "instance-pool",
34+
size = 1,
35+
create = false,
3236
secondary_vnics = {
33-
vnic0 = { nic_index = 0, subnet_id = "ocid1.subnet..." },
34-
vnic1 = { nic_index = 1, subnet_id = "ocid1.subnet..." },
37+
vnic0 = {
38+
nic_index = 0,
39+
subnet_id = "ocid1.subnet..."
40+
},
41+
vnic1 = {
42+
nic_index = 1,
43+
subnet_id = "ocid1.subnet..."
44+
},
3545
},
3646
},
3747

3848
oke-bm-vnics = {
39-
mode = "cluster-network", size = 2, shape = "BM.GPU.B4.8",
40-
placement_ads = [1], create = false,
49+
mode = "cluster-network",
50+
size = 2,
51+
shape = "BM.GPU.B4.8",
52+
placement_ads = [1],
53+
create = false,
4154
secondary_vnics = {
42-
gpu0 = { nic_index = 0, subnet_id = "ocid1.subnet..." },
43-
gpu1 = { nic_index = 1, subnet_id = "ocid1.subnet..." },
55+
gpu0 = {
56+
nic_index = 0,
57+
subnet_id = "ocid1.subnet..."
58+
},
59+
gpu1 = {
60+
nic_index = 1,
61+
subnet_id = "ocid1.subnet..."
62+
},
4463
},
4564
},
4665
}

examples/workers/vars-workers-nodepool.auto.tfvars

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,34 @@ worker_pools = {
88
oke-vm-standard = {},
99

1010
oke-vm-standard-large = {
11-
size = 1, shape = "VM.Standard.E4.Flex",
12-
ocpus = 8, memory = 128, boot_volume_size = 200,
13-
create = false,
11+
size = 1,
12+
shape = "VM.Standard.E4.Flex",
13+
ocpus = 8,
14+
memory = 128,
15+
boot_volume_size = 200,
16+
create = false,
1417
},
1518

1619
oke-vm-standard-ol7 = {
1720
description = "OKE-managed Node Pool with OKE Oracle Linux 7 image",
18-
size = 1, os = "Oracle Linux", os_version = "7",
21+
size = 1,
22+
os = "Oracle Linux",
23+
os_version = "7",
1924
create = false,
2025
},
2126

2227
oke-vm-standard-ol8 = {
2328
description = "OKE-managed Node Pool with OKE Oracle Linux 8 image",
24-
size = 1, os = "Oracle Linux", os_version = "8",
29+
size = 1,
30+
os = "Oracle Linux",
31+
os_version = "8",
2532
},
2633

2734
oke-vm-standard-custom = {
2835
description = "OKE-managed Node Pool with custom image",
29-
image_type = "custom", image_id = "ocid1.image...", size = 1,
36+
image_type = "custom",
37+
image_id = "ocid1.image...",
38+
size = 1,
3039
create = false,
3140
},
3241
}

0 commit comments

Comments
 (0)