diff --git a/README.md b/README.md index 336c5425a5..3ff34cdd21 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/docs/proposal-003-extending-use-of-config-file.md b/docs/proposal-003-extending-use-of-config-file.md index 58dbfbb090..dca161d49b 100644 --- a/docs/proposal-003-extending-use-of-config-file.md +++ b/docs/proposal-003-extending-use-of-config-file.md @@ -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 ``` @@ -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 ``` diff --git a/docs/proposal-004_cost-estimation.md b/docs/proposal-004_cost-estimation.md index 718d801144..cb587539be 100644 --- a/docs/proposal-004_cost-estimation.md +++ b/docs/proposal-004_cost-estimation.md @@ -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" diff --git a/pkg/apis/eksctl.io/v1alpha5/instance_selector_test.go b/pkg/apis/eksctl.io/v1alpha5/instance_selector_test.go index 8a21cb17ec..624ab947b0 100644 --- a/pkg/apis/eksctl.io/v1alpha5/instance_selector_test.go +++ b/pkg/apis/eksctl.io/v1alpha5/instance_selector_test.go @@ -43,7 +43,7 @@ var _ = Describe("Instance Selector Validation", func() { VCPUs: 2, Memory: "4", }, - InstanceType: "m5.large", + InstanceType: "t3.medium", }, }, errMsg: `instanceType should be "mixed" or unset`, @@ -51,11 +51,11 @@ var _ = Describe("Instance Selector Validation", func() { 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`, @@ -63,7 +63,7 @@ var _ = Describe("Instance Selector Validation", func() { Entry("instancesDistribution without instanceTypes and instanceSelector", &instanceSelectorCase{ ng: &NodeGroup{ NodeGroupBase: &NodeGroupBase{ - InstanceType: "m5.large", + InstanceType: "t3.medium", InstanceSelector: &InstanceSelector{}, }, InstancesDistribution: &NodeGroupInstancesDistribution{}, @@ -79,7 +79,7 @@ var _ = Describe("Instance Selector Validation", func() { }, }, InstancesDistribution: &NodeGroupInstancesDistribution{ - InstanceTypes: []string{"m5.large"}, + InstanceTypes: []string{"t3.medium"}, }, }, }), diff --git a/pkg/apis/eksctl.io/v1alpha5/types.go b/pkg/apis/eksctl.io/v1alpha5/types.go index e5b7576595..8ab479ede5 100644 --- a/pkg/apis/eksctl.io/v1alpha5/types.go +++ b/pkg/apis/eksctl.io/v1alpha5/types.go @@ -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 diff --git a/pkg/cfn/builder/cluster_test.go b/pkg/cfn/builder/cluster_test.go index 82d904d546..9908d2f50c 100644 --- a/pkg/cfn/builder/cluster_test.go +++ b/pkg/cfn/builder/cluster_test.go @@ -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 diff --git a/pkg/cfn/builder/managed_nodegroup_test.go b/pkg/cfn/builder/managed_nodegroup_test.go index 66f1b2733d..c25ff74c98 100644 --- a/pkg/cfn/builder/managed_nodegroup_test.go +++ b/pkg/cfn/builder/managed_nodegroup_test.go @@ -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, } diff --git a/pkg/cfn/builder/network_interfaces_test.go b/pkg/cfn/builder/network_interfaces_test.go index fa2a791c25..f5c36139d8 100644 --- a/pkg/cfn/builder/network_interfaces_test.go +++ b/pkg/cfn/builder/network_interfaces_test.go @@ -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"), @@ -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"), @@ -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)", diff --git a/pkg/cfn/builder/nodegroup_test.go b/pkg/cfn/builder/nodegroup_test.go index df8f244bb3..b2dd4b548f 100644 --- a/pkg/cfn/builder/nodegroup_test.go +++ b/pkg/cfn/builder/nodegroup_test.go @@ -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)) diff --git a/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes.json b/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes.json index 31addf610a..74dbe1f31b 100644 --- a/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes.json +++ b/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes.json @@ -99,7 +99,7 @@ "AmiType": "AL2023_x86_64_STANDARD", "ClusterName": "lt", "InstanceTypes": [ - "m5.large" + "t3.medium" ], "Labels": { "alpha.eksctl.io/cluster-name": "lt", diff --git a/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes_missing_size.json b/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes_missing_size.json index 1fadb4efba..43bb9b3c6a 100644 --- a/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes_missing_size.json +++ b/pkg/cfn/builder/testdata/launch_template/launch_template_additional_volumes_missing_size.json @@ -98,7 +98,7 @@ "AmiType": "AL2023_x86_64_STANDARD", "ClusterName": "lt", "InstanceTypes": [ - "m5.large" + "t3.medium" ], "Labels": { "alpha.eksctl.io/cluster-name": "lt", diff --git a/pkg/cfn/builder/testdata/launch_template/ssh_disabled.json b/pkg/cfn/builder/testdata/launch_template/ssh_disabled.json index bc70c2d00f..a0357aabcd 100644 --- a/pkg/cfn/builder/testdata/launch_template/ssh_disabled.json +++ b/pkg/cfn/builder/testdata/launch_template/ssh_disabled.json @@ -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", diff --git a/pkg/cfn/builder/testdata/launch_template/ssh_enabled.json b/pkg/cfn/builder/testdata/launch_template/ssh_enabled.json index bdcbb301cc..ec053084cc 100644 --- a/pkg/cfn/builder/testdata/launch_template/ssh_enabled.json +++ b/pkg/cfn/builder/testdata/launch_template/ssh_enabled.json @@ -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", diff --git a/pkg/cfn/template/testdata/nodegroup-example-1.json b/pkg/cfn/template/testdata/nodegroup-example-1.json index 09269cb7d9..37517e34a8 100644 --- a/pkg/cfn/template/testdata/nodegroup-example-1.json +++ b/pkg/cfn/template/testdata/nodegroup-example-1.json @@ -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, diff --git a/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go b/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go index 6131f4c1a9..d6ae7e660f 100644 --- a/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go +++ b/pkg/ctl/cmdutils/filter/nodegroup_filter_test.go @@ -378,7 +378,7 @@ const expected = ` { "name": "test-ng1a", "amiFamily": "AmazonLinux2023", - "instanceType": "m5.large", + "instanceType": "t3.medium", "privateNetworking": false, "securityGroups": { "withShared": true, @@ -424,7 +424,7 @@ const expected = ` { "name": "test-ng2a", "amiFamily": "AmazonLinux2023", - "instanceType": "m5.large", + "instanceType": "t3.medium", "privateNetworking": false, "securityGroups": { "withShared": true, @@ -515,7 +515,7 @@ const expected = ` { "name": "test-ng1b", "amiFamily": "AmazonLinux2023", - "instanceType": "m5.large", + "instanceType": "t3.medium", "privateNetworking": false, "securityGroups": { "withShared": true, @@ -609,7 +609,7 @@ const expected = ` { "name": "test-ng3b", "amiFamily": "AmazonLinux2023", - "instanceType": "m5.large", + "instanceType": "t3.medium", "privateNetworking": false, "securityGroups": { "attachIDs": [ diff --git a/pkg/ctl/create/cluster_test.go b/pkg/ctl/create/cluster_test.go index 7c52388537..6e9ba6098c 100644 --- a/pkg/ctl/create/cluster_test.go +++ b/pkg/ctl/create/cluster_test.go @@ -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"), @@ -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"), diff --git a/pkg/ctl/create/nodegroup_test.go b/pkg/ctl/create/nodegroup_test.go index 947c9c1824..709f32b65f 100644 --- a/pkg/ctl/create/nodegroup_test.go +++ b/pkg/ctl/create/nodegroup_test.go @@ -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"), @@ -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"), diff --git a/pkg/eks/instance_selector_test.go b/pkg/eks/instance_selector_test.go index bad50cc6ce..574b8bc8d5 100644 --- a/pkg/eks/instance_selector_test.go +++ b/pkg/eks/instance_selector_test.go @@ -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{ diff --git a/pkg/eks/testdata/bad-field-1.json b/pkg/eks/testdata/bad-field-1.json index d717554e6b..0a9c0714b5 100644 --- a/pkg/eks/testdata/bad-field-1.json +++ b/pkg/eks/testdata/bad-field-1.json @@ -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 } ] } diff --git a/pkg/eks/testdata/example.json b/pkg/eks/testdata/example.json index 3f42f88360..25f48fe18f 100644 --- a/pkg/eks/testdata/example.json +++ b/pkg/eks/testdata/example.json @@ -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 } ] } diff --git a/pkg/eks/testdata/old-version.json b/pkg/eks/testdata/old-version.json index 847ed45242..ba8d9b84cc 100644 --- a/pkg/eks/testdata/old-version.json +++ b/pkg/eks/testdata/old-version.json @@ -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 } ] } diff --git a/pkg/utils/kubeconfig/kubeconfig_test.go b/pkg/utils/kubeconfig/kubeconfig_test.go index 2f29c20fe0..2d7e6c3a79 100644 --- a/pkg/utils/kubeconfig/kubeconfig_test.go +++ b/pkg/utils/kubeconfig/kubeconfig_test.go @@ -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{ diff --git a/userdocs/src/getting-started.md b/userdocs/src/getting-started.md index fa46d8a8cc..68170c4d51 100644 --- a/userdocs/src/getting-started.md +++ b/userdocs/src/getting-started.md @@ -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) @@ -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 ``` diff --git a/userdocs/src/usage/cloudwatch-cluster-logging.md b/userdocs/src/usage/cloudwatch-cluster-logging.md index eef44a80f4..fdf8ad38a0 100644 --- a/userdocs/src/usage/cloudwatch-cluster-logging.md +++ b/userdocs/src/usage/cloudwatch-cluster-logging.md @@ -112,7 +112,7 @@ metadata: nodeGroups: - name: ng-1 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 1 cloudWatch: diff --git a/userdocs/src/usage/container-runtime.md b/userdocs/src/usage/container-runtime.md index 1d07cd4251..392104131d 100644 --- a/userdocs/src/usage/container-runtime.md +++ b/userdocs/src/usage/container-runtime.md @@ -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 --container-runtime containerd diff --git a/userdocs/src/usage/creating-and-managing-clusters.md b/userdocs/src/usage/creating-and-managing-clusters.md index b7032e48d6..fa6fdf890d 100644 --- a/userdocs/src/usage/creating-and-managing-clusters.md +++ b/userdocs/src/usage/creating-and-managing-clusters.md @@ -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, @@ -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: diff --git a/userdocs/src/usage/custom-ami-support.md b/userdocs/src/usage/custom-ami-support.md index c2603ebeed..55fcab7d90 100644 --- a/userdocs/src/usage/custom-ami-support.md +++ b/userdocs/src/usage/custom-ami-support.md @@ -34,14 +34,14 @@ nodeGroups: amiFamily: AmazonLinux2 ami: auto - name: ng2 - instanceType: m5.large + instanceType: t3.medium amiFamily: AmazonLinux2 ami: ami-custom1234 managedNodeGroups: - name: m-ng-2 amiFamily: AmazonLinux2 ami: ami-custom1234 - instanceType: m5.large + instanceType: t3.medium overrideBootstrapCommand: | #!/bin/bash /etc/eks/bootstrap.sh @@ -78,11 +78,11 @@ Config file example: ```yaml nodeGroups: - name: ng1 - instanceType: m5.large + instanceType: t3.medium amiFamily: AmazonLinux2 managedNodeGroups: - name: m-ng-2 - instanceType: m5.large + instanceType: t3.medium amiFamily: Ubuntu2204 ``` diff --git a/userdocs/src/usage/dry-run.md b/userdocs/src/usage/dry-run.md index 7ad337e681..ed38d5a5f7 100644 --- a/userdocs/src/usage/dry-run.md +++ b/userdocs/src/usage/dry-run.md @@ -38,7 +38,7 @@ managedNodeGroups: imageBuilder: false xRay: false instanceSelector: {} - instanceType: m5.large + instanceType: t3.medium labels: alpha.eksctl.io/cluster-name: development alpha.eksctl.io/nodegroup-name: ng-4aba8a47 diff --git a/userdocs/src/usage/eks-private-cluster.md b/userdocs/src/usage/eks-private-cluster.md index 3cef132f57..0e3dc877e4 100644 --- a/userdocs/src/usage/eks-private-cluster.md +++ b/userdocs/src/usage/eks-private-cluster.md @@ -81,7 +81,7 @@ explicitly set. It is an error to leave `privateNetworking` unset in a fully-pri ```yaml nodeGroups: - name: ng1 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 2 # privateNetworking must be explicitly set for a fully-private cluster # Rather than defaulting this field to `true`, @@ -91,7 +91,7 @@ nodeGroups: managedNodeGroups: - name: m1 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 2 privateNetworking: true ``` @@ -135,7 +135,7 @@ vpc: nodeGroups: - name: ng1 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 2 # privateNetworking must be explicitly set for a fully-private cluster # Rather than defaulting this field to true for a fully-private cluster, we require users to explicitly set it @@ -144,7 +144,7 @@ nodeGroups: managedNodeGroups: - name: m1 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 2 privateNetworking: true ``` diff --git a/userdocs/src/usage/fargate-support.md b/userdocs/src/usage/fargate-support.md index 582228cc4c..958fb03914 100644 --- a/userdocs/src/usage/fargate-support.md +++ b/userdocs/src/usage/fargate-support.md @@ -80,7 +80,7 @@ To learn more about selectors see [Designing Fargate profiles](#designing-fargat ## Creating a cluster with Fargate support using a config file -The following config file declares an EKS cluster with both a nodegroup composed of one EC2 `m5.large` instance and two +The following config file declares an EKS cluster with both a nodegroup composed of one EC2 `t3.medium` instance and two Fargate profiles. All pods defined in the `default` and `kube-system` namespaces will run on Fargate. All pods in the `dev` namespace that also have the label `dev=passed` will also run on Fargate. Any other pods will be scheduled on the node in `ng-1`. @@ -97,7 +97,7 @@ metadata: nodeGroups: - name: ng-1 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 1 fargateProfiles: diff --git a/userdocs/src/usage/iam-identity-mappings.md b/userdocs/src/usage/iam-identity-mappings.md index ab5b6699d8..7039e871b6 100644 --- a/userdocs/src/usage/iam-identity-mappings.md +++ b/userdocs/src/usage/iam-identity-mappings.md @@ -50,7 +50,7 @@ iamIdentityMappings: nodeGroups: - name: ng-1 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 1 ``` diff --git a/userdocs/src/usage/iam-policies.md b/userdocs/src/usage/iam-policies.md index b5135afd43..230849edd8 100644 --- a/userdocs/src/usage/iam-policies.md +++ b/userdocs/src/usage/iam-policies.md @@ -52,7 +52,7 @@ metadata: nodeGroups: - name: ng2-private - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 1 iam: instanceProfileARN: "arn:aws:iam::123:instance-profile/eksctl-test-cluster-a-3-nodegroup-ng2-private-NodeInstanceProfile-Y4YKHLNINMXC" diff --git a/userdocs/src/usage/nodegroup-node-repair-config.md b/userdocs/src/usage/nodegroup-node-repair-config.md index da2d592dbf..cb15de8f17 100644 --- a/userdocs/src/usage/nodegroup-node-repair-config.md +++ b/userdocs/src/usage/nodegroup-node-repair-config.md @@ -144,7 +144,7 @@ metadata: managedNodeGroups: - name: basic-ng - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 3 nodeRepairConfig: enabled: true diff --git a/userdocs/src/usage/nodegroup-with-custom-subnet.md b/userdocs/src/usage/nodegroup-with-custom-subnet.md index 1115297a9e..3ac7a2dc19 100644 --- a/userdocs/src/usage/nodegroup-with-custom-subnet.md +++ b/userdocs/src/usage/nodegroup-with-custom-subnet.md @@ -60,7 +60,7 @@ metadata: nodeGroups: - name: new-subnet-nodegroup - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 1 subnets: - subnet-id1 diff --git a/userdocs/src/usage/nodegroups.md b/userdocs/src/usage/nodegroups.md index becaed4965..7af5de6fab 100644 --- a/userdocs/src/usage/nodegroups.md +++ b/userdocs/src/usage/nodegroups.md @@ -255,22 +255,22 @@ nodegroup configuration. Alternatively you can use [AWS Systems Manager (SSM)](h ```yaml managedNodeGroups: - name: ng-1 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 1 ssh: # import public key from file publicKeyPath: ~/.ssh/id_rsa_tests.pub - name: ng-2 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 1 ssh: # use existing EC2 key publicKeyName: ec2_dev_key - name: ng-3 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 1 ssh: # import inline public key publicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqZEdzvHnK/GVP8nLngRHu/GDi/3PeES7+Bx6l3koXn/Oi/UmM9/jcW5XGziZ/oe1cPJ777eZV7muEvXg5ZMQBrYxUtYCdvd8Rt6DIoSqDLsIPqbuuNlQoBHq/PU2IjpWnp/wrJQXMk94IIrGjY8QHfCnpuMENCucVaifgAhwyeyuO5KiqUmD8E0RmcsotHKBV9X8H5eqLXd8zMQaPl+Ub7j5PG+9KftQu0F/QhdFvpSLsHaxvBzA5nhIltjkaFcwGQnD1rpCM3+UnQE7Izoa5Yt1xoUWRwnF+L2TKovW7+bYQ1kxsuuiX149jXTCJDVjkYCqi7HkrXYqcC1sbsror someuser@hostname" - name: ng-4 - instanceType: m5.large + instanceType: t3.medium desiredCapacity: 1 ssh: # enable SSH using SSM enableSsm: true diff --git a/userdocs/src/usage/spot-instances.md b/userdocs/src/usage/spot-instances.md index e340b03228..2a1ac2c998 100644 --- a/userdocs/src/usage/spot-instances.md +++ b/userdocs/src/usage/spot-instances.md @@ -39,7 +39,7 @@ managedNodeGroups: spot: true -# `instanceTypes` defaults to [`m5.large`] +# `instanceTypes` defaults to [`t3.medium`] - name: spot-2 spot: true diff --git a/userdocs/theme/home.html b/userdocs/theme/home.html index 2461b311a5..e45c870209 100644 --- a/userdocs/theme/home.html +++ b/userdocs/theme/home.html @@ -517,7 +517,7 @@

eksctl create cluster

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
  • us-west-2 region
  • a dedicated VPC (check your quotas)