Use internal-elb as karpenter subnet selector

pkg/model/awsmodel/network.go

@@ -244,15 +244,6 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
 			default:
 				klog.V(2).Infof("unable to properly tag subnet %q because it has unknown type %q. Load balancers may be created in incorrect subnets", subnetSpec.Name, subnetSpec.Type)
 			}
-			for _, ig := range b.InstanceGroups {
-				if ig.Spec.Manager == kops.InstanceManagerKarpenter {
-					for _, igSubnet := range ig.Spec.Subnets {
-						if igSubnet == subnetSpec.Name {
-							tags["kops.k8s.io/karpenter/"+ig.Name] = "1"
-						}
-					}
-				}
-			}
 		} else {
 			klog.V(2).Infof("skipping subnet tags. Ensure these are maintained externally.")
 		}

tests/integration/update_cluster/karpenter/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content

@@ -54,7 +54,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.19
     manifest: karpenter.sh/k8s-1.19.yaml
-    manifestHash: f5bf5ee51335406c3ad93bfa6cea5778dfddba76f353da2b89bfdc30b925bd13
+    manifestHash: 2caf3600648b924f1174a3a02b030c500bccda7a4eb7bfb9af0e1a99b48da72a
     name: karpenter.sh
     needsPKI: true
     selector:

tests/integration/update_cluster/karpenter/data/aws_s3_bucket_object_minimal.example.com-addons-karpenter.sh-k8s-1.19_content

@@ -868,7 +868,7 @@ spec:
     securityGroupSelector:
       Name: nodes.minimal.example.com
     subnetSelector:
-      kops.k8s.io/karpenter/karpenter-nodes: '*'
+      kubernetes.io/role/internal-elb: 1
   requirements:
   - key: karpenter.sh/capacity-type
     operator: In

tests/integration/update_cluster/karpenter/kubernetes.tf

@@ -959,7 +959,6 @@ resource "aws_subnet" "us-test-1a-minimal-example-com" {
     "KubernetesCluster"                         = "minimal.example.com"
     "Name"                                      = "us-test-1a.minimal.example.com"
     "SubnetType"                                = "Public"
-    "kops.k8s.io/karpenter/karpenter-nodes"     = "1"
     "kubernetes.io/cluster/minimal.example.com" = "owned"
     "kubernetes.io/role/elb"                    = "1"
     "kubernetes.io/role/internal-elb"           = "1"

upup/models/cloudup/resources/addons/karpenter.sh/k8s-1.19.yaml.template

@@ -671,7 +671,7 @@ spec:
     securityGroupSelector:
       Name: nodes.{{ ClusterName }}
     subnetSelector:
-      kops.k8s.io/karpenter/{{ $name }}: "*"
+      kubernetes.io/role/internal-elb: 1
   ttlSecondsAfterEmpty: 30
 {{ end }}
 {{ end }}