Skip to content
This repository was archived by the owner on Jun 29, 2022. It is now read-only.

Commit 7225aa9

Browse files
johananljohananl
authored
Merge pull request #612 from kinvolk/johananl/packet-default-dev-type
packet: Use c3.small.x86 by default
2 parents d7a05da + c660564 commit 7225aa9

File tree

8 files changed

+20
-19
lines changed

8 files changed

+20
-19
lines changed

‎assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/variables.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ variable "controller_count" {
4242

4343
variable "controller_type" {
4444
type = string
45-
# This is Packet's internal name for "t1.small.x86"
46-
default = "baremetal_0"
45+
default = "c3.small.x86"
4746
description = "Packet instance type for controllers"
4847
}
4948

‎assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/workers/variables.tf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ variable "worker_count" {
2424

2525
variable "type" {
2626
type = string
27-
# This is Packet's internal name for "t1.small.x86"
28-
default = "baremetal_0"
27+
default = "c3.small.x86"
2928
description = "Packet instance type for workers, can be changed afterwards to recreate the nodes"
3029
}
3130

‎ci/packet/packet-cluster.lokocfg.envsubst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cluster "packet" {
22
asset_dir = pathexpand("~/lokoctl-assets")
33
cluster_name = "$CLUSTER_ID"
44
controller_count = 1
5+
controller_type = "t1.small.x86"
56

67
controller_clc_snippets = [
78
<<EOF

‎docs/configuration-reference/components/cluster-autoscaler.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ component "cluster-autoscaler" {
5858
facility = "sjc1"
5959
6060
# Optional arguments
61-
worker_type = "t1.small.x86"
61+
worker_type = "c3.small.x86"
6262
worker_channel = "stable"
6363
}
6464
}
@@ -84,7 +84,7 @@ Example:
8484
| `service_monitor` | Specifies how metrics can be retrieved from a set of services. | false | bool | false |
8585
| `packet.project_id` | Packet Project ID where the cluster is running. | - | string | true |
8686
| `packet.facility` | Packet Facility where the cluster is running. | - | string | true |
87-
| `packet.worker_type` | Machine type for workers spawned by the Cluster Autoscaler. | "t1.small.x86" | string | false |
87+
| `packet.worker_type` | Machine type for workers spawned by the Cluster Autoscaler. | "c3.small.x86" | string | false |
8888
| `packet_worker_channel` | Flatcar Container Linux channel to be used in workers spawned by the Cluster Autoscaler. | "stable" | string | false |
8989

9090

‎docs/configuration-reference/platforms/packet.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ cluster "packet" {
7171
7272
controller_count = var.controllers_count
7373
74-
controller_type = "t1.small.x86"
74+
controller_type = "c3.small.x86"
7575
7676
controller_clc_snippets = var.controller_clc.snippets
7777
@@ -171,9 +171,8 @@ block in the cluster configuration.
171171

172172
Example:
173173

174-
The default for node_type is `baremetal_0` (which is Packet's internal name for
175-
`t1.small.x86`). If you wish to change the default, then you define the
176-
variable and use it to refer in the cluster configuration.
174+
The default for node_type is `c3.small.x86`. If you wish to change the default, then you
175+
define the variable and use it to refer in the cluster configuration.
177176

178177
```tf
179178
variable "custom_default_worker_type" {
@@ -199,7 +198,7 @@ node_type = var.custom_default_worker_type
199198
| `cluster_name` | Name of the cluster. | - | string | true |
200199
| `tags` | List of tags that will be propagated to master nodes. | - | map(string) | false |
201200
| `controller_count` | Number of controller nodes. | 1 | number | false |
202-
| `controller_type` | Packet instance type for controllers. | "baremetal_0" | string | false |
201+
| `controller_type` | Packet instance type for controllers. | "c3.small.x86" | string | false |
203202
| `controller_clc_snippets` | Controller Flatcar Container Linux Config snippets. | [] | list(string) | false |
204203
| `dns` | DNS configuration block. | - | object | true |
205204
| `dns.zone` | A DNS zone to use for the cluster. The following format is used for cluster-related DNS records: `<record>.<cluster_name>.<dns_zone>` | - | string | true |
@@ -236,7 +235,7 @@ node_type = var.custom_default_worker_type
236235
| `worker_pool.os_arch` | Flatcar Container Linux architecture to install (amd64, arm64). | "amd64" | string | false |
237236
| `worker_pool.os_channel` | Flatcar Container Linux channel to install from (stable, beta, alpha, edge). | "stable" | string | false |
238237
| `worker_pool.os_version` | Flatcar Container Linux version to install. Version such as "2303.3.1" or "current". | "current" | string | false |
239-
| `worker_pool.node_type` | Packet instance type for worker nodes. | "baremetal_0" | string | false |
238+
| `worker_pool.node_type` | Packet instance type for worker nodes. | "c3.small.x86" | string | false |
240239
| `worker_pool.labels` | Custom labels to assign to worker nodes. | - | string | false |
241240
| `worker_pool.taints` | Taints to assign to worker nodes. | - | string | false |
242241
| `worker_pool.reservation_ids` | Block with Packet hardware reservation IDs for worker nodes. Each key must have the format `worker-${index}` and the value is the reservation UUID. Can't be combined with `reservation_ids_default`. Example: `reservation_ids = { worker-0 = "<reservation_id>" }`. | - | map(string) | false |

‎docs/quickstarts/packet.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ This guide shows how to create a Lokomotive cluster on [Packet](https://www.pack
1818
end of this guide, you'll have a basic Lokomotive cluster running on Packet with a demo application
1919
deployed.
2020

21-
The guide uses `t1.small.x86` as the Packet device type for all created nodes. This is also the
21+
The guide uses `c3.small.x86` as the Packet device type for all created nodes. This is also the
2222
default device type.
2323

24+
>NOTE: Visit the Packet [website](https://www.packet.com/cloud/servers/) to see all available device
25+
>types as well as their pricing.
26+
2427
Lokomotive runs on top of [Flatcar Container Linux](https://www.flatcar-linux.org/). This guide
2528
uses the `stable` channel.
2629

@@ -293,7 +296,7 @@ Sometimes there may not be enough hardware available at a given Packet facility
293296
type, in which case the following error is shown:
294297

295298
```
296-
The facility ams1 has no provisionable t1.small.x86 servers matching your criteria
299+
The facility ams1 has no provisionable c3.small.x86 servers matching your criteria
297300
```
298301

299302
In this case, either select a different node type and/or Packet facility, or wait for a while until

‎pkg/assets/generated_assets.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/components/cluster-autoscaler/component.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func newComponent() *component {
131131
switch c.Provider {
132132
case "packet":
133133
c.Packet = &packetConfiguration{
134-
WorkerType: "t1.small.x86",
134+
WorkerType: "c3.small.x86",
135135
WorkerChannel: "stable",
136136
}
137137
}

0 commit comments

Comments
 (0)