Do not conflict kubernetes-cni package for RPMs

[saschagrunert]

What type of PR is this?

/kind regression

What this PR does / why we need it:

This should unbreak previous releases for debs and rpms which still rely
on the kubernetes-cni package.

Which issue(s) this PR fixes:

Fixes kubernetes/kubernetes#92242

Special notes for your reviewer:

Hold on, I might be completely wrong with that change. I'm not exactly sure about the implications so please review with care.

Does this PR introduce a user-facing change?

- Fixed `kubernetes-cni` obsoletion/replacement to unbreak previous deb/rpm packages

[saschagrunert]

/hold

I'm not sure about this solution.

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: saschagrunert
To complete the pull request process, please assign idealhack
You can assign the PR to them by writing /assign @idealhack in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• cmd/kubepkg/OWNERS
• packages/rpm/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[saschagrunert]

Added the review suggestions, please take a look.

[dkoshkin]

@saschagrunert I just tried this on a personal repo having just Conflicts.
With this change it installs older versions correctly.
But the newer versions would require users to uninstall kubernetes-cni on upgrades.

[root@92b03c1accbf bin]# yum install kubelet-1.17.7-0
Loaded plugins: fastestmirror, ovl
Loading mirror speeds from cached hostfile
 * base: mirror.keystealth.org
 * extras: mirror.sfo12.us.leaseweb.net
 * updates: mirror.web-ster.com
Resolving Dependencies
--> Running transaction check
---> Package kubelet.x86_64 0:1.16.3-0 will be updated
---> Package kubelet.x86_64 0:1.17.7-0 will be an update
--> Processing Conflict: kubelet-1.17.7-0.x86_64 conflicts kubernetes-cni
--> Finished Dependency Resolution
Error: kubelet conflicts with kubernetes-cni-0.7.5-0.x86_64
 You could try using --skip-broken to work around the problem
 You could try running: rpm -Va --nofiles --nodigest

[dkoshkin]

Removing Confclits leads to below on upgrades, yum refuses to override the existing files:

$ yum install kubelet-1.17.7-0
...
Transaction check error:
  file /opt/cni/bin/bridge from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/dhcp from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/flannel from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/host-device from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/host-local from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/ipvlan from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/loopback from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/macvlan from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/portmap from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/ptp from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/tuning from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64
  file /opt/cni/bin/vlan from install of kubelet-1.17.7-0.x86_64 conflicts with file from package kubernetes-cni-0.7.5-0.x86_64

Error Summary
-------------

[dkoshkin]

I think the simplest path forward would be to remove the cni binaries out of the Kubelet spec and just create the kubernetes-cni-0.8.6 package like there is with the older versions.
And bring back

Requires: kubernetes-cni >= 0.8.6

[xmudrii]

@dkoshkin We had a couple of problems with that approach before, breaking the workflow for many users. IIRC, that was the biggest reason why we didn’t create a new version of that package.

[jimangel]

I just tried this on a personal repo having just Conflicts.
With this change it installs older versions correctly.
But the newer versions would require users to uninstall kubernetes-cni on upgrades.

I think this might be the best option. Release notes and upgrade documentation could include a note about the pre-req.

If someone doesn't read that, it appears the package manager tips them off.

[dkoshkin]

Verified with Conflicts, doing yum remove and yum install.

[root@2c8f4abb3bf3 /]# yum remove kubernetes-cni-0.7.5-0
Loaded plugins: fastestmirror, ovl
Resolving Dependencies
--> Running transaction check
---> Package kubernetes-cni.x86_64 0:0.7.5-0 will be erased
--> Processing Dependency: kubernetes-cni >= 0.7.5 for package: kubelet-1.16.3-0.x86_64
--> Running transaction check
---> Package kubelet.x86_64 0:1.16.3-0 will be erased
--> Finished Dependency Resolution

Dependencies Resolved

==============================================================================================================================================================================================================================================
 Package                                                     Arch                                                Version                                                  Repository                                                     Size
==============================================================================================================================================================================================================================================
Removing:
 kubernetes-cni                                              x86_64                                              0.7.5-0                                                  @konvoy-packages                                               35 M
Removing for dependencies:
 kubelet                                                     x86_64                                              1.16.3-0                                                 @konvoy-packages                                              137 M

Transaction Summary
==============================================================================================================================================================================================================================================
Remove  1 Package (+1 Dependent package)

Installed size: 173 M
Is this ok [y/N]: y
Downloading packages:
Running transaction check
Running transaction test
Transaction test succeeded
Running transaction
  Erasing    : kubelet-1.16.3-0.x86_64                                                                                                                                                                                                    1/2
  Erasing    : kubernetes-cni-0.7.5-0.x86_64                                                                                                                                                                                              2/2
  Verifying  : kubernetes-cni-0.7.5-0.x86_64                                                                                                                                                                                              1/2
  Verifying  : kubelet-1.16.3-0.x86_64                                                                                                                                                                                                    2/2

Removed:
  kubernetes-cni.x86_64 0:0.7.5-0

Dependency Removed:
  kubelet.x86_64 0:1.16.3-0

Complete!
[root@2c8f4abb3bf3 /]# yum install kubelet-1.17.7-0
Loaded plugins: fastestmirror, ovl
Loading mirror speeds from cached hostfile
 * base: mirror.web-ster.com
 * extras: mirror.sfo12.us.leaseweb.net
 * updates: mirror.web-ster.com
Resolving Dependencies
--> Running transaction check
---> Package kubelet.x86_64 0:1.17.7-0 will be installed
--> Finished Dependency Resolution

Dependencies Resolved

==============================================================================================================================================================================================================================================
 Package                                                Arch                                                  Version                                                    Repository                                                      Size
==============================================================================================================================================================================================================================================
Installing:
 kubelet                                                x86_64                                                1.17.7-0                                                   konvoy-packages                                                 40 M

Transaction Summary
==============================================================================================================================================================================================================================================
Install  1 Package

Total download size: 40 M
Installed size: 180 M
Is this ok [y/d/N]: y
Downloading packages:
kubelet-1.17.7-0.x86_64.rpm                                                                                                                                                                                            |  40 MB  00:00:01
Running transaction check
Running transaction test
Transaction test succeeded
Running transaction
  Installing : kubelet-1.17.7-0.x86_64                                                                                                                                                                                                    1/1
  Verifying  : kubelet-1.17.7-0.x86_64                                                                                                                                                                                                    1/1

Installed:
  kubelet.x86_64 0:1.17.7-0

Complete!

[saschagrunert]

Okay cool, where can we document that? Is there any official documentation for those yum/deb repos? Otherwise I would point that out in the RPM spec.

[saschagrunert]

/retest

[tpepper]

Okay cool, where can we document that? Is there any official documentation for those yum/deb repos? Otherwise I would point that out in the RPM spec.

The k8s.io docs don't go into using the repos directly, eg: https://kubernetes.io/docs/setup/

There's getting started for local learning (kind, minikube) and for prod various deploy tools. But no recommendation of using the yum and apt repos directly (vs indirectly through kubeadm).

[neolit123]

the existing yum/apt repositories are mentioned here:
https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#installing-kubeadm-kubelet-and-kubectl

a note can be added there before the installation steps, but it must be done for all k/website branches where this behavior changed.

[saschagrunert]

Corresponding docs PR: kubernetes/website#21898

[saschagrunert]

Ping @tpepper and @justaugustus for general consensus.

[saschagrunert]

/hold cancel

Seeking for approval. If this one got merged we have to:

• rebuild the RPM packages
• merge the k/website docs PR

[justaugustus]

/hold just until we have a final decision

[justaugustus]

Superseded by #1375.
/close

[k8s-ci-robot]

@justaugustus: Closed this PR.

In response to this:

Superseded by #1375.
/close

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.