Merge pull request #7088 from ameukam/kops-infra-drop-builtin-pod-agent

k8s-ci-robot · web-flow · commit 5a05e5c2ec29 · 2024-07-29T14:12:34.000-07:00
kops: Drop EKS addon for EKS Identity agent
diff --git a/infra/aws/terraform/kops-infra-ci/eks.tf b/infra/aws/terraform/kops-infra-ci/eks.tf
@@ -47,6 +47,9 @@ module "eks" {
     coredns = {
       most_recent = true
     }
+    eks-pod-identity-agent = {
+      most_recent = true
+    }
     kube-proxy = {
       most_recent = true
     }
@@ -158,15 +161,6 @@ module "eks-auth" {
   ]
 }
 
-resource "aws_eks_addon" "eks_pod_identity" {
-  provider = aws.kops-local-ci
-
-  cluster_name                = module.eks.cluster_name
-  addon_name                  = "eks-pod-identity-agent"
-  addon_version               = "v1.0.0-eksbuild.1"
-  resolve_conflicts_on_update = "OVERWRITE"
-}
-
 resource "aws_eks_pod_identity_association" "kops_prow_build" {
   provider = aws.kops-local-ci
 

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ module "eks" {`
`47`	`47`	`coredns = {`
`48`	`48`	`most_recent = true`
`49`	`49`	`}`
	`50`	`+ eks-pod-identity-agent = {`
	`51`	`+ most_recent = true`
	`52`	`+ }`
`50`	`53`	`kube-proxy = {`
`51`	`54`	`most_recent = true`
`52`	`55`	`}`
`@@ -158,15 +161,6 @@ module "eks-auth" {`
`158`	`161`	`]`
`159`	`162`	`}`
`160`	`163`
`161`		`-resource "aws_eks_addon" "eks_pod_identity" {`
`162`		`- provider = aws.kops-local-ci`
`163`		`-`
`164`		`- cluster_name = module.eks.cluster_name`
`165`		`- addon_name = "eks-pod-identity-agent"`
`166`		`- addon_version = "v1.0.0-eksbuild.1"`
`167`		`- resolve_conflicts_on_update = "OVERWRITE"`
`168`		`-}`
`169`		`-`
`170`	`164`	`resource "aws_eks_pod_identity_association" "kops_prow_build" {`
`171`	`165`	`provider = aws.kops-local-ci`
`172`	`166`