From cf9468697088c78c0064861d8b9328c6f003d0e3 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Fri, 7 Jan 2022 11:55:22 -0800 Subject: [PATCH 1/2] explicitly set eks module to 17.24.0 --- .terraform.lock.hcl | 82 ++++++++++++------------------- eks-cluster.tf | 9 +--- kubeconfig_education-eks-nXil9gCY | 28 +++++++++++ 3 files changed, 62 insertions(+), 57 deletions(-) create mode 100644 kubeconfig_education-eks-nXil9gCY diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 24adbea6..a12b034a 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,28 +2,28 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.63.0" - constraints = ">= 2.68.0, >= 3.20.0, >= 3.40.0, >= 3.56.0" + version = "3.71.0" + constraints = ">= 3.15.0, >= 3.20.0, >= 3.56.0" hashes = [ - "h1:Z+2GvXLgqQ/uPMH8dv+dXJ/t+jd6sriYjhCJS6kSO6g=", - "zh:42c6c98b294953a4e1434a331251e539f5372bf6779bd61ab5df84cac0545287", - "zh:5493773762a470889c9a23db97582d3a82035847c8d3bd13323b4c3012abf325", - "zh:550d22ff9fed4d817a922e7b84bd9d1f2ef8d3afa00832cf66b8cd5f0e6dc748", - "zh:632cb5e2d9d5041875f57174236eafe5b05dbf26750c1041ab57eb08c5369fe2", - "zh:7cfeaf5bde1b28bd010415af1f3dc494680a8374f1a26ec19db494d99938cc4e", - "zh:99d871606b67c8aefce49007315de15736b949c09a9f8f29ad8af1e9ce383ed3", - "zh:c4fc8539ffe90df5c7ae587fde495fac6bc0186fec2f2713a8988a619cef265f", - "zh:d0a26493206575c99ca221d78fe64f96a8fbcebe933af92eea6b39168c1f1c1d", - "zh:e156fdc964fdd4a7586ec15629e20d2b06295b46b4962428006e088145db07d6", - "zh:eb04fc80f652b5c92f76822f0fec1697581543806244068506aed69e1bb9b2af", - "zh:f5638a533cf9444f7d02b5527446cdbc3b2eab8bcc4ec4b0ca32035fe6f479d3", + "h1:5+M8SPZlb3FxcmAX4RykKzNrTHkpjoP1UpHcenOXcxo=", + "zh:173134d8861a33ed60a48942ad2b96b9d06e85c506d7f927bead47a28f4ebdd2", + "zh:2996c8e96930f526f1761e99d14c0b18d83e287b1362aa2fa1444cf848ece613", + "zh:43903da1e0a809a1fb5832e957dbe2321b86630d6bfdd8b47728647a72fd912d", + "zh:43e71fd8924e7f7b56a0b2a82e29edf07c53c2b41ee7bb442a2f1c27e03e86ae", + "zh:4f4c73711f64a3ff85f88bf6b2594e5431d996b7a59041ff6cbc352f069fc122", + "zh:5045241b8695ffbd0730bdcd91393b10ffd0cfbeaad6254036e42ead6687d8fd", + "zh:6a8811a0fb1035c09aebf1f9b15295523a9a7a2627fd783f50c6168a82e192dd", + "zh:8d273c04d7a8c36d4366329adf041c480a0f1be10a7269269c88413300aebdb8", + "zh:b90505897ae4943a74de2b88b6a9e7d97bf6dc325a0222235996580edff28656", + "zh:ea5e422942ac6fc958229d27d4381c89d21d70c5c2c67a6c06ff357bcded76f6", + "zh:f1536d7ff2d3bfd668e3ac33d8956b4f988f87fdfdcc371c7d94b98d5dba53e2", ] } provider "registry.terraform.io/hashicorp/cloudinit" { - version = "2.2.0" + version = "2.2.0" + constraints = ">= 2.0.0" hashes = [ - "h1:Id6dDkpuSSLbGPTdbw49bVS/7XXHu/+d7CJoGDqtk5g=", "h1:siiI0wK6/jUDdA5P8ifTO0yc9YmXHml4hz5K9I9N+MA=", "zh:76825122171f9ea2287fd27e23e80a7eb482f6491a4f41a096d77b666896ee96", "zh:795a36dee548e30ca9c9d474af9ad6d29290e0a9816154ad38d55381cd0ab12d", @@ -40,21 +40,21 @@ provider "registry.terraform.io/hashicorp/cloudinit" { } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.6.1" + version = "2.7.1" constraints = ">= 1.11.1, >= 2.0.1" hashes = [ - "h1:DWgawNO2C7IuXC2v9IjTSsqs1vZHSAbP4ilWQ0LdbwI=", - "zh:081fbaf9441ebb278753dcf05f318fa7d445e9599a600d7c525e9a18b871d4c8", - "zh:143bfbe871c628981d756ead47486e807fce876232d05607e0b8852ebee4eed8", - "zh:34f413a644eb952e3f041d67ef19200f4c286d374eae87b60fafdd8bf6bb5654", - "zh:370562be70233be730e1876d565710c3ef477e047f209cb3dff8a4a3217a6461", - "zh:443021df6d56e59e4d8dda8e57b506affff32b8a22de09661d21b98bc781fefb", - "zh:51a9501360b58adf9ee6e09fb81f555042ebc909ab36e06ccfc5e701e91f9923", - "zh:7d41d48b8291b98e0a4b7a1f79a9d1fe140a2e0d8df422c5b48cbae4c3fa615a", - "zh:881b3e44814d7d49a5820e2e4b13ee3d000b5baf7957df774a909f17472ece8a", - "zh:b860ff68a944de63fbe0a624c41f2e373711a2da4298c0f0cb151e00fb32a6b3", - "zh:c4ab48ea6e0f8d4a6db1abab1877addb2b21ecd126e505c74b8c85804bd92cbe", - "zh:e96589575dfd31eab48fcc85466dd49895925473c60c802b346cdb4037953350", + "h1:/zifejk3MfLSDQr5J6sc3EHrnFwAVEDH9LrewWMRqe4=", + "zh:0da320fd81ece6696f7cceda35e459ee97cae8955088af38fc7f2feab1dce924", + "zh:37d304b8b992518c9c12e8f10437b9d4a0cc5a823c9421ac794ad2347c4d1122", + "zh:3d4e12fb9588c3b2e782d392fea758c6982e5d653154bec951e949155bcbc169", + "zh:6bb32b8d5cccf3e3ae7c124ed27df76dc7653ca760c132addeee15272630c930", + "zh:94775153b90e285876fc17261e8f5338a1ff732f4133336cc68754acb74570b6", + "zh:a665d1336765cdf8620a8797fd4e7e3cecf789e96e59ba80634336a4390df377", + "zh:aa8b35e9958cb89f01c115e8866a07d5468fb53f1c227d673e94f7ee8fb76242", + "zh:b7a571336387d773a74ed6eefa3843ff78d3662f2745c99c95008002a1341662", + "zh:c50d661782175d50ea4952fe943b0e4a3e33c27aa69e5ff21b3cbfa513e90d0a", + "zh:e0999b349cc772c75876adbc2a13b5dc256d3ecd7e4aa91baee5fdfcecaa7465", + "zh:e1399aec06a7aa98e9b0f64b4281697247f338a8a40b79f5f6ebfd43bf4ce1e2", ] } @@ -62,7 +62,7 @@ provider "registry.terraform.io/hashicorp/local" { version = "2.1.0" constraints = ">= 1.4.0, 2.1.0" hashes = [ - "h1:PaQTpxHMbZB9XV+c1od1eaUvndQle3ZZHx79hrI6C3k=", + "h1:KfieWtVyGWwplSoLIB5usKAUnrIkDQBkWaR5TI+4WYg=", "zh:0f1ec65101fa35050978d483d6e8916664b7556800348456ff3d09454ac1eae2", "zh:36e42ac19f5d68467aacf07e6adcf83c7486f2e5b5f4339e9671f68525fc87ab", "zh:6db9db2a1819e77b1642ec3b5e95042b202aee8151a0256d289f2e141bf3ceb3", @@ -81,7 +81,7 @@ provider "registry.terraform.io/hashicorp/null" { version = "3.1.0" constraints = "3.1.0" hashes = [ - "h1:grYDj8/Lvp1OwME+g1AsECPN1czO5ssSf+8fCluCHQY=", + "h1:xhbHC6in3nQryvTQBWKxebi3inG5OCgHgc4fRxL0ymc=", "zh:02a1675fd8de126a00460942aaae242e65ca3380b5bb192e8773ef3da9073fd2", "zh:53e30545ff8926a8e30ad30648991ca8b93b6fa496272cd23b26763c8ee84515", "zh:5f9200bf708913621d0f6514179d89700e9aa3097c77dac730e8ba6e5901d521", @@ -100,7 +100,7 @@ provider "registry.terraform.io/hashicorp/random" { version = "3.1.0" constraints = "3.1.0" hashes = [ - "h1:9cCiLO/Cqr6IUvMDSApCkQItooiYNatZpEXmcu0nnng=", + "h1:rKYu5ZUbXwrLG1w81k7H3nce/Ys6yAxXhWcbtk36HjY=", "zh:2bbb3339f0643b5daa07480ef4397bd23a79963cc364cdfbb4e86354cb7725bc", "zh:3cd456047805bf639fbf2c761b1848880ea703a054f76db51852008b11008626", "zh:4f251b0eda5bb5e3dc26ea4400dba200018213654b69b4a5f96abee815b4f5ff", @@ -115,24 +115,6 @@ provider "registry.terraform.io/hashicorp/random" { ] } -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - constraints = ">= 2.1.0, 2.2.0" - hashes = [ - "h1:0wlehNaxBX7GJQnPfQwTNvvAf38Jm0Nv7ssKGMaG6Og=", - "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", - "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", - "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", - "zh:0e3a6c8e16f17f19010accd0844187d524580d9fdb0731f675ffcf4afba03d16", - "zh:45f2c594b6f2f34ea663704cc72048b212fe7d16fb4cfd959365fa997228a776", - "zh:77ea3e5a0446784d77114b5e851c970a3dde1e08fa6de38210b8385d7605d451", - "zh:8a154388f3708e3df5a69122a23bdfaf760a523788a5081976b3d5616f7d30ae", - "zh:992843002f2db5a11e626b3fc23dc0c87ad3729b3b3cff08e32ffb3df97edbde", - "zh:ad906f4cebd3ec5e43d5cd6dc8f4c5c9cc3b33d2243c89c5fc18f97f7277b51d", - "zh:c979425ddb256511137ecd093e23283234da0154b7fa8b21c2687182d9aea8b2", - ] -} - provider "registry.terraform.io/terraform-aws-modules/http" { version = "2.4.1" constraints = ">= 2.4.1" diff --git a/eks-cluster.tf b/eks-cluster.tf index 666291c4..6e978a50 100644 --- a/eks-cluster.tf +++ b/eks-cluster.tf @@ -1,15 +1,10 @@ module "eks" { source = "terraform-aws-modules/eks/aws" + version = "17.24.0" cluster_name = local.cluster_name cluster_version = "1.20" subnets = module.vpc.private_subnets - tags = { - Environment = "training" - GithubRepo = "terraform-aws-eks" - GithubOrg = "terraform-aws-modules" - } - vpc_id = module.vpc.vpc_id workers_group_defaults = { @@ -21,8 +16,8 @@ module "eks" { name = "worker-group-1" instance_type = "t2.small" additional_userdata = "echo foo bar" - asg_desired_capacity = 2 additional_security_group_ids = [aws_security_group.worker_group_mgmt_one.id] + asg_desired_capacity = 2 }, { name = "worker-group-2" diff --git a/kubeconfig_education-eks-nXil9gCY b/kubeconfig_education-eks-nXil9gCY new file mode 100644 index 00000000..6da3d838 --- /dev/null +++ b/kubeconfig_education-eks-nXil9gCY @@ -0,0 +1,28 @@ +apiVersion: v1 +preferences: {} +kind: Config + +clusters: +- cluster: + server: https://2C058B5D009A88AFA2C442B438F8D2FF.gr7.us-east-2.eks.amazonaws.com + certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJeU1ERXdOekU1TkRZeE0xb1hEVE15TURFd05URTVORFl4TTFvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBS20xClh2ZVNWY0tOSkdEWVl4bWphbXpHSC83Sjk3M21jdUk4SkNQN2VCRjdPMXExVDVWSVFyNkppNjVoWm9kUWZiRjgKdTZEc0s3WWhVSkpmcEtEbVZBNWd3RU8wTzA0bXpRQXdGbUFyclNvTEQxcjlJakpleXo1VE8vNzdpSEcwOUtMNQpOT3pTV1R2bGRIK2V5M1BwZ3ZHR01mMUdIU1kvaXF0OGRtTmVjY0NoR0xsWThaSVNTY1BpMnl3SFkwQXp4TFpqCjZNbk1tbGUxeGtnMVdVKy9aMFpOOVg3MzkzeEJiQ2xrckd2MmFxdG95cWFJTUlaeDU0MFdsUEpiY1gwc21KVDQKb0NUR3gvTjVhNjdFZ01xYXo2bmVJbVBHNlVNVVZvMi9tR29MQjM1eGJKb3Avd1ZRUC9GUkdKWkd4dWlDM25iMApPcVVadzFnYVRjdG1HT29JU2ljQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZQdDFTSjFxQlBvUSsvaXJTTGE3TmZ5amVwSUVNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFBWk5Hc0tTazB0Um44bkNUMGtDSmVSTlNPellnbUc1TlZiUGlGQnVWNVVqL3h2SXFsRApQNG16Mm1NMG5EaEpSVFpCeGc3RmZsVTdoL2prbmt4U05rN01VWURIaUl1TnpBd1dTSnpxWWVHUGxuNWU1bW9yCkZWVjMrd3h3SHJtNkNoZDJnMkpFTklkMTVaU0VHSjhnbS8wMVdENU5SMUI2dDJyQTZtMkJJLzE1RFpLci9jTUwKTlNZUjJLbEtIRno4M0ZPcVhVZEpNa1N6a2ZqRXB0ZDRHbVZaNStLUjlIdWpBeVhPOXMzR08rYjIxUzJmMEo0UgphRkJCZFFzRXpnK3MrZ2d2STllMEVsWVZCV3NQZHVoU21uSHh1U2NqQ2g1ZThXTE01cUE2RDBhNTRzREtwcGlHCkZBLzZHdjRkRUNwYnQvaHlEYnN1ekRJTndzeVc0MkUvT2NuQQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + name: eks_education-eks-nXil9gCY + +contexts: +- context: + cluster: eks_education-eks-nXil9gCY + user: eks_education-eks-nXil9gCY + name: eks_education-eks-nXil9gCY + +current-context: eks_education-eks-nXil9gCY + +users: +- name: eks_education-eks-nXil9gCY + user: + exec: + apiVersion: client.authentication.k8s.io/v1alpha1 + command: aws-iam-authenticator + args: + - "token" + - "-i" + - "education-eks-nXil9gCY" From c5b26394bc6bf23d9a2f8c35500fcc9f390a5c04 Mon Sep 17 00:00:00 2001 From: Tu Nguyen Date: Fri, 7 Jan 2022 11:55:41 -0800 Subject: [PATCH 2/2] explicitly set eks module to 17.24.0 --- kubeconfig_education-eks-nXil9gCY | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 kubeconfig_education-eks-nXil9gCY diff --git a/kubeconfig_education-eks-nXil9gCY b/kubeconfig_education-eks-nXil9gCY deleted file mode 100644 index 6da3d838..00000000 --- a/kubeconfig_education-eks-nXil9gCY +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -preferences: {} -kind: Config - -clusters: -- cluster: - server: https://2C058B5D009A88AFA2C442B438F8D2FF.gr7.us-east-2.eks.amazonaws.com - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJeU1ERXdOekU1TkRZeE0xb1hEVE15TURFd05URTVORFl4TTFvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBS20xClh2ZVNWY0tOSkdEWVl4bWphbXpHSC83Sjk3M21jdUk4SkNQN2VCRjdPMXExVDVWSVFyNkppNjVoWm9kUWZiRjgKdTZEc0s3WWhVSkpmcEtEbVZBNWd3RU8wTzA0bXpRQXdGbUFyclNvTEQxcjlJakpleXo1VE8vNzdpSEcwOUtMNQpOT3pTV1R2bGRIK2V5M1BwZ3ZHR01mMUdIU1kvaXF0OGRtTmVjY0NoR0xsWThaSVNTY1BpMnl3SFkwQXp4TFpqCjZNbk1tbGUxeGtnMVdVKy9aMFpOOVg3MzkzeEJiQ2xrckd2MmFxdG95cWFJTUlaeDU0MFdsUEpiY1gwc21KVDQKb0NUR3gvTjVhNjdFZ01xYXo2bmVJbVBHNlVNVVZvMi9tR29MQjM1eGJKb3Avd1ZRUC9GUkdKWkd4dWlDM25iMApPcVVadzFnYVRjdG1HT29JU2ljQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZQdDFTSjFxQlBvUSsvaXJTTGE3TmZ5amVwSUVNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFBWk5Hc0tTazB0Um44bkNUMGtDSmVSTlNPellnbUc1TlZiUGlGQnVWNVVqL3h2SXFsRApQNG16Mm1NMG5EaEpSVFpCeGc3RmZsVTdoL2prbmt4U05rN01VWURIaUl1TnpBd1dTSnpxWWVHUGxuNWU1bW9yCkZWVjMrd3h3SHJtNkNoZDJnMkpFTklkMTVaU0VHSjhnbS8wMVdENU5SMUI2dDJyQTZtMkJJLzE1RFpLci9jTUwKTlNZUjJLbEtIRno4M0ZPcVhVZEpNa1N6a2ZqRXB0ZDRHbVZaNStLUjlIdWpBeVhPOXMzR08rYjIxUzJmMEo0UgphRkJCZFFzRXpnK3MrZ2d2STllMEVsWVZCV3NQZHVoU21uSHh1U2NqQ2g1ZThXTE01cUE2RDBhNTRzREtwcGlHCkZBLzZHdjRkRUNwYnQvaHlEYnN1ekRJTndzeVc0MkUvT2NuQQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - name: eks_education-eks-nXil9gCY - -contexts: -- context: - cluster: eks_education-eks-nXil9gCY - user: eks_education-eks-nXil9gCY - name: eks_education-eks-nXil9gCY - -current-context: eks_education-eks-nXil9gCY - -users: -- name: eks_education-eks-nXil9gCY - user: - exec: - apiVersion: client.authentication.k8s.io/v1alpha1 - command: aws-iam-authenticator - args: - - "token" - - "-i" - - "education-eks-nXil9gCY"