diff --git a/_sub/compute/eks-heptio/kubeconfig-admin.yaml b/_sub/compute/eks-heptio/kubeconfig-admin.yaml index cb4d03153..7b33a47c8 100644 --- a/_sub/compute/eks-heptio/kubeconfig-admin.yaml +++ b/_sub/compute/eks-heptio/kubeconfig-admin.yaml @@ -17,10 +17,11 @@ users: user: exec: apiVersion: client.authentication.k8s.io/v1alpha1 - command: aws-iam-authenticator + command: aws args: - - "token" - - "-i" + - "eks" + - "get-token" + - "--cluster-name" - "${cluster_name}" - - "-r" + - "--role-arn" - "${role_arn}" diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index db19b8b44..bad31b1ee 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -17,7 +17,7 @@ schedules: resources: containers: - container: prime - image: dfdsdk/prime-pipeline:0.6.9 + image: dfdsdk/prime-pipeline:0.6.10 env: AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY) ARM_CLIENT_SECRET: $(ARM_CLIENT_SECRET) diff --git a/compute/eks-ec2/main.tf b/compute/eks-ec2/main.tf index f1d014feb..5b3fa6680 100644 --- a/compute/eks-ec2/main.tf +++ b/compute/eks-ec2/main.tf @@ -21,12 +21,13 @@ provider "kubernetes" { exec { api_version = "client.authentication.k8s.io/v1alpha1" - command = "aws-iam-authenticator" + command = "aws" args = [ - "token", - "-i", + "eks", + "get-token", + "--cluster-name", var.eks_cluster_name, - "-r", + "--role-arn", var.aws_assume_role_arn, ] } diff --git a/compute/eks-ec2/versions.tf b/compute/eks-ec2/versions.tf index 9c5dae4cd..201e39bdc 100644 --- a/compute/eks-ec2/versions.tf +++ b/compute/eks-ec2/versions.tf @@ -14,7 +14,7 @@ terraform { } tls = { - source = "hashicorp/tls" + source = "hashicorp/tls" version = "~> 3.1.0" }