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.

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

[release/v1.5] Cherry-pick changes from 2022-08-30 to 2022-09-20 #2357

Merged
merged 7 commits into from
Sep 20, 2022

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Sep 20, 2022

What this PR does / why we need it:

This PR cherry-picks the relevant changes made from 2022-08-30 to 2022-09-20 to the release/v1.5 branch:

What type of PR is this?

/kind bug
/kind cleanup

Does this PR introduce a user-facing change? Then add your Release Note here:

Fix NPE when machine-controller deployment is disabled
Fix NPE with Operating System Manager (OSM) when the KubeOneCluster v1beta1 API is used
Explicitly disable Operating System Manager (OSM) when the KubeOneCluster v1beta1 is used
Recreate SSH connection in the case of errors with session
Update the kubernetes-cni package from 0.8.7 to 1.1.1 to support the latest Kubernetes patch releases

Documentation:

NONE

And fix fails along the way

Signed-off-by: Artiom Diomin <kron82@gmail.com>

Signed-off-by: Artiom Diomin <kron82@gmail.com>
Initialize OperatingSystemManager in KubeOneCluster regardless if
MachineController enabled or not.

Signed-off-by: Artiom Diomin <kron82@gmail.com>

Signed-off-by: Artiom Diomin <kron82@gmail.com>
)

Signed-off-by: Artiom Diomin <kron82@gmail.com>

Signed-off-by: Artiom Diomin <kron82@gmail.com>
Signed-off-by: Artiom Diomin <kron82@gmail.com>

Signed-off-by: Artiom Diomin <kron82@gmail.com>
Signed-off-by: Artiom Diomin <kron82@gmail.com>

Signed-off-by: Artiom Diomin <kron82@gmail.com>
Signed-off-by: Artiom Diomin <kron82@gmail.com>

Signed-off-by: Artiom Diomin <kron82@gmail.com>
Signed-off-by: Artiom Diomin <kron82@gmail.com>

Signed-off-by: Artiom Diomin <kron82@gmail.com>
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.5 milestone Sep 20, 2022
@kubermatic-bot kubermatic-bot added kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 20, 2022
@xmudrii xmudrii changed the title Cherry-pick changes from 2022-08-30 to 2022-09-20 to the release/v1.5 branch [release/v1.5] Cherry-pick changes from 2022-08-30 to 2022-09-20 Sep 20, 2022
@kron4eg
Copy link
Member

kron4eg commented Sep 20, 2022

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2022
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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
Copy link
Contributor

LGTM label has been added.

Git tree hash: d4dcaec76147eb7f8106f043c0c4ddb9ae2c09b4

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 20, 2022
@kubermatic-bot kubermatic-bot merged commit c99c471 into release/v1.5 Sep 20, 2022
@kubermatic-bot kubermatic-bot deleted the cps-1.5 branch September 20, 2022 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. kind/bug Categorizes issue or PR as related to a bug. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants