Skip to content

Commit 9284e4d

Browse files
Remove kubernetes.io/cluster/<clusterName> tag from EFA security group (#8556)
1 parent 7080053 commit 9284e4d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pkg/cfn/builder/nodegroup_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,8 +644,6 @@ var _ = Describe("Unmanaged NodeGroup Template Builder", func() {
644644
properties := ngTemplate.Resources["EFASG"].Properties
645645
Expect(properties.VpcID).To(ContainElement(vpcID))
646646
Expect(properties.GroupDescription).To(Equal("EFA-enabled security group"))
647-
Expect(properties.Tags[0].Key).To(Equal("kubernetes.io/cluster/bonsai"))
648-
Expect(properties.Tags[0].Value).To(Equal("owned"))
649647

650648
Expect(ngTemplate.Resources).To(HaveKey("EFAEgressSelf"))
651649
properties = ngTemplate.Resources["EFAEgressSelf"].Properties

pkg/cfn/builder/vpc.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,12 @@ func (rs *resourceSet) addEFASecurityGroup(vpcID *gfnt.Value, clusterName, desc
103103
efaSG := rs.newResource("EFASG", &gfnec2.SecurityGroup{
104104
VpcId: vpcID,
105105
GroupDescription: gfnt.NewString("EFA-enabled security group"),
106-
Tags: []gfncfn.Tag{{
107-
Key: gfnt.NewString("kubernetes.io/cluster/" + clusterName),
108-
Value: gfnt.NewString("owned"),
109-
}},
106+
// Don't add a kubernetes.io/cluster tag to avoid conflicting with
107+
// aws load balancer controller which expects exactly one security group
108+
// tagged with kubernetes.io. Resource will already be tagged with
109+
// alpha.eksctl.io/cluster-name elsewhere.
110+
// https://github.com/kubernetes-sigs/aws-load-balancer-controller/blob/main/pkg/networking/networking_manager.go#L558
111+
Tags: []gfncfn.Tag{},
110112
})
111113

112114
// Create ingress rule for EFA self-communication

0 commit comments

Comments
 (0)