Skip to content

Commit 4a63a11

Browse files
justinsbjustinsb
committed
Remove unusued kubernetesVersion from AssetBuilder
This field is no longer used, and can be removed.
1 parent 6dfbd46 commit 4a63a11

26 files changed

+29
-48
lines changed

‎clusterapi/bootstrap/controllers/kopsconfig_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func (r *KopsConfigReconciler) buildBootstrapData(ctx context.Context) ([]byte,
191191
ig.Spec.Role = kops.InstanceGroupRoleNode
192192

193193
getAssets := false
194-
assetBuilder := assets.NewAssetBuilder(vfsContext, cluster.Spec.Assets, cluster.Spec.KubernetesVersion, getAssets)
194+
assetBuilder := assets.NewAssetBuilder(vfsContext, cluster.Spec.Assets, getAssets)
195195

196196
encryptionConfigSecretHash := ""
197197
// if fi.ValueOf(c.Cluster.Spec.EncryptionConfig) {

‎cmd/kops/create_cluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
651651
return err
652652
}
653653

654-
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false)
654+
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, false)
655655
fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, cluster, instanceGroups, cloud, assetBuilder)
656656
if err != nil {
657657
return err

‎cmd/kops/edit_cluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ func updateCluster(ctx context.Context, clientset simple.Clientset, oldCluster,
263263
return "", fmt.Errorf("error populating configuration: %v", err)
264264
}
265265

266-
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), newCluster.Spec.Assets, newCluster.Spec.KubernetesVersion, false)
266+
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), newCluster.Spec.Assets, false)
267267
fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, newCluster, instanceGroups, cloud, assetBuilder)
268268
if err != nil {
269269
return fmt.Sprintf("error populating cluster spec: %s", err), nil

‎cmd/kops/edit_instancegroup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ func updateInstanceGroup(ctx context.Context, clientset simple.Clientset, channe
295295
return "", fmt.Errorf("error populating configuration: %v", err)
296296
}
297297

298-
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false)
298+
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, false)
299299
fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, cluster, []*api.InstanceGroup{newGroup}, cloud, assetBuilder)
300300
if err != nil {
301301
return fmt.Sprintf("error populating cluster spec: %s", err), nil

‎nodeup/pkg/model/kubelet_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ func BuildNodeupModelContext(model *testutils.Model) (*NodeupModelContext, error
293293
func mockedPopulateClusterSpec(ctx context.Context, c *kops.Cluster, instanceGroups []*kops.InstanceGroup, cloud fi.Cloud) (*kops.Cluster, error) {
294294
vfs.Context.ResetMemfsContext(true)
295295

296-
assetBuilder := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, c.Spec.KubernetesVersion, false)
296+
assetBuilder := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, false)
297297
basePath, err := vfs.Context.BuildVfsPath("memfs://tests")
298298
if err != nil {
299299
return nil, fmt.Errorf("error building vfspath: %v", err)

‎pkg/assets/builder.go‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,11 @@ import (
2525
"strings"
2626
"time"
2727

28-
"github.com/blang/semver/v4"
2928
"github.com/google/go-containerregistry/pkg/authn"
3029
"github.com/google/go-containerregistry/pkg/crane"
3130
"k8s.io/apimachinery/pkg/util/wait"
3231
"k8s.io/klog/v2"
3332
"k8s.io/kops/pkg/apis/kops"
34-
"k8s.io/kops/pkg/apis/kops/util"
3533
"k8s.io/kops/pkg/assets/assetdata"
3634
"k8s.io/kops/pkg/featureflag"
3735
"k8s.io/kops/pkg/kubemanifest"
@@ -48,9 +46,6 @@ type AssetBuilder struct {
4846
AssetsLocation *kops.AssetsSpec
4947
GetAssets bool
5048

51-
// KubernetesVersion is the version of kubernetes we are installing
52-
KubernetesVersion semver.Version
53-
5449
// KubeletSupportedVersion is the max version of kubelet that we are currently allowed to run on worker nodes.
5550
// This is used to avoid violating the kubelet supported version skew policy,
5651
// (we are not allowed to run a newer kubelet on a worker node than the control plane)
@@ -119,20 +114,13 @@ type FileAsset struct {
119114
}
120115

121116
// NewAssetBuilder creates a new AssetBuilder.
122-
func NewAssetBuilder(vfsContext *vfs.VFSContext, assets *kops.AssetsSpec, kubernetesVersion string, getAssets bool) *AssetBuilder {
117+
func NewAssetBuilder(vfsContext *vfs.VFSContext, assets *kops.AssetsSpec, getAssets bool) *AssetBuilder {
123118
a := &AssetBuilder{
124119
vfsContext: vfsContext,
125120
AssetsLocation: assets,
126121
GetAssets: getAssets,
127122
}
128123

129-
version, err := util.ParseKubernetesVersion(kubernetesVersion)
130-
if err != nil {
131-
// This should have already been validated
132-
klog.Fatalf("unexpected error from ParseKubernetesVersion %s: %v", kubernetesVersion, err)
133-
}
134-
a.KubernetesVersion = *version
135-
136124
return a
137125
}
138126

‎pkg/assets/builder_test.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"testing"
2323

2424
"k8s.io/kops/pkg/apis/kops"
25-
"k8s.io/kops/pkg/apis/kops/util"
2625
"k8s.io/kops/pkg/testutils/golden"
2726
)
2827

@@ -78,9 +77,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToSimplifiedKubernetesURL(t *
7877
proxyURL := "proxy.example.com/"
7978
image := "registry.k8s.io/kube-apiserver"
8079
expected := "proxy.example.com/kube-apiserver"
81-
version, _ := util.ParseKubernetesVersion("1.10")
8280

83-
builder.KubernetesVersion = *version
8481
builder.AssetsLocation.ContainerProxy = &proxyURL
8582

8683
remapped, err := builder.RemapImage(image)
@@ -118,9 +115,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToImagesWithTags(t *testing.T
118115
proxyURL := "proxy.example.com/"
119116
image := "registry.k8s.io/kube-apiserver:1.2.3"
120117
expected := "proxy.example.com/kube-apiserver:1.2.3"
121-
version, _ := util.ParseKubernetesVersion("1.10")
122118

123-
builder.KubernetesVersion = *version
124119
builder.AssetsLocation.ContainerProxy = &proxyURL
125120

126121
remapped, err := builder.RemapImage(image)
@@ -139,9 +134,7 @@ func TestValidate_RemapImage_ContainerRegistry_MappingMultipleTimesConverges(t *
139134
mirrorURL := "proxy.example.com"
140135
image := "kube-apiserver:1.2.3"
141136
expected := "proxy.example.com/kube-apiserver:1.2.3"
142-
version, _ := util.ParseKubernetesVersion("1.10")
143137

144-
builder.KubernetesVersion = *version
145138
builder.AssetsLocation.ContainerRegistry = &mirrorURL
146139

147140
remapped := image

‎pkg/commands/helpers_readwrite.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func UpdateCluster(ctx context.Context, clientset simple.Clientset, cluster *kop
4040
return fmt.Errorf("error populating configuration: %v", err)
4141
}
4242

43-
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false)
43+
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, false)
4444
fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, cluster, instanceGroups, cloud, assetBuilder)
4545
if err != nil {
4646
return err
@@ -78,7 +78,7 @@ func UpdateInstanceGroup(ctx context.Context, clientset simple.Clientset, cluste
7878
return fmt.Errorf("error populating configuration: %v", err)
7979
}
8080

81-
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, cluster.Spec.KubernetesVersion, false)
81+
assetBuilder := assets.NewAssetBuilder(clientset.VFSContext(), cluster.Spec.Assets, false)
8282
fullCluster, err := cloudup.PopulateClusterSpec(ctx, clientset, cluster, allInstanceGroups, cloud, assetBuilder)
8383
if err != nil {
8484
return err

‎pkg/instancegroups/rollingupdate_os_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func getTestSetupOS(t *testing.T, ctx context.Context) (*RollingUpdateCluster, *
5555
t.Fatalf("Failed to perform assignments: %v", err)
5656
}
5757

58-
assetBuilder := assets.NewAssetBuilder(vfs.Context, inCluster.Spec.Assets, inCluster.Spec.KubernetesVersion, false)
58+
assetBuilder := assets.NewAssetBuilder(vfs.Context, inCluster.Spec.Assets, false)
5959
basePath, _ := vfs.Context.BuildVfsPath(inCluster.Spec.ConfigStore.Base)
6060
clientset := vfsclientset.NewVFSClientset(vfs.Context, basePath)
6161
cluster, err := cloudup.PopulateClusterSpec(ctx, clientset, inCluster, nil, mockcloud, assetBuilder)

‎pkg/model/components/containerd_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func Test_Build_Containerd_Supported_Version(t *testing.T) {
4545
for _, v := range kubernetesVersions {
4646

4747
c := buildContainerdCluster(v)
48-
b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, c.Spec.KubernetesVersion, false)
48+
b := assets.NewAssetBuilder(vfs.Context, c.Spec.Assets, false)
4949

5050
version, err := util.ParseKubernetesVersion(v)
5151
if err != nil {

0 commit comments

Comments
 (0)