Skip to content
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

Jump to bottom

Default upgrade #6899

Merged
merged 4 commits into from
Apr 30, 2021
Merged

Default upgrade #6899

merged 4 commits into from
Apr 30, 2021

Conversation

emmanuel-kubermatic
Copy link

@emmanuel-kubermatic emmanuel-kubermatic commented Apr 16, 2021 •
edited by irozzo-1A
Loading

What this PR does / why we need it:
The PR fixes #6683 and allows default upgrades on startup

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #6683

Special notes for your reviewer:

Documentation:

https://github.com/kubermatic/kubermatic/blob/master/docs/dev-getting-started.md

Does this PR introduce a user-facing change?:

Fix default version configuration to have automatic upgrade from Kubernetes 1.16 to 1.17.

@kubermatic-bot kubermatic-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 16, 2021
@emmanuel-kubermatic emmanuel-kubermatic changed the base branch from master to release/v2.16 April 16, 2021 11:19
@kubermatic-bot kubermatic-bot added sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 16, 2021
@kubermatic-bot kubermatic-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 16, 2021
@irozzo-1A
Copy link
Contributor

@emmanuel-kubermatic Overall LGTM. In order to fix the failing tests you should run:

hack/update-docs.sh
hack/update-kubermatic-chart.sh

and:

gofmt -s -w pkg/controller/operator/common/defaults.go

@emmanuel-kubermatic
Copy link
Author

emmanuel-kubermatic commented Apr 16, 2021 via email

@kubermatic-bot kubermatic-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 22, 2021
irozzo-1A
irozzo-1A reviewed Apr 30, 2021
View reviewed changes
pkg/controller/operator/common/defaults.go Outdated
@@ -190,6 +190,8 @@ var (
DefaultKubernetesVersioning = operatorv1alpha1.KubermaticVersioningConfiguration{
Default: semver.MustParse("v1.19.3"),
Versions: []*semver.Version{
// Kubernetes 1.16
semver.MustParse("v1.16.13"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mmm, I was thinking that putting back a v1.16 version just to put the auto-upgrade from 1.15 to 1.16 does not seem to be a good option. This version will be visible to users. I think that for the long term we should rework the auto-upgrade mechanism to cover the case where the destination minor version is not supported, but for the moment I would just remove this and the auto-upgrade 1.15 -> 1.16, customers that still have 1.15 clusters will need to override the default settings to be able to upgrade. WDYT?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine

If that cluster version is Out Of Life, no point for the customer using it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, you can remove this version then

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed those and updating the docs for the next push

irozzo-1A
irozzo-1A reviewed Apr 30, 2021
View reviewed changes
charts/kubermatic/static/master/versions.yaml Outdated
Comment on lines 4 to 5
- type: kubernetes
version: 1.16.13
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember to remove this too, and to regenerate the charts ;-)

@emmanuel-kubermatic
Copy link
Author

emmanuel-kubermatic commented Apr 30, 2021 via email

@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 30, 2021
@irozzo-1A
Copy link
Contributor

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2021
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 327755ec1d476fb75684318cbd5d25c538cbe1fa

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: emmanuel-kubermatic, irozzo-1A

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 30, 2021
@irozzo-1A
Copy link
Contributor

/retest

@kubermatic-bot kubermatic-bot merged commit f82c685 into kubermatic:release/v2.16 Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@irozzo-1A irozzo-1A irozzo-1A left review comments

Assignees

@irozzo-1A irozzo-1A

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix default version settings for operator
3 participants
@emmanuel-kubermatic @irozzo-1A @kubermatic-bot