Merge pull request #11867 from hakman/remove_addon_version

Remove version from addons
kubernetes · Jun 25, 2021 · e5185b2 · e5185b2
2 parents ba1e486 + 580129c
commit e5185b2
Show file tree

Hide file tree

Showing 30 changed files with 90 additions and 613 deletions.
diff --git a/channels/pkg/api/BUILD.bazel b/channels/pkg/api/BUILD.bazel
diff --git a/channels/pkg/api/channel.go b/channels/pkg/api/channel.go
@@ -19,7 +19,6 @@ package api
 import (
 	"fmt"
 
-	"github.com/blang/semver/v4"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kops/pkg/values"
 )
@@ -44,9 +43,6 @@ type AddonSpec struct {
 	// Selector is a label query over pods that should match the Replicas count.
 	Selector map[string]string `json:"selector"`
 
-	// Version is a semver version
-	Version *string `json:"version,omitempty"`
-
 	// Manifest is the URL to the manifest that should be applied
 	Manifest *string `json:"manifest,omitempty"`
 
@@ -78,17 +74,6 @@ func (a *Addons) Verify() error {
 		if addon == nil {
 			continue
 		}
-		if addon.Version != nil && *addon.Version != "" {
-			name := a.ObjectMeta.Name
-			if addon.Name != nil {
-				name = *addon.Name
-			}
-
-			_, err := semver.ParseTolerant(*addon.Version)
-			if err != nil {
-				return fmt.Errorf("addon %q has unparseable version %q: %v", name, *addon.Version, err)
-			}
-		}
 		if addon.KubernetesVersion != "" {
 			return fmt.Errorf("bootstrap addon %q has a KubernetesVersion", values.StringValue(addon.Name))
 		}

diff --git a/channels/pkg/api/channel_test.go b/channels/pkg/api/channel_test.go
diff --git a/channels/pkg/channels/BUILD.bazel b/channels/pkg/channels/BUILD.bazel
diff --git a/channels/pkg/channels/addon.go b/channels/pkg/channels/addon.go
@@ -82,7 +82,6 @@ func (m *AddonMenu) MergeAddons(o *AddonMenu) {
 func (a *Addon) ChannelVersion() *ChannelVersion {
 	return &ChannelVersion{
 		Channel:      &a.ChannelName,
-		Version:      a.Spec.Version,
 		Id:           a.Spec.Id,
 		ManifestHash: a.Spec.ManifestHash,
 	}

diff --git a/channels/pkg/channels/addons.go b/channels/pkg/channels/addons.go
@@ -57,20 +57,6 @@ func ParseAddons(name string, location *url.URL, data []byte) (*Addons, error) {
 		}
 	}
 
-	for _, addon := range apiObject.Spec.Addons {
-		if addon != nil && addon.Version != nil && *addon.Version != "" {
-			name := apiObject.ObjectMeta.Name
-			if addon.Name != nil {
-				name = *addon.Name
-			}
-
-			_, err := semver.ParseTolerant(*addon.Version)
-			if err != nil {
-				return nil, fmt.Errorf("addon %q has unparseable version %q: %v", name, *addon.Version, err)
-			}
-		}
-	}
-
 	return &Addons{ChannelName: name, ChannelLocation: *location, APIObject: apiObject}, nil
 }