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

salt: Ensure that MetalK8s package do not get removed as unused dep #3850

Merged

Conversation

TeddyAndrieux
Copy link
Collaborator

Ensure that on RHEL 8 based OS, packages installed by MetalK8s
are marked as "installed by user" so that they do not get removed
as "unused dependencies".

This commit also fixes a bug where the kubelet package gets removed
in post-upgrade step that removes the calico-cni-plugin package.

See: saltstack/salt#62441

Ensure that on RHEL 8 based OS, packages installed by MetalK8s
are marked as "installed by user" so that they do not get removed
as "unused dependencies".

This commit also fix a bug where the `kubelet` package get removed
in post-upgrade step that remove the `calico-cni-plugin` package.

See: saltstack/salt#62441
@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner August 9, 2022 12:19
@bert-e
Copy link
Contributor

bert-e commented Aug 9, 2022

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Aug 9, 2022

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

@bert-e
Copy link
Contributor

bert-e commented Aug 9, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Aug 9, 2022

Build failed

The build for commit did not succeed in branch w/124.0/bugfix/do-not-remove-kubelet-during-upgrade.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 9, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/123.0

  • ✔️ development/124.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 9, 2022

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/123.0

  • ✔️ development/124.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 073a3ad into development/123.0 Aug 9, 2022
@bert-e bert-e deleted the bugfix/do-not-remove-kubelet-during-upgrade branch August 9, 2022 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants