Skip to content

Conversation

@ijc
Copy link
Contributor

@ijc ijc commented Dec 19, 2017

Build CNI binaries ourselves rather than shipping prebuilt binaries.
Add the cri tool binaries (crictl and critest) also built from source.
Add a comment next to both definitions of kubernetes_version cross-referencing the other for updates (should incorporate #35 at some point too).

musl \
openssl \
socat \
util-linux \
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm pretty sure we can get rid of libc6-compat now, wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can't remember what it was needed for (maybe it was even cargo-culted from somewhere else and never useful here). If someone wants to remove it and test the result that would be great.

Copy link
Contributor

Choose a reason for hiding this comment

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

@ilj it was needed to run Kubernetes release binaries, it's not needed since we build here, although I don't know about the CNI binaries, but that's not a question as of this PR. I've put it there in the first place.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, yes, it's probably useless then.

I'll try and pin a commit on here before I head off for vacation then!

Ian Campbell added 4 commits December 19, 2017 14:46
Signed-off-by: Ian Campbell <[email protected]>
This can be used to interact with the CRI provider and kubeadm can use it for
some things too it seems (judging from the logging from `kubeadm init`).

Include critest too since it is built.

Signed-off-by: Ian Campbell <[email protected]>
Remind the reader about the other place to update. Structured as a list because
I'm anticipating linuxkit#35 adding another.

Make the variable name consistent too by updating scripts/mk-image-cache-lst.

Signed-off-by: Ian Campbell <[email protected]>
This was needed when we used the binaries built/released by the Kube project,
but since we build everything ourselves in an Alpine environment there is no
need now.

Signed-off-by: Ian Campbell <[email protected]>
@ijc ijc force-pushed the build-cni-and-cri-tool branch from 455e618 to 054a553 Compare December 19, 2017 14:50
@ijc
Copy link
Contributor Author

ijc commented Jan 4, 2018

ping @rn / @justincormack

Copy link
Member

@rn rn left a comment

Choose a reason for hiding this comment

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

I'd be wrong if I'd claim I fully understand this PR but the mechanics look good to me

@ijc ijc merged commit 3838536 into linuxkit:master Jan 5, 2018
@ijc ijc deleted the build-cni-and-cri-tool branch January 5, 2018 11:00
@ijc ijc mentioned this pull request Jan 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants