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.2] Remove duplicate file resource from flatcar OSP #319

Merged
merged 1 commit into from
Oct 12, 2023
Merged

[release/v1.2] Remove duplicate file resource from flatcar OSP #319

merged 1 commit into from
Oct 12, 2023

Conversation

embik
Copy link
Member

@embik embik commented Oct 11, 2023

What this PR does / why we need it:
Manual cherry-pick of #314.

Which issue(s) this PR fixes:

Fixes #313

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:

Fix an issue where `setup.service` unit was colliding with the file declaration for default flatcar OSP

Documentation:

NONE

@ahmedwaleedmalik @embik
[release/v1.2] Remove duplicate file resource from flatcar OSP (kuber…
86886b1 
…matic#314)

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@embik embik self-assigned this Oct 11, 2023
@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. sig/osm Denotes a PR or issue as being assigned to SIG OSM. labels Oct 11, 2023
@embik
Copy link
Member Author

embik commented Oct 11, 2023

/hold

until full verification in dev.

@kubermatic-bot kubermatic-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Oct 11, 2023
@embik
Copy link
Member Author

embik commented Oct 11, 2023

/hold cancel

fix looks good.

@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 Oct 11, 2023
ahmedwaleedmalik
ahmedwaleedmalik approved these changes Oct 12, 2023
View reviewed changes
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik 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 Oct 12, 2023
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik

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: 6733eb6d170ef88eb23751e99128d1f97e2e1db9

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 12, 2023
@kubermatic-bot kubermatic-bot merged commit 20c9159 into kubermatic:release/v1.2 Oct 12, 2023
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahmedwaleedmalik ahmedwaleedmalik ahmedwaleedmalik approved these changes

Assignees

@embik embik

@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. kind/bug Categorizes issue or PR as related to a bug. 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/osm Denotes a PR or issue as being assigned to SIG OSM. 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.

None yet
3 participants
@embik @kubermatic-bot @ahmedwaleedmalik