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

[CI:BUILD] rpm: remove dnsname #20790

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Nov 27, 2023

With CNI going away in v5, there's no need for dnsname in the rpm.

[NO NEW TESTS NEEDED]

Does this PR introduce a user-facing change?

None

With CNI going away in v5, there's no need for dnsname in the rpm.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Copy link
Contributor

openshift-ci bot commented Nov 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 27, 2023
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

These changes end up in podman-next once merged, right?
Is there anything to consider when removing a package? I think it might be better to hold this until we have the CNI build tag work done and disable it on default builds. Only then we should merge this as for now CNI will still work with the podman-next copr.

Unless there is a reason to do it now?

@lsm5 lsm5 marked this pull request as draft November 28, 2023 11:42
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 28, 2023
@lsm5
Copy link
Member Author

lsm5 commented Nov 28, 2023

These changes end up in podman-next once merged, right?

Yes

Is there anything to consider when removing a package?

In this particular case, podman-plugins isn't really affecting any other package. So it can be left alone and we can ask users to manually uninstall it and move on.

If we wanna force cni users on to nv/av at all, then that's another story.

I think it might be better to hold this until we have the CNI build tag work done and disable it on default builds. Only then we should merge this as for now CNI will still work with the podman-next copr.

sgtm

Unless there is a reason to do it now?

no, this can wait.

@rhatdan
Copy link
Member

rhatdan commented Dec 17, 2023

@lsm5 @Luap99 What is going on with this PR?

@lsm5
Copy link
Member Author

lsm5 commented Feb 6, 2024

containers/common#1767 is vendored into podman main branch, so I think we can go ahead with this one.

@lsm5 lsm5 marked this pull request as ready for review February 6, 2024 12:15
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 6, 2024
@lsm5
Copy link
Member Author

lsm5 commented Feb 6, 2024

@ashley-cui @Luap99 remind me please, given that we're not doing podman 5 on F 38/39, do we need to care about enabling cni buildtag in the copr build tasks in CI as well as on rhcontainerbot/podman-next copr ?

@Luap99
Copy link
Member

Luap99 commented Feb 6, 2024

#21410 was just merged so this here should be good to go

We do not want to enable cni for 5.0, this will only be done for RHEL 9 AFAIK so we do not break users there. For upstream builds we really do not want to continue to support CNI.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

@lsm5
Copy link
Member Author

lsm5 commented Feb 6, 2024

@Luap99 @rhatdan good for merge.

@rhatdan
Copy link
Member

rhatdan commented Feb 7, 2024

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 7, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2024
@lsm5
Copy link
Member Author

lsm5 commented Feb 7, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 7, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit caee76e into containers:main Feb 7, 2024
1 check passed
@lsm5 lsm5 deleted the rpm-remove-dnsname branch February 7, 2024 15:06
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label May 8, 2024
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators May 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants