mirror of
https://github.com/ysoftdevs/terraform-aws-eks.git
synced 2026-03-17 23:13:46 +01:00
fix: Ensure isra_tag_values can be tried before defaulting to cluster_name on Karpenter module (#2631)
Co-authored-by: Bryant Biggs <bryantbiggs@gmail.com>
This commit is contained in:
@@ -16,7 +16,7 @@ provider "kubernetes" {
|
||||
|
||||
locals {
|
||||
name = "ex-${basename(path.cwd)}"
|
||||
cluster_version = "1.21" # Required by EKS on Outposts
|
||||
cluster_version = "1.27" # Required by EKS on Outposts
|
||||
|
||||
outpost_arn = element(tolist(data.aws_outposts_outposts.this.arns), 0)
|
||||
instance_type = element(tolist(data.aws_outposts_outpost_instance_types.this.instance_types), 0)
|
||||
|
||||
@@ -56,7 +56,7 @@ module "ssm_bastion_ec2" {
|
||||
rm terraform_${local.terraform_version}_linux_amd64.zip 2> /dev/null
|
||||
|
||||
# Install kubectl
|
||||
curl -LO https://dl.k8s.io/release/v1.21.0/bin/linux/amd64/kubectl
|
||||
curl -LO https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl
|
||||
install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
|
||||
|
||||
# Remove default awscli which is v1 - we want latest v2
|
||||
@@ -66,9 +66,8 @@ module "ssm_bastion_ec2" {
|
||||
./aws/install
|
||||
|
||||
# Clone repo
|
||||
git clone https://github.com/bryantbiggs/terraform-aws-eks.git \
|
||||
&& cd /home/ssm-user/terraform-aws-eks \
|
||||
&& git checkout refactor/v19
|
||||
git clone https://github.com/terraform-aws-modules/terraform-aws-eks.git \
|
||||
&& cd /home/ssm-user/terraform-aws-eks
|
||||
|
||||
chown -R ssm-user:ssm-user /home/ssm-user/
|
||||
EOT
|
||||
|
||||
Reference in New Issue
Block a user