Fix rpm build after CNI 0.6.0 changes #486
Merged
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
- Version kubernetes-cni package on the cni version actually used. - Fix Source5 parse problem with Kubernetes < 1.9.0 - Extract cni-plugins to its own directory and fix mv commands
k8s-ci-robot
added
cncf-cla: yes
Closed
- Fix kubelet CNI dependency for 1.9 prerelease versions.
|
I also added a third commit with a minor fix to the deb building code, so that prerelease 1.9 versions also use the correct CNI dependency. |
|
/assign @dixudx |
As discussed here: kubernetes#446 (comment)
|
Added a commit to set the dependency on kubernetes-cni to use |
+1 |
k8s-ci-robot
added
the
lgtm
|
/assign @ixdy |
|
LGTM Do we need to republish older versions of the debs/rpms with the |
|
@ixdy Yes, @pipejakob jacob is working on republishing older versions and expects to have it done by today. |
|
@pipejakob @enisoc Thanks for pushing it forward. |
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.
This builds on top of the changes in #446 to start using CNI 0.6.0 in Kubernetes 1.9, but fixes the rpm build:
kubernetes-cnipackage on the CNI version actually used.Source5parse problem with Kubernetes < 1.9.0cni-pluginsto its own directory and fixmvcommandsSee the newer commit for my fixes. I've tested that the rpms actually build for both Kubernetes 1.8.x and 1.9.0-beta.2, and that their contents look reasonable, but haven't actually started real clusters using them for deep end-to-end testing (yet).
CC @enisoc @dixudx