From 4a63a118b2c4af0a1ec459f17a81dec460f08ddc Mon Sep 17 00:00:00 2001 From: justinsb Date: Wed, 4 Dec 2024 08:56:51 -0500 Subject: [PATCH] Remove unusued kubernetesVersion from AssetBuilder This field is no longer used, and can be removed. --- .../bootstrap/controllers/kopsconfig_controller.go | 2 +- cmd/kops/create_cluster.go | 2 +- cmd/kops/edit_cluster.go | 2 +- cmd/kops/edit_instancegroup.go | 2 +- nodeup/pkg/model/kubelet_test.go | 2 +- pkg/assets/builder.go | 14 +------------- pkg/assets/builder_test.go | 7 ------- pkg/commands/helpers_readwrite.go | 4 ++-- pkg/instancegroups/rollingupdate_os_test.go | 2 +- pkg/model/components/containerd_test.go | 2 +- pkg/model/components/etcdmanager/model_test.go | 2 +- pkg/model/components/image_test.go | 2 +- pkg/model/components/kubeapiserver/model_test.go | 2 +- pkg/model/components/kubecontrollermanager_test.go | 6 +++--- pkg/model/components/kubelet_test.go | 2 +- pkg/model/components/kubescheduler/model_test.go | 2 +- pkg/model/components/kubescheduler_test.go | 2 +- pkg/nodemodel/wellknownassets/cni_test.go | 4 ++-- pkg/nodemodel/wellknownassets/crictl_test.go | 2 +- upup/pkg/fi/cloudup/apply_cluster.go | 2 +- upup/pkg/fi/cloudup/awstasks/elastic_ip_test.go | 2 +- .../pkg/fi/cloudup/bootstrapchannelbuilder_test.go | 2 +- .../pkg/fi/cloudup/gcetasks/serviceaccount_test.go | 2 +- upup/pkg/fi/cloudup/populate_cluster_spec_test.go | 2 +- upup/pkg/fi/dryruntarget_test.go | 2 +- upup/pkg/fi/nodeup/command.go | 2 +- 26 files changed, 29 insertions(+), 48 deletions(-) diff --git a/clusterapi/bootstrap/controllers/kopsconfig_controller.go b/clusterapi/bootstrap/controllers/kopsconfig_controller.go index 33b55db41e..e9b20c3ba0 100644 --- a/clusterapi/bootstrap/controllers/kopsconfig_controller.go +++ b/clusterapi/bootstrap/controllers/kopsconfig_controller.go @@ -191,7 +191,7 @@ func (r *KopsConfigReconciler) buildBootstrapData(ctx context.Context) ([]byte, ig.Spec.Role = kops.InstanceGroupRoleNode getAssets := false - assetBuilder := assets.NewAssetBuilder(vfsContext, cluster.Spec.Assets, cluster.Spec.KubernetesVersion, getAssets) + assetBuilder := assets.NewAssetBuilder(vfsContext, cluster.Spec.Assets, getAssets) encryptionConfigSecretHash := "" // if fi.ValueOf(c.Cluster.Spec.EncryptionConfig) { diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go index 0918838ec2..bf85f7501b 100644 --- a/cmd/kops/create_cluster.go +++ b/cmd/kops/create_cluster.go @@ -651,7 +651,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr return err } - assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, false) fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, cluster, instanceGroups, cloud, assetBuilder) if err != nil { return err diff --git a/cmd/kops/edit_cluster.go b/cmd/kops/edit_cluster.go index df1dd3630f..dc7015a7e3 100644 --- a/cmd/kops/edit_cluster.go +++ b/cmd/kops/edit_cluster.go @@ -263,7 +263,7 @@ func updateCluster(ctx context.Context, clientset simple.Clientset, oldCluster, return "", fmt.Errorf("error populating configuration: %v", err) } - assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), newCluster.Spec.Assets, newCluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), newCluster.Spec.Assets, false) fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, newCluster, instanceGroups, cloud, assetBuilder) if err != nil { return fmt.Sprintf("error populating cluster spec: %s", err), nil diff --git a/cmd/kops/edit_instancegroup.go b/cmd/kops/edit_instancegroup.go index faf8f8460a..e382f0420c 100644 --- a/cmd/kops/edit_instancegroup.go +++ b/cmd/kops/edit_instancegroup.go @@ -295,7 +295,7 @@ func updateInstanceGroup(ctx context.Context, clientset simple.Clientset, channe return "", fmt.Errorf("error populating configuration: %v", err) } - assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, false) fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, cluster, []*api.InstanceGroup{newGroup}, cloud, assetBuilder) if err != nil { return fmt.Sprintf("error populating cluster spec: %s", err), nil diff --git a/nodeup/pkg/model/kubelet_test.go b/nodeup/pkg/model/kubelet_test.go index b5a808b378..05ac1100b5 100644 --- a/nodeup/pkg/model/kubelet_test.go +++ b/nodeup/pkg/model/kubelet_test.go @@ -293,7 +293,7 @@ func BuildNodeupModelContext(model *testutils.Model) (*NodeupModelContext, error func mockedPopulateClusterSpec(ctx context.Context, c *kops.Cluster, instanceGroups []*kops.InstanceGroup, cloud fi.Cloud) (*kops.Cluster, error) { vfs.Context.ResetMemfsContext(true) - assetBuilder := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, c.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, false) basePath, err := vfs.Context.BuildVfsPath("memfs://tests") if err != nil { return nil, fmt.Errorf("error building vfspath: %v", err) diff --git a/pkg/assets/builder.go b/pkg/assets/builder.go index 977102c525..39926a7dfd 100644 --- a/pkg/assets/builder.go +++ b/pkg/assets/builder.go @@ -25,13 +25,11 @@ import ( "strings" "time" - "github.com/blang/semver/v4" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/crane" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" "k8s.io/kops/pkg/apis/kops" - "k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/assets/assetdata" "k8s.io/kops/pkg/featureflag" "k8s.io/kops/pkg/kubemanifest" @@ -48,9 +46,6 @@ type AssetBuilder struct { AssetsLocation *kops.AssetsSpec GetAssets bool - // KubernetesVersion is the version of kubernetes we are installing - KubernetesVersion semver.Version - // KubeletSupportedVersion is the max version of kubelet that we are currently allowed to run on worker nodes. // This is used to avoid violating the kubelet supported version skew policy, // (we are not allowed to run a newer kubelet on a worker node than the control plane) @@ -119,20 +114,13 @@ type FileAsset struct { } // NewAssetBuilder creates a new AssetBuilder. -func NewAssetBuilder(vfsContext *vfs.VFSContext, assets *kops.AssetsSpec, kubernetesVersion string, getAssets bool) *AssetBuilder { +func NewAssetBuilder(vfsContext *vfs.VFSContext, assets *kops.AssetsSpec, getAssets bool) *AssetBuilder { a := &AssetBuilder{ vfsContext: vfsContext, AssetsLocation: assets, GetAssets: getAssets, } - version, err := util.ParseKubernetesVersion(kubernetesVersion) - if err != nil { - // This should have already been validated - klog.Fatalf("unexpected error from ParseKubernetesVersion %s: %v", kubernetesVersion, err) - } - a.KubernetesVersion = *version - return a } diff --git a/pkg/assets/builder_test.go b/pkg/assets/builder_test.go index 4d57703c30..d791b95770 100644 --- a/pkg/assets/builder_test.go +++ b/pkg/assets/builder_test.go @@ -22,7 +22,6 @@ import ( "testing" "k8s.io/kops/pkg/apis/kops" - "k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/testutils/golden" ) @@ -78,9 +77,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToSimplifiedKubernetesURL(t * proxyURL := "proxy.example.com/" image := "registry.k8s.io/kube-apiserver" expected := "proxy.example.com/kube-apiserver" - version, _ := util.ParseKubernetesVersion("1.10") - builder.KubernetesVersion = *version builder.AssetsLocation.ContainerProxy = &proxyURL remapped, err := builder.RemapImage(image) @@ -118,9 +115,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToImagesWithTags(t *testing.T proxyURL := "proxy.example.com/" image := "registry.k8s.io/kube-apiserver:1.2.3" expected := "proxy.example.com/kube-apiserver:1.2.3" - version, _ := util.ParseKubernetesVersion("1.10") - builder.KubernetesVersion = *version builder.AssetsLocation.ContainerProxy = &proxyURL remapped, err := builder.RemapImage(image) @@ -139,9 +134,7 @@ func TestValidate_RemapImage_ContainerRegistry_MappingMultipleTimesConverges(t * mirrorURL := "proxy.example.com" image := "kube-apiserver:1.2.3" expected := "proxy.example.com/kube-apiserver:1.2.3" - version, _ := util.ParseKubernetesVersion("1.10") - builder.KubernetesVersion = *version builder.AssetsLocation.ContainerRegistry = &mirrorURL remapped := image diff --git a/pkg/commands/helpers_readwrite.go b/pkg/commands/helpers_readwrite.go index d7298cbdae..a352be3814 100644 --- a/pkg/commands/helpers_readwrite.go +++ b/pkg/commands/helpers_readwrite.go @@ -40,7 +40,7 @@ func UpdateCluster(ctx context.Context, clientset simple.Clientset, cluster *kop return fmt.Errorf("error populating configuration: %v", err) } - assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, false) fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, cluster, instanceGroups, cloud, assetBuilder) if err != nil { return err @@ -78,7 +78,7 @@ func UpdateInstanceGroup(ctx context.Context, clientset simple.Clientset, cluste return fmt.Errorf("error populating configuration: %v", err) } - assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, false) fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, cluster, allInstanceGroups, cloud, assetBuilder) if err != nil { return err diff --git a/pkg/instancegroups/rollingupdate_os_test.go b/pkg/instancegroups/rollingupdate_os_test.go index ffefbc95da..698984d587 100644 --- a/pkg/instancegroups/rollingupdate_os_test.go +++ b/pkg/instancegroups/rollingupdate_os_test.go @@ -55,7 +55,7 @@ func getTestSetupOS(t *testing.T, ctx context.Context) (*RollingUpdateCluster, * t.Fatalf("Failed to perform assignments: %v", err) } - assetBuilder := assets.NewAssetBuilder(vfs.Context, inCluster.Spec.Assets, inCluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, inCluster.Spec.Assets, false) basePath, _ := vfs.Context.BuildVfsPath(inCluster.Spec.ConfigStore.Base) clientset := vfsclientset.NewVFSClientset(vfs.Context, basePath) cluster, err := cloudup.PopulateClusterSpec(ctx, clientset, inCluster, nil, mockcloud, assetBuilder) diff --git a/pkg/model/components/containerd_test.go b/pkg/model/components/containerd_test.go index fc472f9027..151527425d 100644 --- a/pkg/model/components/containerd_test.go +++ b/pkg/model/components/containerd_test.go @@ -45,7 +45,7 @@ func Test_Build_Containerd_Supported_Version(t *testing.T) { for _, v := range kubernetesVersions { c := buildContainerdCluster(v) - b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, c.Spec.KubernetesVersion, false) + b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, false) version, err := util.ParseKubernetesVersion(v) if err != nil { diff --git a/pkg/model/components/etcdmanager/model_test.go b/pkg/model/components/etcdmanager/model_test.go index 0c212949db..b01da42c09 100644 --- a/pkg/model/components/etcdmanager/model_test.go +++ b/pkg/model/components/etcdmanager/model_test.go @@ -53,7 +53,7 @@ func Test_RunEtcdManagerBuilder(t *testing.T) { builder := EtcdManagerBuilder{ KopsModelContext: kopsModelContext, - AssetBuilder: assets.NewAssetBuilder(vfs.Context, kopsModelContext.Cluster.Spec.Assets, kopsModelContext.Cluster.Spec.KubernetesVersion, false), + AssetBuilder: assets.NewAssetBuilder(vfs.Context, kopsModelContext.Cluster.Spec.Assets, false), } if err := builder.Build(context); err != nil { diff --git a/pkg/model/components/image_test.go b/pkg/model/components/image_test.go index 375ef00c53..dbce1d7085 100644 --- a/pkg/model/components/image_test.go +++ b/pkg/model/components/image_test.go @@ -78,7 +78,7 @@ func TestImage(t *testing.T) { } } - assetBuilder := assets.NewAssetBuilder(vfs.Context, g.Cluster.Spec.Assets, g.Cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, g.Cluster.Spec.Assets, false) actual, err := Image(g.Component, &g.Cluster.Spec, assetBuilder) if err != nil { t.Errorf("unexpected error from image %q %v: %v", diff --git a/pkg/model/components/kubeapiserver/model_test.go b/pkg/model/components/kubeapiserver/model_test.go index 7b985f51bc..6868cf2da0 100644 --- a/pkg/model/components/kubeapiserver/model_test.go +++ b/pkg/model/components/kubeapiserver/model_test.go @@ -50,7 +50,7 @@ func Test_RunKubeApiserverBuilder(t *testing.T) { builder := KubeApiserverBuilder{ KopsModelContext: kopsModelContext, - AssetBuilder: assets.NewAssetBuilder(vfs.Context, kopsModelContext.Cluster.Spec.Assets, kopsModelContext.Cluster.Spec.KubernetesVersion, false), + AssetBuilder: assets.NewAssetBuilder(vfs.Context, kopsModelContext.Cluster.Spec.Assets, false), } if err := builder.Build(context); err != nil { diff --git a/pkg/model/components/kubecontrollermanager_test.go b/pkg/model/components/kubecontrollermanager_test.go index 752baec277..c406d59e69 100644 --- a/pkg/model/components/kubecontrollermanager_test.go +++ b/pkg/model/components/kubecontrollermanager_test.go @@ -47,7 +47,7 @@ func Test_Build_KCM_Builder(t *testing.T) { c := buildCluster() c.Spec.KubernetesVersion = v - b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, c.Spec.KubernetesVersion, false) + b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, false) kcm := &KubeControllerManagerOptionsBuilder{ OptionsContext: &OptionsContext{ @@ -68,7 +68,7 @@ func Test_Build_KCM_Builder(t *testing.T) { func Test_Build_KCM_Builder_Change_Duration(t *testing.T) { c := buildCluster() - b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, c.Spec.KubernetesVersion, false) + b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, false) kcm := &KubeControllerManagerOptionsBuilder{ OptionsContext: &OptionsContext{ @@ -143,7 +143,7 @@ func Test_Build_KCM_Builder_CIDR_Mask_Size(t *testing.T) { for _, tc := range grid { t.Run(tc.PodCIDR+":"+tc.ClusterCIDR, func(t *testing.T) { c := buildCluster() - b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, c.Spec.KubernetesVersion, false) + b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, false) kcm := &KubeControllerManagerOptionsBuilder{ OptionsContext: &OptionsContext{ diff --git a/pkg/model/components/kubelet_test.go b/pkg/model/components/kubelet_test.go index ad01c61cc3..3d83860dc9 100644 --- a/pkg/model/components/kubelet_test.go +++ b/pkg/model/components/kubelet_test.go @@ -38,7 +38,7 @@ func buildKubeletTestCluster() *kops.Cluster { } func buildOptions(cluster *kops.Cluster) error { - ab := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + ab := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, false) ver, err := util.ParseKubernetesVersion(cluster.Spec.KubernetesVersion) if err != nil { diff --git a/pkg/model/components/kubescheduler/model_test.go b/pkg/model/components/kubescheduler/model_test.go index 9bcf0a121a..25330c3df2 100644 --- a/pkg/model/components/kubescheduler/model_test.go +++ b/pkg/model/components/kubescheduler/model_test.go @@ -51,7 +51,7 @@ func Test_RunKubeSchedulerBuilder(t *testing.T) { builder := KubeSchedulerBuilder{ KopsModelContext: kopsModelContext, - AssetBuilder: assets.NewAssetBuilder(vfs.Context, kopsModelContext.Cluster.Spec.Assets, kopsModelContext.Cluster.Spec.KubernetesVersion, false), + AssetBuilder: assets.NewAssetBuilder(vfs.Context, kopsModelContext.Cluster.Spec.Assets, false), } if err := builder.Build(context); err != nil { diff --git a/pkg/model/components/kubescheduler_test.go b/pkg/model/components/kubescheduler_test.go index 2e563175be..d8ac1297e7 100644 --- a/pkg/model/components/kubescheduler_test.go +++ b/pkg/model/components/kubescheduler_test.go @@ -31,7 +31,7 @@ func Test_Build_Scheduler(t *testing.T) { c := buildCluster() c.Spec.KubernetesVersion = v - b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, c.Spec.KubernetesVersion, false) + b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, false) version, err := util.ParseKubernetesVersion(v) if err != nil { diff --git a/pkg/nodemodel/wellknownassets/cni_test.go b/pkg/nodemodel/wellknownassets/cni_test.go index 071e8da7bb..f9744ebd34 100644 --- a/pkg/nodemodel/wellknownassets/cni_test.go +++ b/pkg/nodemodel/wellknownassets/cni_test.go @@ -38,7 +38,7 @@ func Test_FindCNIAssetFromEnvironmentVariable(t *testing.T) { ig := &api.InstanceGroup{} - assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, false) igModel, err := kopsmodel.ForInstanceGroup(cluster, ig) if err != nil { @@ -73,7 +73,7 @@ func Test_FindCNIAssetFromDefaults122(t *testing.T) { t.Fatalf("building instance group model: %v", err) } - assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, false) asset, err := FindCNIAssets(igModel, assetBuilder, architectures.ArchitectureAmd64) if err != nil { diff --git a/pkg/nodemodel/wellknownassets/crictl_test.go b/pkg/nodemodel/wellknownassets/crictl_test.go index 30ca2997eb..4c47546d80 100644 --- a/pkg/nodemodel/wellknownassets/crictl_test.go +++ b/pkg/nodemodel/wellknownassets/crictl_test.go @@ -40,7 +40,7 @@ func Test_FindCrictlVersionHash(t *testing.T) { t.Fatalf("building instance group model: %v", err) } - assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, false) crictlAsset, err := FindCrictlAsset(igModel, assetBuilder, architectures.ArchitectureAmd64) if err != nil { diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index cc09d99ab5..6536f1f80a 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -241,7 +241,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) (*ApplyResults, error) { clusterLifecycle = fi.LifecycleIgnore } - assetBuilder := assets.NewAssetBuilder(c.Clientset.VFSContext(), c.Cluster.Spec.Assets, c.Cluster.Spec.KubernetesVersion, c.GetAssets) + assetBuilder := assets.NewAssetBuilder(c.Clientset.VFSContext(), c.Cluster.Spec.Assets, c.GetAssets) if len(c.ControlPlaneRunningVersion) > 0 && c.ControlPlaneRunningVersion != c.Cluster.Spec.KubernetesVersion { assetBuilder.KubeletSupportedVersion = c.ControlPlaneRunningVersion } diff --git a/upup/pkg/fi/cloudup/awstasks/elastic_ip_test.go b/upup/pkg/fi/cloudup/awstasks/elastic_ip_test.go index c4156e49d3..214ab13c10 100644 --- a/upup/pkg/fi/cloudup/awstasks/elastic_ip_test.go +++ b/upup/pkg/fi/cloudup/awstasks/elastic_ip_test.go @@ -117,7 +117,7 @@ func checkNoChanges(t *testing.T, ctx context.Context, cloud fi.Cloud, allTasks KubernetesVersion: "v1.9.0", }, } - assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, false) target := fi.NewCloudupDryRunTarget(assetBuilder, os.Stderr) context, err := fi.NewCloudupContext(ctx, fi.DeletionProcessingModeDeleteIncludingDeferred, target, nil, cloud, nil, nil, nil, allTasks) if err != nil { diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go index 8acb8f392d..718fb1909b 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go @@ -164,7 +164,7 @@ func runChannelBuilderTest(t *testing.T, key string, addonManifests []string) { bcb := bootstrapchannelbuilder.NewBootstrapChannelBuilder( &kopsModel, fi.LifecycleSync, - assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false), + assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, false), templates, nil, ) diff --git a/upup/pkg/fi/cloudup/gcetasks/serviceaccount_test.go b/upup/pkg/fi/cloudup/gcetasks/serviceaccount_test.go index ca1e4e5131..2d8b57fca7 100644 --- a/upup/pkg/fi/cloudup/gcetasks/serviceaccount_test.go +++ b/upup/pkg/fi/cloudup/gcetasks/serviceaccount_test.go @@ -118,7 +118,7 @@ func doDryRun(t *testing.T, ctx context.Context, cloud fi.Cloud, allTasks map[st KubernetesVersion: "v1.23.0", }, } - assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, cluster.Spec.Assets, false) target := fi.NewCloudupDryRunTarget(assetBuilder, os.Stderr) context, err := fi.NewCloudupContext(ctx, fi.DeletionProcessingModeDeleteIncludingDeferred, target, nil, cloud, nil, nil, nil, allTasks) if err != nil { diff --git a/upup/pkg/fi/cloudup/populate_cluster_spec_test.go b/upup/pkg/fi/cloudup/populate_cluster_spec_test.go index d562fec7a7..92bdd8c43d 100644 --- a/upup/pkg/fi/cloudup/populate_cluster_spec_test.go +++ b/upup/pkg/fi/cloudup/populate_cluster_spec_test.go @@ -110,7 +110,7 @@ func TestPopulateCluster_Subnets(t *testing.T) { func mockedPopulateClusterSpec(ctx context.Context, c *kopsapi.Cluster, cloud fi.Cloud) (*kopsapi.Cluster, error) { vfs.Context.ResetMemfsContext(true) - assetBuilder := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, c.Spec.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, false) basePath, err := vfs.Context.BuildVfsPath("memfs://tests") if err != nil { return nil, fmt.Errorf("error building vfspath: %v", err) diff --git a/upup/pkg/fi/dryruntarget_test.go b/upup/pkg/fi/dryruntarget_test.go index cddbb8293e..116d0fd2ae 100644 --- a/upup/pkg/fi/dryruntarget_test.go +++ b/upup/pkg/fi/dryruntarget_test.go @@ -67,7 +67,7 @@ func (*testTask) Run(_ *CloudupContext) error { } func Test_DryrunTarget_PrintReport(t *testing.T) { - builder := assets.NewAssetBuilder(vfs.Context, nil, "1.17.3", false) + builder := assets.NewAssetBuilder(vfs.Context, nil, false) var stdout bytes.Buffer target := newDryRunTarget[CloudupSubContext](builder, &stdout) tasks := map[string]CloudupTask{} diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go index d628dee654..5590166776 100644 --- a/upup/pkg/fi/nodeup/command.go +++ b/upup/pkg/fi/nodeup/command.go @@ -348,7 +348,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error { Cloud: cloud, } case "dryrun": - assetBuilder := assets.NewAssetBuilder(vfs.Context, nil, nodeupConfig.KubernetesVersion, false) + assetBuilder := assets.NewAssetBuilder(vfs.Context, nil, false) target = fi.NewNodeupDryRunTarget(assetBuilder, out) default: return fmt.Errorf("unsupported target type %q", c.Target)