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

Hotfix: cloud-init broken flags #381

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Hotfix: cloud-init broken flags #381

merged 1 commit into from
Apr 30, 2024

Conversation

ahmedwaleedmalik
Copy link
Member

What this PR does / why we need it:
The latest Ubuntu 22.04 images ship with cloud-init v24.1.3 which had a breaking change silently shipped into it. This PR fixes the default OSPs to make them compatible with the changes in cloud-init while retaining the old behavior for machines with older version of cloud-init.

Which issue(s) this PR fixes:

Fixes #

What type of PR is this?

/kind bug

Special notes for your reviewer:

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

* Update OSPs to make them compatible with the latest cloud-init package
* [ACTION REQUIRED] The latest Ubuntu 22.04 images ship with cloud-init 24.x package. This package has breaking changes and thus rendered our OSPs as incompatible. It's recommended to refresh your machines with latest provided OSPs to ensure that a system-wide package update, that updates cloud-init to 24.x, doesn't break the machines.

Documentation:

NONE

@ahmedwaleedmalik ahmedwaleedmalik self-assigned this Apr 30, 2024
@kubermatic-bot kubermatic-bot added release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. kind/bug Categorizes issue or PR as related to a bug. docs/none Denotes a PR that doesn't need documentation (changes). dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 30, 2024
@ahmedwaleedmalik
Copy link
Member Author

/hold testing something

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2024
@ahmedwaleedmalik
Hotfix: cloud-init broken flags
5a169cd 
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik
Copy link
Member Author

/unhold

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2024
xrstf
xrstf approved these changes Apr 30, 2024
View reviewed changes
Copy link
Contributor

@xrstf xrstf left a comment

Choose a reason for hiding this comment

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

/approve

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

LGTM label has been added.

Git tree hash: f8bf09cffb5c41b90d4b8021e85663e9f5dc631c

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xrstf

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, 2024
@kubermatic-bot kubermatic-bot merged commit 0af4cf8 into kubermatic:main Apr 30, 2024
11 checks passed
@xrstf
Copy link
Contributor

xrstf commented Apr 30, 2024

/cherrypick release/v1.3

@xrstf
Copy link
Contributor

xrstf commented Apr 30, 2024

/cherrypick release/v1.4

@xrstf
Copy link
Contributor

xrstf commented Apr 30, 2024

/cherrypick release/v1.5

This was referenced Apr 30, 2024
Merged
Merged
@kubermatic-bot
Copy link
Contributor

@xrstf: new pull request created: #382

In response to this:

/cherrypick release/v1.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot
Copy link
Contributor

@xrstf: new pull request created: #383

In response to this:

/cherrypick release/v1.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot kubermatic-bot mentioned this pull request Apr 30, 2024
Merged
@kubermatic-bot
Copy link
Contributor

@xrstf: new pull request created: #384

In response to this:

/cherrypick release/v1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ahmedwaleedmalik ahmedwaleedmalik deleted the hotfix/cloud-init-init branch April 30, 2024 12:23
@xrstf
Copy link
Contributor

xrstf commented Apr 30, 2024

/cherrrypick release/v1.2

@xrstf
Copy link
Contributor

xrstf commented Apr 30, 2024

/cherrypick release/v1.2

damn pirate mode

@kubermatic-bot
Copy link
Contributor

@xrstf: #381 failed to apply on top of branch "release/v1.2":

Applying: Hotfix: cloud-init broken flags
Using index info to reconstruct a base tree...
M	deploy/osps/default/osp-amzn2.yaml
M	deploy/osps/default/osp-centos.yaml
M	deploy/osps/default/osp-rhel.yaml
M	deploy/osps/default/osp-rockylinux.yaml
M	deploy/osps/default/osp-ubuntu.yaml
M	pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml
M	pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml
M	pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml
M	pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack-IPv6+IPv4.yaml
M	pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack.yaml
M	pkg/controllers/osc/testdata/secret-kubelet-configuration-containerd-bootstrap.yaml
M	pkg/controllers/osc/testdata/secret-rhel-8.x-azure-containerd-bootstrap.yaml
M	pkg/controllers/osc/testdata/secret-ubuntu-aws-containerd-bootstrap.yaml
M	pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-IPv6+IPv4-bootstrap.yaml
M	pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-bootstrap.yaml
Falling back to patching base and 3-way merge...
Auto-merging pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-bootstrap.yaml
CONFLICT (content): Merge conflict in pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-bootstrap.yaml
Auto-merging pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-IPv6+IPv4-bootstrap.yaml
CONFLICT (content): Merge conflict in pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-IPv6+IPv4-bootstrap.yaml
Auto-merging pkg/controllers/osc/testdata/secret-ubuntu-aws-containerd-bootstrap.yaml
CONFLICT (content): Merge conflict in pkg/controllers/osc/testdata/secret-ubuntu-aws-containerd-bootstrap.yaml
Auto-merging pkg/controllers/osc/testdata/secret-rhel-8.x-azure-containerd-bootstrap.yaml
CONFLICT (content): Merge conflict in pkg/controllers/osc/testdata/secret-rhel-8.x-azure-containerd-bootstrap.yaml
Auto-merging pkg/controllers/osc/testdata/secret-kubelet-configuration-containerd-bootstrap.yaml
CONFLICT (content): Merge conflict in pkg/controllers/osc/testdata/secret-kubelet-configuration-containerd-bootstrap.yaml
Auto-merging pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack.yaml
Auto-merging pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack-IPv6+IPv4.yaml
Auto-merging pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml
Auto-merging pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml
Auto-merging pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml
Auto-merging deploy/osps/default/osp-ubuntu.yaml
Auto-merging deploy/osps/default/osp-rockylinux.yaml
Auto-merging deploy/osps/default/osp-rhel.yaml
Auto-merging deploy/osps/default/osp-centos.yaml
Auto-merging deploy/osps/default/osp-amzn2.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Hotfix: cloud-init broken flags
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v1.2

damn pirate mode

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

xrstf pushed a commit to xrstf/operating-system-manager that referenced this pull request Apr 30, 2024
@ahmedwaleedmalik @xrstf
[release/v1.2] Hotfix: cloud-init broken flags (kubermatic#381)
3d980cc
@xrstf xrstf mentioned this pull request Apr 30, 2024
Merged
kubermatic-bot pushed a commit that referenced this pull request Apr 30, 2024
@xrstf @ahmedwaleedmalik
[release/v1.2] Hotfix: cloud-init broken flags / bump version to 1.2.5 (
a96954b 
#381) (#385)

* [release/v1.2] Hotfix: cloud-init broken flags (#381)

* bump version to 1.2.5

---------

Co-authored-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
This was referenced Apr 30, 2024
Merged
Merged
Merged
Merged
Merged
@ahmedwaleedmalik ahmedwaleedmalik mentioned this pull request Apr 30, 2024
Merged
@archups archups mentioned this pull request May 2, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@embik embik embik left review comments

@xrstf xrstf xrstf approved these changes

Assignees

@xrstf xrstf

@ahmedwaleedmalik ahmedwaleedmalik

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. docs/none Denotes a PR that doesn't need documentation (changes). kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ahmedwaleedmalik @kubermatic-bot @xrstf @embik