Skip to content

Commit

Permalink
AWS kube-proxy
Browse files Browse the repository at this point in the history
  • Loading branch information
jimgus committed Dec 9, 2022
1 parent a353bc5 commit 1dc8f85
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
10 changes: 0 additions & 10 deletions modules/aws/eks/eks.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@ data "aws_eks_addon_version" "kube_proxy" {
most_recent = true
}

resource "aws_eks_addon" "kube_proxy" {
depends_on = [aws_eks_node_group.this]

cluster_name = aws_eks_cluster.this.name
addon_name = "kube-proxy"
addon_version = data.aws_eks_addon_version.kube_proxy.version
resolve_conflicts = "OVERWRITE"
tags = local.global_tags
}

data "aws_eks_addon_version" "core_dns" {
addon_name = "coredns"
kubernetes_version = aws_eks_cluster.this.version
Expand Down
3 changes: 1 addition & 2 deletions modules/aws/eks/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ output "kube_config" {

# Ugly workaround to force the addons to be installed before starting with the core module
dummy_data = {
core_dns = aws_eks_addon.core_dns
aws_eks_addon = aws_eks_addon.kube_proxy
core_dns = aws_eks_addon.core_dns
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions modules/aws/eks/templates/update-eks-cni.sh.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ kubectl config set users.cluster-admin.token ${token} && \
kubectl config set contexts.cluster-admin.cluster cluster-admin && \
kubectl config set contexts.cluster-admin.user cluster-admin && \
kubectl config set contexts.cluster-admin.namespace kube-system && \
kubectl --context=cluster-admin delete ds kube-proxy -n kube-system --ignore-not-found=true && \
kubectl --context=cluster-admin delete cm kube-proxy -n kube-system --ignore-not-found=true && \
kubectl --context=cluster-admin delete ds aws-node -n kube-system --ignore-not-found=true

0 comments on commit 1dc8f85

Please sign in to comment.