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

[release/v1.9] Cherry-pick the required fixes for the release/v1.9 branch #3547

Merged
merged 7 commits into from
Jan 30, 2025
Merged

[release/v1.9] Cherry-pick the required fixes for the release/v1.9 branch #3547

merged 7 commits into from
Jan 30, 2025

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented Jan 30, 2025

What this PR does / why we need it:

This is a manual cherry-pick of several PRs from the main branch. These PRs include some important bug fixes.

What type of PR is this?
/kind chore

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

#3522: Add parameter `insecure` to the `backups-restic` addon used to disable/skip the TLS verification
#3534: Resolve the `clusterID` conflicts in cloud-config for AWS by prioritizing the cluster name from the Terraform configuration
#3537: Drop trailing slash from the `VSPHERE_SERVER` variable to ensure compatibility with machine-controller and vSphere CCM and CSI
#3529: Fix incorrect image references in the Kubevirt CSI addon
#3545: Fix incorrect tolerations in the Kubevirt CSI addon
#3546: Update machine-controller to v1.61.0
#3544: Label the control plane nodes before applying addons and Helm charts to allow addons and Helm charts to utilize the label selectors

Documentation:

NONE

/assign @moadqassem

steled and others added 7 commits January 30, 2025 18:42
@steled @kron4eg @xmudrii
feat: add flag to skip TLS verification (#3522)
266c6fc 
* feat: add flag to skip TLS verification

Signed-off-by: Stephan <[email protected]>

* Update addons/backups-restic/backups-restic.yaml

Co-authored-by: Artiom Diomin <[email protected]>
Signed-off-by: Stephan <[email protected]>

---------

Signed-off-by: Stephan <[email protected]>
Co-authored-by: Artiom Diomin <[email protected]>
@mohamed-rafraf @xmudrii
fix cloud config defaulting before terraform config apply (#3534)
e30801a
@kron4eg @xmudrii
Make sure no slash at the end of vcenterPrefix (#3537)
6b96c93 
Signed-off-by: Artiom Diomin <[email protected]>
@mohamed-rafraf @xmudrii
Fix kubevirt csi addon template (#3529)
636b067 
* fix kubevirt csi addon template

* update internal images in template

* update internal images in template

* fix labels

* update addons

* update addons sa
@mohamed-rafraf @xmudrii
fix toleration (#3545)
735a1a6
@mohamed-rafraf @xmudrii
update Machine controller image (#3546)
05907a0 
* update Machine controller image

Signed-off-by: Mohamed Rafraf <[email protected]>

* update go.mod

---------

Signed-off-by: Mohamed Rafraf <[email protected]>
@mohamed-rafraf @xmudrii
labeling control-plane before (#3544)
441c3a0
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.9 milestone Jan 30, 2025
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/chore Updating grunt tasks etc; no production code changes. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 30, 2025
@xmudrii xmudrii changed the title [release/v1.9] Cherry-pick the required fixed for the release/v1.9 branch [release/v1.9] Cherry-pick the required fixes for the release/v1.9 branch Jan 30, 2025
moadqassem
moadqassem approved these changes Jan 30, 2025
View reviewed changes
Copy link
Member

@moadqassem moadqassem left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

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

LGTM label has been added.

Git tree hash: 9ff48d3bd4f2651b2e76238ccb3164bc466b88d5

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: moadqassem

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 Jan 30, 2025
@xmudrii xmudrii added the cherry-pick-approved Indicates a PR has been approved by release managers. label Jan 30, 2025
@kubermatic-bot kubermatic-bot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 30, 2025
@kubermatic-bot kubermatic-bot merged commit d807014 into release/v1.9 Jan 30, 2025
14 checks passed
@kubermatic-bot kubermatic-bot deleted the cherry-picks-1.9.2 branch January 30, 2025 18:50
@BrewTestBot BrewTestBot mentioned this pull request Feb 5, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@moadqassem moadqassem moadqassem approved these changes

Assignees

@moadqassem moadqassem

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a PR has been approved by release managers. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/chore Updating grunt tasks etc; no production code changes. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
KubeOne 1.9
Development

Successfully merging this pull request may close these issues.
6 participants
@xmudrii @kubermatic-bot @moadqassem @steled @mohamed-rafraf @kron4eg