Run hack/update-bazel.sh

pkg/model/BUILD.bazel

@@ -5,15 +5,10 @@ go_library(
     srcs = [
         "bootstrapscript.go",
         "context.go",
-        "convenience.go",
-        "firewall.go",
-        "iam.go",
         "manifests.go",
         "master_volumes.go",
         "names.go",
-        "network.go",
         "pki.go",
-        "sshkey.go",
         "template_resource.go",
     ],
     importpath = "k8s.io/kops/pkg/model",
@@ -23,7 +18,6 @@ go_library(
         "//pkg/apis/kops/model:go_default_library",
         "//pkg/apis/kops/util:go_default_library",
         "//pkg/apis/nodeup:go_default_library",
-        "//pkg/dns:go_default_library",
         "//pkg/featureflag:go_default_library",
         "//pkg/model/components:go_default_library",
         "//pkg/model/iam:go_default_library",
@@ -33,7 +27,6 @@ go_library(
         "//pkg/pki:go_default_library",
         "//pkg/rbac:go_default_library",
         "//pkg/tokens:go_default_library",
-        "//pkg/util/stringorslice:go_default_library",
         "//upup/pkg/fi:go_default_library",
         "//upup/pkg/fi/cloudup/alitasks:go_default_library",
         "//upup/pkg/fi/cloudup/aliup:go_default_library",
@@ -52,7 +45,6 @@ go_library(
         "//util/pkg/architectures:go_default_library",
         "//util/pkg/mirrors:go_default_library",
         "//util/pkg/vfs:go_default_library",
-        "//vendor/github.com/aws/aws-sdk-go/aws/endpoints:go_default_library",
         "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library",
         "//vendor/github.com/blang/semver/v4:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
@@ -60,18 +52,13 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
         "//vendor/k8s.io/klog/v2:go_default_library",
-        "//vendor/k8s.io/legacy-cloud-providers/aws:go_default_library",
         "//vendor/sigs.k8s.io/yaml:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
-    srcs = [
-        "bootstrapscript_test.go",
-        "firewall_test.go",
-        "iam_test.go",
-    ],
+    srcs = ["bootstrapscript_test.go"],
     data = glob(["tests/**"]),  #keep
     embed = [":go_default_library"],
     deps = [

pkg/model/awsmodel/BUILD.bazel

@@ -9,9 +9,13 @@ go_library(
         "context.go",
         "dns.go",
         "external_access.go",
+        "firewall.go",
+        "iam.go",
+        "network.go",
         "nodeterminationhandler.go",
         "oidc_provider.go",
         "spotinst.go",
+        "sshkey.go",
     ],
     importpath = "k8s.io/kops/pkg/model/awsmodel",
     visibility = ["//visibility:public"],
@@ -22,23 +26,30 @@ go_library(
         "//pkg/model:go_default_library",
         "//pkg/model/defaults:go_default_library",
         "//pkg/model/iam:go_default_library",
+        "//pkg/util/stringorslice:go_default_library",
         "//upup/pkg/fi:go_default_library",
         "//upup/pkg/fi/cloudup/awstasks:go_default_library",
         "//upup/pkg/fi/cloudup/awsup:go_default_library",
         "//upup/pkg/fi/cloudup/spotinsttasks:go_default_library",
         "//upup/pkg/fi/fitasks:go_default_library",
         "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library",
+        "//vendor/github.com/aws/aws-sdk-go/aws/endpoints:go_default_library",
         "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library",
         "//vendor/gopkg.in/square/go-jose.v2:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//vendor/k8s.io/klog/v2:go_default_library",
+        "//vendor/k8s.io/legacy-cloud-providers/aws:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
-    srcs = ["autoscalinggroup_test.go"],
+    srcs = [
+        "autoscalinggroup_test.go",
+        "firewall_test.go",
+        "iam_test.go",
+    ],
     embed = [":go_default_library"],
     deps = [
         "//pkg/apis/kops:go_default_library",

upup/pkg/fi/cloudup/bootstrapchannelbuilder/BUILD.bazel

@@ -15,6 +15,7 @@ go_library(
         "//pkg/featureflag:go_default_library",
         "//pkg/kubemanifest:go_default_library",
         "//pkg/model:go_default_library",
+        "//pkg/model/awsmodel:go_default_library",
         "//pkg/model/components/addonmanifests:go_default_library",
         "//pkg/model/components/addonmanifests/awsloadbalancercontroller:go_default_library",
         "//pkg/model/components/addonmanifests/dnscontroller:go_default_library",