Skip to content
This repository was archived by the owner on Feb 11, 2021. It is now read-only.

Comments

V1.7.16 patchset#210

Merged
rphillips merged 5 commits intocoreos-hyperkube-v1.7.16from
v1.7.16-patchset
Apr 6, 2018
Merged

V1.7.16 patchset#210
rphillips merged 5 commits intocoreos-hyperkube-v1.7.16from
v1.7.16-patchset

Conversation

@rphillips
Copy link
Member

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Release note:


Copy link

@ericchiang ericchiang left a comment

Choose a reason for hiding this comment

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

Lgtm

OUT_DIR?=_output
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
CNI_RELEASE=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
CNI_RELEASE=v0.6.0

Choose a reason for hiding this comment

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

Why this change? CNI and Kubernetes versions have a matrix of compatibility, especially for old versions like 1.7.x.

Or is this a known good revision to use with 1.7.x?

Copy link
Member Author

Choose a reason for hiding this comment

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

this is a known version we have been using with 1.7

endif
cp -r ./* ${TEMP_DIR}
mkdir -p ${TEMP_DIR}/cni-bin
mkdir -p ${TEMP_DIR}/cni-bin/bin

Choose a reason for hiding this comment

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

I guess a result of a change that happened with CNI packaging due to the bump?

endif
# Download CNI
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin
curl -sSL --retry 5 https://github.com/containernetworking/cni/releases/download/${CNI_RELEASE}/cni-${ARCH}-${CNI_RELEASE}.tgz | tar -xz -C ${TEMP_DIR}/cni-bin/bin

Choose a reason for hiding this comment

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

And another packaging change from the version bump? What did they do? there's a main "Cni" binary now and the plugins are distributed separately?

@colemickens
Copy link

(Just realized those changes are probably the same changes we've been carrying on 1.7.x for forever. If that's the case, so be it, I don't need the details, just wanted to make sure.)

@rphillips
Copy link
Member Author

Yeah, we've been carrying these changes for a long time.

@rphillips rphillips merged commit 8daba24 into coreos-hyperkube-v1.7.16 Apr 6, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants