Bundle CNI plugins (v0.8.6) in kubelet deb/rpm packages #1309
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
release-note
k8s-ci-robot
added
sig/release
justaugustus
force-pushed
the
ba-cni-update
branch
from
7e07bc0
to
8d3a79a
Compare
k8s-ci-robot
added
size/L
justaugustus
force-pushed
the
ba-cni-update
branch
3 times, most recently
from
c20a749
to
b4114ee
Compare
This was referenced May 23, 2020
Open
|
/test pull-release-cluster-up |
justaugustus
force-pushed
the
ba-cni-update
branch
from
b4114ee
to
23ec64e
Compare
|
debs seem to be fine, but the rpms are busted, so I'll keep experimenting... |
tpepper
suggested changes
May 28, 2020
| Source6: kubelet.env | ||
| Source7: https://github.com/kubernetes-sigs/cri-tools/releases/download/v%{CRI_TOOLS_VERSION}/crictl-v%{CRI_TOOLS_VERSION}-linux-%{ARCH}.tar.gz | ||
|
|
||
| BuildRequires: systemd | ||
| BuildRequires: curl | ||
| Requires: iptables >= 1.4.21 | ||
| Requires: kubernetes-cni >= %{CNI_VERSION} |
There was a problem hiding this comment.
This should probably change from Requires: to Obsoletes:, eg:
Obsoletes: kubernetes-cni
I don't know the debian meta options. Is there something like this there too?
There was a problem hiding this comment.
Thanks Tim! I'm going to do a little research and come back with the deb equivalent as well next week.
There was a problem hiding this comment.
@tpepper -- This should be ready to merge now. See the worklog below: #1309 (comment)
I ended up adding this to the rpm spec:
Obsoletes: kubernetes-cni
Conflicts: kubernetes-cni
and this to the debian package config:
Provides: kubernetes-cni
Conflicts: kubernetes-cni
Replaces: kubernetes-cni
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
justaugustus
force-pushed
the
ba-cni-update
branch
from
52e2877
to
7ca71bc
Compare
|
Testing... Generate new packagesdebsFrom $ time go run build.go -arch amd64 -distros bionic -kube-version 1.18.3 -revision 01rpmsFrom $ time ./docker-build.shUse test install scripts for debs/rpms (from k/sig-release/packaging.md)debs#!/usr/bin/env bash
version="$1"
[[ -n "${version}" ]] \
&& curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg \
| sudo apt-key add - \
&& echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" \
| sudo tee /etc/apt/sources.list.d/kubernetes.list \
&& sudo apt-get update -q \
&& sudo apt-get install -qy kubelet="${version}-00" kubectl="${version}-00" kubeadm="${version}-00"rpms#!/usr/bin/env bash
version="$1"
if [[ -n "${version}" ]]; then
cat <<EOF | sudo tee /etc/yum.repos.d/kubernetes.repo
[kubernetes]
name=Kubernetes
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
enabled=1
gpgcheck=1
repo_gpgcheck=1
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF
sudo yum install -y kubelet-${version} kubeadm-${version} kubectl-${version} --disableexcludes=kubernetes
fidebs testinginstall upstream debsCreate update-debs.sh#!/usr/bin/env bash
cd /k-release/debian/bin/stable/bionic/
dpkg-scanpackages . /dev/null | gzip -9c > Packages.gzUpdate the package list to scan local debsAdd the following line: Install updated kubeadm and kubelet packagesCheck package configurationsrpms testinginstall upstream rpmsInstall updated kubeadm and kubelet packagesCheck package configurations |
|
Ready for approval. |
justaugustus
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: justaugustus, saschagrunert 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 |
justaugustus
added
kind/feature
| mv cni-plugins/* %{buildroot}/opt/cni/bin/ | ||
|
|
||
| %files | ||
| %{_bindir}/kubelet | ||
| %{_unitdir}/kubelet.service | ||
| %{_sysconfdir}/kubernetes/manifests/ | ||
| /opt/cni |
There was a problem hiding this comment.
Not sure about the implications but I think we should not own files in /opt generally in RPMs. Do you think we could move it to _libexecdir?
|
I don't know much about RPMs, but I have a suspicion this broke everybody. |
rjosephwright
added a commit
to cloudboss/keights
that referenced
this pull request
Jun 20, 2020
This is now being bundled in the `kubelet` package, see: kubernetes/release#1309.
rjosephwright
added a commit
to cloudboss/keights
that referenced
this pull request
Jun 20, 2020
This is now being bundled in the `kubelet` package, see: kubernetes/release#1309.
rjosephwright
added a commit
to cloudboss/keights
that referenced
this pull request
Jun 20, 2020
This is now being bundled in the `kubelet` package, see: kubernetes/release#1309.
rjosephwright
added a commit
to cloudboss/keights
that referenced
this pull request
Jun 21, 2020
This is now being bundled in the `kubelet` package, see: kubernetes/release#1309.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind cleanup
/area dependency
/sig network
What this PR does / why we need it:
Bundle CNI plugins (v0.8.6) in kubelet deb/rpm packages
(Supports k/k CNI plugin update: kubernetes/kubernetes#91370)
ref: #885
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?