diff --git a/ci/packet/packet-cluster.lokocfg.envsubst b/ci/packet/packet-cluster.lokocfg.envsubst index c71f77ba7..dacd5fd3e 100644 --- a/ci/packet/packet-cluster.lokocfg.envsubst +++ b/ci/packet/packet-cluster.lokocfg.envsubst @@ -28,14 +28,14 @@ EOF project_id = "$PACKET_PROJECT_ID" - ssh_pubkeys = ["$PUB_KEY"] - management_cidrs = ["0.0.0.0/0"] + ssh_pubkeys = ["$PUB_KEY"] + management_cidrs = ["0.0.0.0/0"] node_private_cidrs = ["10.0.0.0/8"] worker_pool "pool-1" { count = 2 node_type = "c2.medium.x86" - labels = { + labels = { "testing.io" = "yes", "roleofnode" = "testing", } diff --git a/ci/packet_arm/packet_arm-cluster.lokocfg.envsubst b/ci/packet_arm/packet_arm-cluster.lokocfg.envsubst index 116e98998..c376147bc 100644 --- a/ci/packet_arm/packet_arm-cluster.lokocfg.envsubst +++ b/ci/packet_arm/packet_arm-cluster.lokocfg.envsubst @@ -32,8 +32,8 @@ EOF os_channel = "alpha" controller_type = "c2.large.arm" - ssh_pubkeys = ["$PUB_KEY"] - management_cidrs = ["0.0.0.0/0"] + ssh_pubkeys = ["$PUB_KEY"] + management_cidrs = ["0.0.0.0/0"] node_private_cidrs = ["10.0.0.0/8"] worker_pool "pool-1" { diff --git a/ci/packet_fluo/packet_fluo-cluster.lokocfg.envsubst b/ci/packet_fluo/packet_fluo-cluster.lokocfg.envsubst index 8c19eea49..f1c123813 100644 --- a/ci/packet_fluo/packet_fluo-cluster.lokocfg.envsubst +++ b/ci/packet_fluo/packet_fluo-cluster.lokocfg.envsubst @@ -28,8 +28,8 @@ EOF project_id = "$PACKET_PROJECT_ID" - ssh_pubkeys = ["$PUB_KEY"] - management_cidrs = ["0.0.0.0/0"] + ssh_pubkeys = ["$PUB_KEY"] + management_cidrs = ["0.0.0.0/0"] node_private_cidrs = ["10.0.0.0/8"] worker_pool "general" { @@ -44,7 +44,7 @@ EOF } worker_pool "storage" { - count = 3 + count = 3 node_type = "c2.medium.x86" labels = { @@ -77,7 +77,7 @@ component "rook" { } component "rook-ceph" { - monitor_count = 3 + monitor_count = 3 enable_toolbox = true node_affinity { @@ -93,7 +93,7 @@ component "rook-ceph" { } storage_class { - enable = true + enable = true default = true } } diff --git a/cli/cmd/cluster/utils_internal_test.go b/cli/cmd/cluster/utils_internal_test.go index 6c76048f7..170cb60f7 100644 --- a/cli/cmd/cluster/utils_internal_test.go +++ b/cli/cmd/cluster/utils_internal_test.go @@ -172,13 +172,13 @@ func TestGetKubeconfigSourceFlag(t *testing.T) { configFile: `cluster "packet" { asset_dir = "/bad" - cluster_name = "" - controller_count = 0 - facility = "" - management_cidrs = [] + cluster_name = "" + controller_count = 0 + facility = "" + management_cidrs = [] node_private_cidrs = [] - project_id = "" - ssh_pubkeys = [] + project_id = "" + ssh_pubkeys = [] dns { provider = "" zone = "" @@ -214,13 +214,13 @@ func TestGetKubeconfigSourceConfigFile(t *testing.T) { configFile: `cluster "packet" { asset_dir = "/foo" - cluster_name = "" - controller_count = 0 - facility = "" - management_cidrs = [] + cluster_name = "" + controller_count = 0 + facility = "" + management_cidrs = [] node_private_cidrs = [] - project_id = "" - ssh_pubkeys = [] + project_id = "" + ssh_pubkeys = [] dns { provider = "" zone = "" @@ -277,13 +277,13 @@ func TestGetKubeconfigFromAssetsDir(t *testing.T) { configFile: fmt.Sprintf(`cluster "packet" { asset_dir = "%s" - cluster_name = "" - controller_count = 0 - facility = "" - management_cidrs = [] + cluster_name = "" + controller_count = 0 + facility = "" + management_cidrs = [] node_private_cidrs = [] - project_id = "" - ssh_pubkeys = [] + project_id = "" + ssh_pubkeys = [] dns { provider = "" zone = "" diff --git a/docs/quickstarts/packet.md b/docs/quickstarts/packet.md index 2c40c55db..c7322daae 100644 --- a/docs/quickstarts/packet.md +++ b/docs/quickstarts/packet.md @@ -94,27 +94,27 @@ Create a file named `cluster.lokocfg` with the following contents: ```hcl cluster "packet" { - asset_dir = "./assets" - cluster_name = "lokomotive-demo" + asset_dir = "./assets" + cluster_name = "lokomotive-demo" dns { zone = "example.com" provider = "route53" } - facility = "ams1" + facility = "ams1" project_id = "89273817-4f44-4b41-9f0c-cb00bf538542" controller_type = "c3.small.x86" - ssh_pubkeys = ["ssh-rsa AAAA..."] - management_cidrs = ["0.0.0.0/0"] + ssh_pubkeys = ["ssh-rsa AAAA..."] + management_cidrs = ["0.0.0.0/0"] node_private_cidrs = ["10.0.0.0/8"] controller_count = 1 worker_pool "pool-1" { - count = 2 + count = 2 node_type = "c3.small.x86" } } diff --git a/examples/packet-production/cluster.lokocfg b/examples/packet-production/cluster.lokocfg index bcc68d588..a1db5fa9c 100644 --- a/examples/packet-production/cluster.lokocfg +++ b/examples/packet-production/cluster.lokocfg @@ -76,8 +76,8 @@ cluster "packet" { project_id = var.packet_project_id - ssh_pubkeys = var.ssh_public_keys - management_cidrs = var.management_cidrs + ssh_pubkeys = var.ssh_public_keys + management_cidrs = var.management_cidrs node_private_cidrs = var.node_private_cidrs worker_pool "pool-1" { diff --git a/examples/packet-testing/cluster.lokocfg b/examples/packet-testing/cluster.lokocfg index aca143f85..e67c33694 100644 --- a/examples/packet-testing/cluster.lokocfg +++ b/examples/packet-testing/cluster.lokocfg @@ -54,8 +54,8 @@ cluster "packet" { project_id = var.packet_project_id - ssh_pubkeys = var.ssh_public_keys - management_cidrs = var.management_cidrs + ssh_pubkeys = var.ssh_public_keys + management_cidrs = var.management_cidrs node_private_cidrs = var.node_private_cidrs worker_pool "pool-1" {