Skip to content

fix: kops upgrade cluster kubernetes selection logic #16897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2024
Merged

fix: kops upgrade cluster kubernetes selection logic #16897

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion cmd/kops/upgrade_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,24 @@ func RunUpgradeCluster(ctx context.Context, f *util.Factory, out io.Writer, opti
klog.Warningf("error parsing KubernetesVersion %q", cluster.Spec.KubernetesVersion)
}
}

// Check if there is an upgraded kubernetes version recommended by the channel
if proposedKubernetesVersion == nil {
proposedKubernetesVersion = kopsapi.RecommendedKubernetesVersion(channel, kops.Version)
if currentKubernetesVersion != nil {
versionInfo := kopsapi.FindKubernetesVersionSpec(channel.Spec.KubernetesVersions, *currentKubernetesVersion)
if versionInfo == nil {
klog.Warningf("unable to find version information for kubernetes version %v in channel", *currentKubernetesVersion)
} else {
proposedKubernetesVersion, err = kopsutil.ParseKubernetesVersion(versionInfo.RecommendedVersion)
if err != nil {
klog.Warningf("error parsing KubernetesVersion %q", versionInfo.RecommendedVersion)
}
}
} else {
// fallback to recommended version by kOps version, but this is not the usual path
proposedKubernetesVersion = kopsapi.RecommendedKubernetesVersion(channel, kops.Version)
klog.V(2).Infof("kubernetes version %q is recommended by channel %q", channelLocation, proposedKubernetesVersion)
}
}

// We won't propose a downgrade
Expand Down
Loading