Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EKS 1.21 upgrade #163

Closed
wants to merge 47 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d3ff099
Removed i3s, added AWS Instance Selector, Cloud9
jagpk Dec 12, 2020
8f2879e
capacity-optimized and 15 instance types
jagpk Dec 12, 2020
a795e42
Updated to reflect latest cosole changes
jagpk Dec 12, 2020
47ffa07
Merge branch 'master' of https://github.com/awslabs/ec2-spot-workshop…
jagpk Dec 12, 2020
2c739a9
Cloud9 Console Link
jagpk Dec 12, 2020
55eb74d
Cloud9 Images
jagpk Dec 12, 2020
7686f4f
Removed SIA Image
jagpk Dec 12, 2020
c44daf8
Cloud9
jagpk Dec 12, 2020
ab761cd
Cloud9
jagpk Dec 12, 2020
7bb1866
Savings Summary - 32 Task Spot Unit
jagpk Dec 12, 2020
2edf4a4
Removed Warning on old Spot limits
jagpk Dec 14, 2020
a936e93
Updated to 32 instances to support 4xl
jagpk Dec 14, 2020
6a917a2
Cloud9
jagpk Dec 14, 2020
4a695ad
Merge pull request #6 from jagpk/EMR-AllocationStrategies
jagpk Dec 15, 2020
9a6ab2f
PR Review
jagpk Jan 6, 2021
c2cff29
PR Review
jagpk Jan 7, 2021
91206f2
Spell Check
jagpk Jan 7, 2021
3d0aa2f
Merge pull request #7 from jagpk/EMR-AllocationStrategies
jagpk Jan 7, 2021
3348317
Format Fix
jagpk Jan 7, 2021
5b260d5
Merge pull request #8 from jagpk/EMR-AllocationStrategies
jagpk Jan 7, 2021
96a8e63
Format Changes
jagpk Jan 7, 2021
4c92a7c
Merge pull request #9 from jagpk/EMR-AllocationStrategies
jagpk Jan 7, 2021
7d6ffff
Format Changes
jagpk Jan 7, 2021
ef49d05
Format Changes
jagpk Jan 7, 2021
9ce6ece
Format Changes, replacing "\" with " "
jagpk Jan 8, 2021
5af0ebf
Merge pull request #10 from jagpk/EMR-AllocationStrategies
jagpk Jan 8, 2021
a8f97f7
Merge branch 'master' of https://github.com/awslabs/ec2-spot-workshop…
jagpk Jun 24, 2021
e28192e
Matching Index to Folder Name
jagpk Oct 5, 2021
8bc8533
Matching Index to Folder Name
jagpk Oct 5, 2021
ec87edd
Updaing folder names in all references
jagpk Oct 5, 2021
c7fd59b
Matching folder names to references
jagpk Oct 5, 2021
357855f
Updated HELM to K8S Tools
jagpk Oct 5, 2021
3d3ed01
Corrected to EKS managed node groups with Spot capacity
jagpk Oct 5, 2021
43f1b17
Corrected EKS Managed Node Groups Folder
jagpk Oct 5, 2021
fc70609
Renamed to EKS MNG with Spot
jagpk Oct 5, 2021
04d3c5b
Moved Self Managed to later
jagpk Oct 6, 2021
c780ec6
Image URL corrections
jagpk Oct 6, 2021
61f826e
Corrected Images URL
jagpk Oct 6, 2021
860a7a5
Cloud9 Updates
jagpk Oct 7, 2021
cdabf90
EKS cluster fixes
jagpk Oct 9, 2021
366dac7
Merge branch 'master' of https://github.com/jagpk/ec2-spot-workshops …
jagpk Oct 12, 2021
ab78de7
Updated Cluster Autoscaler to 1.21
jagpk Oct 12, 2021
d4c82bb
Self Managed Node Groups
jagpk Oct 13, 2021
55e3597
EKS MNGs
jagpk Oct 13, 2021
5184846
EKS Cluster Template
jagpk Oct 14, 2021
60d2f7b
Upgrade to EKS 1.21
jagpk Oct 21, 2021
2352146
EKS 1.21 upgrade
jagpk Oct 21, 2021
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
Prev Previous commit
Next Next commit
EKS MNGs
jagpk committed Oct 13, 2021
commit 55e35976474c8001ef448b14c69463bab3ae8027
Original file line number Diff line number Diff line change
@@ -24,16 +24,16 @@ metadata:
managedNodeGroups:
- amiFamily: AmazonLinux2
instanceType: m5.large
name: ng-od-m5large
name: mng-od-m5large
desiredCapacity: 2
maxSize: 2
minSize: 0
labels:
alpha.eksctl.io/cluster-name: eksworkshop-eksctl
alpha.eksctl.io/nodegroup-name: ng-od-m5large
alpha.eksctl.io/nodegroup-name: mng-od-m5large
intent: control-apps
tags:
alpha.eksctl.io/nodegroup-name: ng-od-m5large
alpha.eksctl.io/nodegroup-name: mng-od-m5large
alpha.eksctl.io/nodegroup-type: managed
k8s.io/cluster-autoscaler/node-template/label/intent: control-apps
ssh:

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ In this section we will deploy the instance types we selected and request nodegr
Let's first create the configuration file:

```bash
cat << EOF > addnodegroups-spot.yaml
cat << EOF > add-mngs-spot.yaml
---
apiVersion: eksctl.io/v1alpha5
kind: ClusterConfig
managedNodeGroups:
- name: ng-spot-4vcpu-16gb
- name: mng-spot-4vcpu-16gb
amiFamily: AmazonLinux2
desiredCapacity: 2
minSize: 0
@@ -38,13 +38,13 @@ managedNodeGroups:
privateNetworking: true
labels:
alpha.eksctl.io/cluster-name: eksworkshop-eksctl
alpha.eksctl.io/nodegroup-name: ng-spot-4vcpu-16gb
alpha.eksctl.io/nodegroup-name: mng-spot-4vcpu-16gb
intent: apps
tags:
alpha.eksctl.io/nodegroup-name: ng-spot-4vcpu-16gb
alpha.eksctl.io/nodegroup-name: mng-spot-4vcpu-16gb
alpha.eksctl.io/nodegroup-type: managed
- name: ng-spot-8vcpu-32gb
- name: mng-spot-8vcpu-32gb
amiFamily: AmazonLinux2
desiredCapacity: 2
minSize: 0
@@ -67,10 +67,10 @@ managedNodeGroups:
privateNetworking: true
labels:
alpha.eksctl.io/cluster-name: eksworkshop-eksctl
alpha.eksctl.io/nodegroup-name: ng-spot-8vcpu-32gb
alpha.eksctl.io/nodegroup-name: mng-spot-8vcpu-32gb
intent: apps
tags:
alpha.eksctl.io/nodegroup-name: ng-spot-8vcpu-32gb
alpha.eksctl.io/nodegroup-name: mng-spot-8vcpu-32gb
alpha.eksctl.io/nodegroup-type: managed
metadata:
@@ -85,7 +85,7 @@ EOF
Create the new EKS managed nodegroup with Spot Instances.

```sh
eksctl create nodegroup --config-file=addnodegroups-spot.yaml
eksctl create nodegroup --config-file=add-mngs-spot.yaml
```
{{% notice info %}}
Creation of node group will take 3-4 minutes.
Original file line number Diff line number Diff line change
@@ -9,14 +9,14 @@ In this section we will deploy the instance types we selected and request nodegr

Let's first create the configuration file:
```
cat <<EoF > ~/environment/spot_nodegroups.yml
cat <<EoF > ~/environment/add-ngs-spot.yaml
apiVersion: eksctl.io/v1alpha5
kind: ClusterConfig
metadata:
name: eksworkshop-eksctl
region: $AWS_REGION
nodeGroups:
- name: dev-4vcpu-16gb-spot
- name: ng-spot-4vcpu-16gb
minSize: 0
maxSize: 5
desiredCapacity: 1
@@ -41,7 +41,7 @@ nodeGroups:
autoScaler: true
cloudWatch: true
albIngress: true
- name: dev-8vcpu-32gb-spot
- name: ng-spot-8vcpu-32gb
minSize: 0
maxSize: 5
desiredCapacity: 1
@@ -69,10 +69,10 @@ nodeGroups:
EoF
```

This will create a `spot_nodegroups.yml` file that we will use to instruct eksctl to create two nodegroups, both with a diversified configuration.
This will create a `add-ngs-spot.yaml` file that we will use to instruct eksctl to create two nodegroups, both with a diversified configuration.

```
eksctl create nodegroup -f spot_nodegroups.yml
eksctl create nodegroup -f add-ngs-spot.yaml
```

{{% notice note %}}