Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ eksctl create cluster
A cluster will be created with default parameters

- exciting auto-generated name, e.g. "fabulous-mushroom-1527688624"
- 2x `m5.large` nodes (this instance type suits most common use-cases, and is good value for money)
- 2x `t3.medium` nodes (this instance type suits most common use-cases, and is good value for money)
- use official AWS EKS AMI
- `us-west-2` region
- dedicated VPC (check your quotas)
Expand Down
12 changes: 6 additions & 6 deletions docs/proposal-003-extending-use-of-config-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ metadata:

nodeGroups:
- name: ng1-public
instanceType: m5.xlarge
instanceType: t3.large
desiredCapacity: 4
- name: ng2-private
instanceType: m5.large
instanceType: t3.medium
desiredCapacity: 10
privateNetworking: true
```
Expand All @@ -56,18 +56,18 @@ metadata:

nodeGroups:
- name: ng1-public
instanceType: m5.xlarge
instanceType: t3.large
desiredCapacity: 4
- name: ng2-private
instanceType: m5.large
instanceType: t3.medium
desiredCapacity: 10
privateNetworking: true
- name: ng3-dev
instanceType: m4.large
instanceType: t3.large
desiredCapacity: 2
privateNetworking: true
- name: ng2-test
instanceType: m5.large
instanceType: t3.medium
desiredCapacity: 4
privateNetworking: true
```
Expand Down
2 changes: 1 addition & 1 deletion docs/proposal-004_cost-estimation.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Examples:
```
[ℹ] using region eu-west-1
[ℹ] using "ami-0ce0ec06e682ee10e" for nodes
[ℹ] 2 nodes m5.large
[ℹ] 2 nodes t3.medium
[ℹ] EBS volumes 20go
[ℹ] free tier "yes"
[ℹ] usage type "utilization"
Expand Down
10 changes: 5 additions & 5 deletions pkg/apis/eksctl.io/v1alpha5/instance_selector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,27 @@ var _ = Describe("Instance Selector Validation", func() {
VCPUs: 2,
Memory: "4",
},
InstanceType: "m5.large",
InstanceType: "t3.medium",
},
},
errMsg: `instanceType should be "mixed" or unset`,
}),
Entry("invalid use of instanceSelector and instancesDistribution", &instanceSelectorCase{
ng: &NodeGroup{
NodeGroupBase: &NodeGroupBase{
InstanceType: "m5.large",
InstanceType: "t3.medium",
InstanceSelector: &InstanceSelector{},
},
InstancesDistribution: &NodeGroupInstancesDistribution{
InstanceTypes: []string{"m5.large"},
InstanceTypes: []string{"t3.medium"},
},
},
errMsg: `instanceType should be "mixed" or unset`,
}),
Entry("instancesDistribution without instanceTypes and instanceSelector", &instanceSelectorCase{
ng: &NodeGroup{
NodeGroupBase: &NodeGroupBase{
InstanceType: "m5.large",
InstanceType: "t3.medium",
InstanceSelector: &InstanceSelector{},
},
InstancesDistribution: &NodeGroupInstancesDistribution{},
Expand All @@ -79,7 +79,7 @@ var _ = Describe("Instance Selector Validation", func() {
},
},
InstancesDistribution: &NodeGroupInstancesDistribution{
InstanceTypes: []string{"m5.large"},
InstanceTypes: []string{"t3.medium"},
},
},
}),
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/eksctl.io/v1alpha5/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ const (

const (
// DefaultNodeType is the default instance type to use for nodes
DefaultNodeType = "m5.large"
DefaultNodeType = "t3.medium"

// DefaultNodeCount defines the default number of nodes to be created
DefaultNodeCount = 2
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ var _ = Describe("Cluster Template Builder", func() {
}
cfg.Outpost = &api.Outpost{
ControlPlaneOutpostARN: "arn:aws:outposts:us-west-2:1234:outpost/op-1234",
ControlPlaneInstanceType: "m5.large",
ControlPlaneInstanceType: "t3.medium",
}

var output *ec2.DescribeVpcEndpointServicesOutput
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/managed_nodegroup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ func TestManagedNodeGroupNodeRepairConfig(t *testing.T) {
ng := &api.ManagedNodeGroup{
NodeGroupBase: &api.NodeGroupBase{
Name: "test-ng",
InstanceType: "m5.large",
InstanceType: "t3.medium",
},
NodeRepairConfig: tt.nodeRepairConfig,
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/cfn/builder/network_interfaces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestBuildNetworkInterfaces(t *testing.T) {
}{
{
name: "non-EFA nodegroup",
instanceTypes: []string{"m5.large"},
instanceTypes: []string{"t3.medium"},
efaEnabled: false,
securityGroups: []*gfnt.Value{
gfnt.NewString("sg-12345"),
Expand Down Expand Up @@ -106,7 +106,7 @@ func TestBuildNetworkInterfaces(t *testing.T) {
},
{
name: "EFA nodegroup with non-EFA instance type",
instanceTypes: []string{"m5.large"},
instanceTypes: []string{"t3.medium"},
efaEnabled: true,
securityGroups: []*gfnt.Value{
gfnt.NewString("sg-12345"),
Expand All @@ -120,7 +120,7 @@ func TestBuildNetworkInterfaces(t *testing.T) {
},
},
},
expectedError: "instance type m5.large does not support EFA",
expectedError: "instance type t3.medium does not support EFA",
},
{
name: "EFA nodegroup with default security groups (1.33+ scenario)",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/nodegroup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ var _ = Describe("Unmanaged NodeGroup Template Builder", func() {
Expect(properties.LaunchTemplateData.IamInstanceProfile.Arn).To(Equal(makeIamInstanceProfileRef()))
Expect(properties.LaunchTemplateData.ImageID).To(Equal("ami-123"))
Expect(properties.LaunchTemplateData.UserData).To(Equal("lovely data right here"))
Expect(properties.LaunchTemplateData.InstanceType).To(Equal("m5.large"))
Expect(properties.LaunchTemplateData.InstanceType).To(Equal("t3.medium"))
Expect(properties.LaunchTemplateData.MetadataOptions.HTTPPutResponseHopLimit).To(Equal(float64(2)))
Expect(properties.LaunchTemplateData.MetadataOptions.HTTPTokens).To(Equal("required"))
Expect(properties.LaunchTemplateData.TagSpecifications).To(HaveLen(3))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"AmiType": "AL2023_x86_64_STANDARD",
"ClusterName": "lt",
"InstanceTypes": [
"m5.large"
"t3.medium"
],
"Labels": {
"alpha.eksctl.io/cluster-name": "lt",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"AmiType": "AL2023_x86_64_STANDARD",
"ClusterName": "lt",
"InstanceTypes": [
"m5.large"
"t3.medium"
],
"Labels": {
"alpha.eksctl.io/cluster-name": "lt",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/testdata/launch_template/ssh_disabled.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"alpha.eksctl.io/cluster-name": "lt",
"alpha.eksctl.io/nodegroup-name": "ssh-disabled"
},
"InstanceTypes": ["m5.large"],
"InstanceTypes": ["t3.medium"],
"NodeRole": {
"Fn::GetAtt": [
"NodeInstanceRole",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/builder/testdata/launch_template/ssh_enabled.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"alpha.eksctl.io/cluster-name": "lt",
"alpha.eksctl.io/nodegroup-name": "ssh-enabled"
},
"InstanceTypes": ["m5.large"],
"InstanceTypes": ["t3.medium"],
"NodeRole": {
"Fn::GetAtt": [
"NodeInstanceRole",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cfn/template/testdata/nodegroup-example-1.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
}
},
"ImageId": "ami-09729f03d2b24317c",
"InstanceType": "m5.large",
"InstanceType": "t3.medium",
"KeyName": "eksctl-test-nodegroup-n5-bd:d8:ab:d8:3a:09:95:22:91:61:9f:1c:92:b5:dc:2e",
"MetadataOptions": {
"HttpPutResponseHopLimit": 2,
Expand Down
8 changes: 4 additions & 4 deletions pkg/ctl/cmdutils/filter/nodegroup_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ const expected = `
{
"name": "test-ng1a",
"amiFamily": "AmazonLinux2023",
"instanceType": "m5.large",
"instanceType": "t3.medium",
"privateNetworking": false,
"securityGroups": {
"withShared": true,
Expand Down Expand Up @@ -424,7 +424,7 @@ const expected = `
{
"name": "test-ng2a",
"amiFamily": "AmazonLinux2023",
"instanceType": "m5.large",
"instanceType": "t3.medium",
"privateNetworking": false,
"securityGroups": {
"withShared": true,
Expand Down Expand Up @@ -515,7 +515,7 @@ const expected = `
{
"name": "test-ng1b",
"amiFamily": "AmazonLinux2023",
"instanceType": "m5.large",
"instanceType": "t3.medium",
"privateNetworking": false,
"securityGroups": {
"withShared": true,
Expand Down Expand Up @@ -609,7 +609,7 @@ const expected = `
{
"name": "test-ng3b",
"amiFamily": "AmazonLinux2023",
"instanceType": "m5.large",
"instanceType": "t3.medium",
"privateNetworking": false,
"securityGroups": {
"attachIDs": [
Expand Down
4 changes: 2 additions & 2 deletions pkg/ctl/create/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ var _ = Describe("create cluster", func() {
Entry("with authenticator-role-arn flag", "--authenticator-role-arn", "arn::dummy::123/role"),
Entry("with auto-kubeconfig flag", "--auto-kubeconfig"),
// common node group flags
Entry("with node-type flag", "--node-type", "m5.large"),
Entry("with node-type flag", "--node-type", "t3.medium"),
Entry("with nodes flag", "--nodes", "2"),
Entry("with nodes-min flag", "--nodes-min", "2"),
Entry("with nodes-max flag", "--nodes-max", "2"),
Expand Down Expand Up @@ -180,7 +180,7 @@ var _ = Describe("create cluster", func() {
Entry("with authenticator-role-arn flag", "--authenticator-role-arn", "arn::dummy::123/role"),
Entry("with auto-kubeconfig flag", "--auto-kubeconfig"),
// common node group flags
Entry("with node-type flag", "--node-type", "m5.large"),
Entry("with node-type flag", "--node-type", "t3.medium"),
Entry("with nodes flag", "--nodes", "2"),
Entry("with nodes-min flag", "--nodes-min", "2"),
Entry("with nodes-max flag", "--nodes-max", "2"),
Expand Down
4 changes: 2 additions & 2 deletions pkg/ctl/create/nodegroup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var _ = Describe("create nodegroup", func() {
Entry("with nodegroup name with a hyphen as flag", "--name", "nodegroup-name"),
Entry("with nodegroup name as argument", "nodegroupName"),
Entry("with nodegroup name with a hyphen as argument", "nodegroup-name"),
Entry("with node-type flag", "--node-type", "m5.large"),
Entry("with node-type flag", "--node-type", "t3.medium"),
Entry("with nodes flag", "--nodes", "2"),
Entry("with nodes-min flag", "--nodes-min", "2"),
Entry("with nodes-max flag", "--nodes-max", "2"),
Expand Down Expand Up @@ -121,7 +121,7 @@ var _ = Describe("create nodegroup", func() {
Entry("with nodegroup name with a hyphen as flag", "--name", "nodegroup-name"),
Entry("with nodegroup name as argument", "nodegroupName"),
Entry("with nodegroup name with a hyphen as argument", "nodegroup-name"),
Entry("with node-type flag", "--node-type", "m5.large"),
Entry("with node-type flag", "--node-type", "t3.medium"),
Entry("with nodes flag", "--nodes", "2"),
Entry("with nodes-min flag", "--nodes-min", "2"),
Entry("with nodes-max flag", "--nodes-max", "2"),
Expand Down
4 changes: 2 additions & 2 deletions pkg/eks/instance_selector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ var _ = Describe("Instance Selector", func() {
VCPUs: 2,
Memory: "4",
},
createFakeInstanceSelector: makeInstanceSelector("m5.large", "m5.xlarge"),
expectedInstanceTypes: []string{"m5.large", "m5.xlarge"},
createFakeInstanceSelector: makeInstanceSelector("t3.medium", "t3.large"),
expectedInstanceTypes: []string{"t3.medium", "t3.large"},
}),

Entry("mismatching instanceTypes and instance selector criteria for unmanaged nodegroup", instanceSelectorCase{
Expand Down
2 changes: 1 addition & 1 deletion pkg/eks/testdata/bad-field-1.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"region": "eu-north-1"
},
"nodeGroups": [
{ "name": "ng-1", "instanceType": "m5.large", "nodes": 10 }
{ "name": "ng-1", "instanceType": "t3.medium", "nodes": 10 }
]
}
2 changes: 1 addition & 1 deletion pkg/eks/testdata/example.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"region": "eu-north-1"
},
"nodeGroups": [
{ "name": "ng-1", "instanceType": "m5.large", "desiredCapacity": 10 }
{ "name": "ng-1", "instanceType": "t3.medium", "desiredCapacity": 10 }
]
}
2 changes: 1 addition & 1 deletion pkg/eks/testdata/old-version.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"region": "eu-north-1"
},
"nodeGroups": [
{ "name": "ng-1", "instanceType": "m5.large", "desiredCapacity": 10 }
{ "name": "ng-1", "instanceType": "t3.medium", "desiredCapacity": 10 }
]
}
2 changes: 1 addition & 1 deletion pkg/utils/kubeconfig/kubeconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ var _ = Describe("Kubeconfig", func() {
NodeGroups: []*eksctlapi.NodeGroup{
{
NodeGroupBase: &eksctlapi.NodeGroupBase{
InstanceType: "m5.large",
InstanceType: "t3.medium",
AvailabilityZones: []string{"us-west-2b", "us-west-2a", "us-west-2c"},
PrivateNetworking: false,
SSH: &eksctlapi.NodeGroupSSH{
Expand Down
6 changes: 3 additions & 3 deletions userdocs/src/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ contributions from the community.
A cluster will be created with default parameters:

- exciting auto-generated name, e.g., `fabulous-mushroom-1527688624`
- two `m5.large` worker nodes (this instance type suits most common use-cases, and is good value for money)
- two `t3.medium` worker nodes (this instance type suits most common use-cases, and is good value for money)
- use the official AWS [EKS AMI](https://github.com/awslabs/amazon-eks-ami)
- `us-west-2` region
- a dedicated VPC (check your quotas)
Expand Down Expand Up @@ -88,10 +88,10 @@ metadata:

nodeGroups:
- name: ng-1
instanceType: m5.large
instanceType: t3.medium
desiredCapacity: 10
- name: ng-2
instanceType: m5.xlarge
instanceType: t3.large
desiredCapacity: 2
```

Expand Down
2 changes: 1 addition & 1 deletion userdocs/src/usage/cloudwatch-cluster-logging.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ metadata:

nodeGroups:
- name: ng-1
instanceType: m5.large
instanceType: t3.medium
desiredCapacity: 1

cloudWatch:
Expand Down
2 changes: 1 addition & 1 deletion userdocs/src/usage/container-runtime.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The `overrideBootstrapCommand` option requires that you specify an AMI for the m
managedNodeGroups:
- name: m-ng-1
ami: ami-XXXXXXXXXXXXXX
instanceType: m5.large
instanceType: t3.medium
overrideBootstrapCommand: |
#!/bin/bash
/etc/eks/bootstrap.sh <cluster-name> <other flags> --container-runtime containerd
Expand Down
6 changes: 3 additions & 3 deletions userdocs/src/usage/creating-and-managing-clusters.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ eksctl create cluster
```

That will create an EKS cluster in your default region (as specified by your AWS CLI configuration) with one managed
nodegroup containing two m5.large nodes.
nodegroup containing two t3.medium nodes.

???+ note
eksctl now creates a managed nodegroup by default when a config file isn't used. To create a self-managed nodegroup,
Expand Down Expand Up @@ -47,13 +47,13 @@ metadata:

nodeGroups:
- name: ng-1
instanceType: m5.large
instanceType: t3.medium
desiredCapacity: 10
volumeSize: 80
ssh:
allow: true # will use ~/.ssh/id_rsa.pub as the default ssh key
- name: ng-2
instanceType: m5.xlarge
instanceType: t3.large
desiredCapacity: 2
volumeSize: 100
ssh:
Expand Down
Loading