Remove xtables.lock which should be managed by the VPC CNI

pkg/addons/default/assets/aws-node.yaml

@@ -405,7 +405,8 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-      k8s-app: aws-node
+      app.kubernetes.io/name: aws-node
+      app.kubernetes.io/instance: aws-vpc-cni
   template:
     metadata:
       labels:

pkg/nodebootstrap/al2023.go

@@ -14,7 +14,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
-	"github.com/weaveworks/eksctl/pkg/nodebootstrap/assets"
 	"github.com/weaveworks/eksctl/pkg/nodebootstrap/utils"
 )
 
@@ -45,7 +44,7 @@ func newAL2023Bootstrapper(cfg *api.ClusterConfig, np api.NodePool, clusterDNS s
 		cfg:        cfg,
 		nodePool:   np,
 		clusterDNS: clusterDNS,
-		scripts:    []string{assets.AL2023XTablesLock},
+		scripts:    []string{},
 	}
 }
 

pkg/nodebootstrap/al2023_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/base64"
 	"encoding/json"
-	"fmt"
 	"io"
 	"mime/multipart"
 	"strings"
@@ -21,7 +20,6 @@ import (
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/nodebootstrap"
-	"github.com/weaveworks/eksctl/pkg/nodebootstrap/assets"
 )
 
 type al2023Entry struct {
@@ -54,21 +52,21 @@ var _ = DescribeTable("Unmanaged AL2023", func(e al2023Entry) {
 	Expect(actual).To(Equal(e.expectedUserData))
 },
 	Entry("default", al2023Entry{
-		expectedUserData: wrapMIMEParts(xTablesLock + nodeConfig),
+		expectedUserData: wrapMIMEParts(nodeConfig),
 	}),
 	Entry("ipv6", al2023Entry{
 		overrideClusterSettings: func(cc *api.ClusterConfig) {
 			cc.Status.KubernetesNetworkConfig.IPFamily = api.IPV6Family
 			cc.Status.KubernetesNetworkConfig.ServiceIPv6CIDR = "fd00:facc:76a1::/108"
 			cc.Status.KubernetesNetworkConfig.ServiceIPv4CIDR = ""
 		},
-		expectedUserData: wrapMIMEParts(xTablesLock + nodeConfigIPv6),
+		expectedUserData: wrapMIMEParts(nodeConfigIPv6),
 	}),
 	Entry("efa enabled", al2023Entry{
 		overrideNodegroupSettings: func(np api.NodePool) {
 			np.BaseNodeGroup().EFAEnabled = aws.Bool(true)
 		},
-		expectedUserData: wrapMIMEParts(xTablesLock + nodeConfig),
+		expectedUserData: wrapMIMEParts(nodeConfig),
 	}),
 )
 
@@ -96,14 +94,12 @@ var _ = DescribeTable("Managed AL2023", func(e al2023Entry) {
 	actual := strings.ReplaceAll(string(decoded), "\r\n", "\n")
 	Expect(actual).To(Equal(e.expectedUserData))
 },
-	Entry("native AMI", al2023Entry{
-		expectedUserData: wrapMIMEParts(xTablesLock),
-	}),
+	Entry("native AMI", al2023Entry{}),
 	Entry("custom AMI", al2023Entry{
 		overrideNodegroupSettings: func(np api.NodePool) {
 			np.BaseNodeGroup().AMI = "ami-xxxx"
 		},
-		expectedUserData: wrapMIMEParts(xTablesLock + managedNodeConfig),
+		expectedUserData: wrapMIMEParts(managedNodeConfig),
 	}),
 )
 
@@ -380,13 +376,6 @@ Content-Type: multipart/mixed; boundary=//
 `
 	}
 
-	xTablesLock = fmt.Sprintf(`--//
-Content-Type: text/x-shellscript
-Content-Type: charset="us-ascii"
-
-%s
-`, assets.AL2023XTablesLock)
-
 	nodeConfig = `--//
 Content-Type: application/node.eks.aws
 

pkg/nodebootstrap/assets/assets.go

@@ -20,11 +20,6 @@ var BootstrapHelperSh string
 //go:embed scripts/bootstrap.ubuntu.sh
 var BootstrapUbuntuSh string
 
-// AL2023XTablesLock holds the contents for creating a lock file for AL2023 AMIs.
-//
-//go:embed scripts/al2023-xtables.lock.sh
-var AL2023XTablesLock string
-
 // KubeletYaml holds the kubelet.yaml contents
 //
 //go:embed scripts/kubelet.yaml