diff --git a/cluster/defaults.go b/cluster/defaults.go index 7398f70a..6fad737b 100644 --- a/cluster/defaults.go +++ b/cluster/defaults.go @@ -3,7 +3,6 @@ package cluster import ( "context" - ref "github.com/docker/distribution/reference" "github.com/rancher/rke/log" "github.com/rancher/rke/services" "github.com/rancher/types/apis/management.cattle.io/v3" @@ -85,26 +84,10 @@ func (c *Cluster) setClusterDefaults(ctx context.Context) { } c.setClusterImageDefaults() - c.setClusterKubernetesImageVersion(ctx) c.setClusterServicesDefaults() c.setClusterNetworkDefaults() } -func (c *Cluster) setClusterKubernetesImageVersion(ctx context.Context) { - k8sImageNamed, _ := ref.ParseNormalizedNamed(c.SystemImages.Kubernetes) - // Kubernetes image is already set by c.setClusterImageDefaults(), - // I will override it here if Version is set. - var VersionedImageNamed ref.NamedTagged - if c.Version != "" { - VersionedImageNamed, _ = ref.WithTag(ref.TrimNamed(k8sImageNamed), c.Version) - c.SystemImages.Kubernetes = VersionedImageNamed.String() - } - normalizedSystemImage, _ := ref.ParseNormalizedNamed(c.SystemImages.Kubernetes) - if normalizedSystemImage.String() != k8sImageNamed.String() { - log.Infof(ctx, "Overrding Kubernetes image [%s] with tag [%s]", VersionedImageNamed.Name(), VersionedImageNamed.Tag()) - } -} - func (c *Cluster) setClusterServicesDefaults() { serviceConfigDefaultsMap := map[*string]string{ &c.Services.KubeAPI.ServiceClusterIPRange: DefaultServiceClusterIPRange,