Skip to content
This repository has been archived by the owner on Dec 19, 2019. It is now read-only.

vendor: update vendoring #121

Merged

Conversation

iaguis
Copy link
Contributor

@iaguis iaguis commented Sep 13, 2017

It now uses:

  • Kubernetes v1.7.5
  • rkt v1.25.0
  • go-systemd v15

I had to explicitly list some dependencies to pin them to a version

  • client-go v4.0.0
  • cni v0.3.0 (what rkt uses)

I also changed some depencency revisions to match what Kubernetes has.

Finally, since I was getting compilation errors similar to the ones
mentioned in kelseyhightower/kubernetes-initializer-tutorial#4,
I set the version of k8s.io/apimachinery like mentioned there.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 13, 2017
@iaguis
Copy link
Contributor Author

iaguis commented Sep 13, 2017

I got pretty confused by the vendoring and the changes in kubernetes but it now compiles and seems to work.

@alban
Copy link
Contributor

alban commented Sep 13, 2017

@iaguis why using rkt v1.25.0 instead of the last release?

@iaguis
Copy link
Contributor Author

iaguis commented Sep 13, 2017

I chose that kinda arbitrarily because that's what k8s vendors. Although I see not that it's only us (rktlet) that use it. I'll change it to the last release and also do coreos/rkt -> rkt/rkt.

@iaguis
Copy link
Contributor Author

iaguis commented Sep 13, 2017

Travis fails because tls.Config.Clone() was added in go1.8 and we're building with go1.7.

@iaguis
Copy link
Contributor Author

iaguis commented Sep 13, 2017

It's green now :)

@alban
Copy link
Contributor

alban commented Sep 21, 2017

It compiles fine for me.

A couple of changes in the rkt git repository were missed:

$ git grep github.com/coreos/rkt
README.md:[rkt]: https://github.com/coreos/rkt
glide.lock:- name: github.com/coreos/rkt
tests/runtime/runtime_test.go:  // Due to https://github.com/coreos/rkt/issues/3473 we need to trim spaces for each line

After the changes mentioned above, LGTM.

It now uses:

* Kubernetes v1.7.5
* rkt v1.25.0
* go-systemd v15

I had to explicitly list some dependencies to pin them to a version

* client-go v4.0.0
* cni v0.3.0 (what rkt uses)

I also changed some depencency revisions to match what Kubernetes has.

Finally, since I was getting compilation errors similar to the ones
mentioned in
kelseyhightower/kubernetes-initializer-tutorial#4,
I set the version of k8s.io/apimachinery to like mentioned there.
It's now github.com/rkt/rkt
@iaguis
Copy link
Contributor Author

iaguis commented Sep 21, 2017

Thanks! I fixed those and also removed ./vendor/github.com/coreos/rkt/

@alban
Copy link
Contributor

alban commented Sep 21, 2017

lgtm

Copy link
Contributor

@lucab lucab left a comment

Choose a reason for hiding this comment

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

LGTM

@iaguis iaguis merged commit 3d33d9b into kubernetes-retired:master Sep 21, 2017
@schu schu deleted the iaguis/update-vendoring branch September 22, 2017 07:25
@iaguis iaguis added this to the v0.1.0 milestone Nov 15, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants