WIP: Upgrade kindbase to later version and ubuntu:20.04 #8251
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
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: afbjorklund 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 |
k8s-ci-robot
added
the
approved
Codecov Report
@@ Coverage Diff @@
## master #8251 +/- ##
==========================================
- Coverage 34.46% 34.05% -0.41%
==========================================
Files 147 153 +6
Lines 9428 9840 +412
==========================================
+ Hits 3249 3351 +102
- Misses 5780 6086 +306
- Partials 399 403 +4
|
medyagh
requested changes
May 22, 2020
It would be better to fix the code so that you could run a local snapshot without having to push it to some registry, but I suppose we can |
|
Unfortunately I think the current release procedure is off-limits to anyone without the gcr.io credentials, so I can't push any type of images. Not the build images, not the storage-provisioner, not this one... |
|
Hmm, today it seems like
And I guess I need to bump the version too, to something like |
|
@medyagh : try
Based on Note that the digests are different, even though the contents are the same: This is why it is so useless. (especially since my local image doesn't get one) |
@afbjorklund can you please put that in the types.go in kic package so it triggers a test using that image? once it is good I will push it to gcr |
But when you push it to gcr, it changes ? |
|
But you mean like do a separate PR, where changing the image ? Like a throwaway Because it looks like the location is hardcoded: pkg/drivers/kic/types.go: BaseImage = fmt.Sprintf("gcr.io/k8s-minikube/kicbase:%s@sha256:%s", Version, baseImageSHA)
pkg/drivers/kic/types.go: BaseImageFallBack = fmt.Sprintf("docker.pkg.github.com/kubernetes/minikube/kicbase:%s", Version) |
afbjorklund
added a commit
to afbjorklund/minikube
that referenced
this pull request
May 24, 2020
Trying something out in #8262 |
Unfortunately upstream (opensuse devel:kubic:libcontainers) deletes all old packages, so have to rebuild using the source .dsc package. The files for building (.dsc and debian .tar.gz) are available at: https://build.opensuse.org/package/show/devel:kubic:libcontainers:stable/podman?rev=137
tstromberg
reviewed
May 29, 2020
There was a problem hiding this comment.
PR looks good to me, but will defer to @medyagh because it isn't clear to me on how I can see the test results.
me neither (a problem?), it seemed to work locally though |
|
It shouldn't be needed to downgrade podman anymore, can move to 1.9.3 instead (see #8063) |
I think we should move off kindbase so we install lastet version of containerd instead of nightly build so lets brings those changes here |
|
plz update the version in the types.go to |
k8s-ci-robot
added
size/M
This image will still install the old containerd (as a docker requirement), so it's more a question of making the image a little smaller EDIT: actually we still have both, and run the newer: docker@kicbase:~$ containerd --version
containerd github.com/containerd/containerd v1.3.3-14-g449e9269 449e926990f8539fd00844b26c07e2f1e306c760
docker@kicbase:~$ /usr/bin/containerd --version
containerd github.com/containerd/containerd 1.3.3-0ubuntu2 Because /etc/systemd overrides /usr/lib/systemd |
Travis tests have failedHey @afbjorklund, 1st Buildmake testTravisBuddy Request Identifier: 28938a60-acd9-11ea-8245-836d9da6cb4c |
|
/ok-to-test |
k8s-ci-robot
added
the
ok-to-test
medyagh
requested changes
Jun 12, 2020
There was a problem hiding this comment.
CRIO tests fail in linux docker
https://storage.googleapis.com/minikube-builds/logs/8251/7335e8c/Docker_Linux.html
|
kvm2 Driver Times for Minikube (PR 8251): [64.87755647400002 64.73796044800001 65.56123147800001] Averages Time Per Log docker Driver Times for Minikube (PR 8251): [24.833529109999997 27.596814278999993 26.76801526] Averages Time Per Log |
|
Will try to upgrade podman and cri-o, for the next version... Might have to build it from source: https://build.opensuse.org/package/show/devel:kubic:libcontainers:stable:cri-o:1.18/cri-o?rev=4 |
|
https://dl.bintray.com/afbjorklund/cri-o/pool/main/c/cri-o/:cri-o_1.18.1~1_amd64.deb
|
|
Added some cleanup from the kindbase installs, rather than forking the files and entrypoint. RUN rm \
/etc/crictl.yaml \
/etc/systemd/system/multi-user.target.wants/containerd.service \
/opt/cni/bin/host-local \
/opt/cni/bin/loopback \
/opt/cni/bin/portmap \
/opt/cni/bin/ptp \
/usr/local/bin/containerd \
/usr/local/bin/containerd-shim \
/usr/local/bin/containerd-shim-runc-v2 \
/usr/local/bin/crictl \
/usr/local/bin/ctr \
/usr/local/sbin/runcThe end result doesn't seem that much worse, it's even smaller than the current kicbase ? This is because I used the RUN clean-install \
lz4 \
sudo \
docker.io \
openssh-server \
dnsutils \
# libglib2.0-0 is required for conmon, which is required for podman
libglib2.0-0 \
cri-o \
podman \
varlink |
k8s-ci-robot
added
the
needs-rebase
|
@afbjorklund: PR needs rebase. 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. |
This was referenced Jul 19, 2020
afbjorklund
changed the title
k8s-ci-robot
added
the
do-not-merge/work-in-progress
|
Do you mind resolving the conflicts? |
Merged
|
closing in favor of #8869 |
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.
Closes #8250 #8766 #8767