Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump kubernetes version to v1.4.0-beta.3 #52

Merged
merged 1 commit into from
Dec 20, 2016
Merged

bump kubernetes version to v1.4.0-beta.3 #52

merged 1 commit into from
Dec 20, 2016

Conversation

andyxning
Copy link
Member

@andyxning andyxning commented Dec 18, 2016 •
edited
Loading

bump kubernetes version to v1.4.0-beta.3. This is partially a former PR for #49 .

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 18, 2016
@andyxning andyxning force-pushed the bump_kubernetes_to_v1.4.0-beta.3 branch from f452f49 to 886d80c Compare December 18, 2016 10:46
@andyxning
Copy link
Member Author

@Random-Liu PTAL.

@andyxning andyxning force-pushed the bump_kubernetes_to_v1.4.0-beta.3 branch 10 times, most recently from 395d456 to 5fe0127 Compare December 18, 2016 16:11
@andyxning
Copy link
Member Author

@Random-Liu Please take a look at this PR. This is the part to update kubernetes version.

@Random-Liu
Copy link
Member

Random-Liu commented Dec 20, 2016 •
edited
Loading

I fetched your PR to my local environment, and found some unused packages.

#	deleted:    vendor/bitbucket.org/ww/goautoneg/Makefile
#	deleted:    vendor/bitbucket.org/ww/goautoneg/README.txt
#	deleted:    vendor/bitbucket.org/ww/goautoneg/autoneg.go
#	deleted:    vendor/github.com/beorn7/perks/quantile/exampledata.txt
#	deleted:    vendor/github.com/beorn7/perks/quantile/stream.go
#	deleted:    vendor/github.com/docker/docker/LICENSE
#	deleted:    vendor/github.com/docker/docker/NOTICE
#	deleted:    vendor/github.com/docker/docker/pkg/mount/flags.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/flags_linux.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/mount.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/mounter_linux.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/mountinfo.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go
#	deleted:    vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go
#	deleted:    vendor/github.com/docker/go-units/CONTRIBUTING.md
#	deleted:    vendor/github.com/docker/go-units/LICENSE.code
#	deleted:    vendor/github.com/docker/go-units/LICENSE.docs
#	deleted:    vendor/github.com/docker/go-units/MAINTAINERS
#	deleted:    vendor/github.com/docker/go-units/README.md
#	deleted:    vendor/github.com/docker/go-units/circle.yml
#	deleted:    vendor/github.com/docker/go-units/duration.go
#	deleted:    vendor/github.com/docker/go-units/size.go
#	deleted:    vendor/github.com/docker/go-units/ulimit.go
#	deleted:    vendor/github.com/golang/protobuf/LICENSE
#	deleted:    vendor/github.com/golang/protobuf/proto/Makefile
#	deleted:    vendor/github.com/golang/protobuf/proto/clone.go
#	deleted:    vendor/github.com/golang/protobuf/proto/decode.go
#	deleted:    vendor/github.com/golang/protobuf/proto/encode.go
#	deleted:    vendor/github.com/golang/protobuf/proto/equal.go
#	deleted:    vendor/github.com/golang/protobuf/proto/extensions.go
#	deleted:    vendor/github.com/golang/protobuf/proto/lib.go
#	deleted:    vendor/github.com/golang/protobuf/proto/message_set.go
#	deleted:    vendor/github.com/golang/protobuf/proto/pointer_reflect.go
#	deleted:    vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
#	deleted:    vendor/github.com/golang/protobuf/proto/properties.go
#	deleted:    vendor/github.com/golang/protobuf/proto/text.go
#	deleted:    vendor/github.com/golang/protobuf/proto/text_parser.go
#	deleted:    vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE
#	deleted:    vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go
#	deleted:    vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/doc.go
#	deleted:    vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go
#	deleted:    vendor/github.com/opencontainers/runc/LICENSE
#	deleted:    vendor/github.com/opencontainers/runc/NOTICE
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/cgroups_unsupported.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/apply_raw.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/blkio.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpu.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuacct.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/cpuset.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/devices.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/freezer.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/fs_unsupported.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/hugetlb.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/memory.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/name.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_cls.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/net_prio.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/perf_event.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/pids.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/utils.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/stats.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/blkio_device.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unix.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_unsupported.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/cgroup_windows.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/config.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/config_unix.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/device.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/device_defaults.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/hugepage_limit.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/interface_priority_map.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/mount.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_syscall_unsupported.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unix.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/namespaces_unsupported.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/configs/network.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/system/linux.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/system/proc.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/system/setns_linux.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_386.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_64.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/system/syscall_linux_arm.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/system/sysconfig_notcgo.go
#	deleted:    vendor/github.com/opencontainers/runc/libcontainer/system/xattrs_linux.go
#	deleted:    vendor/github.com/prometheus/client_golang/LICENSE
#	deleted:    vendor/github.com/prometheus/client_golang/NOTICE
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/.gitignore
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/README.md
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/collector.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/counter.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/desc.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/doc.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/expvar.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/gauge.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/go_collector.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/histogram.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/http.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/metric.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/process_collector.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/push.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/registry.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/summary.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/untyped.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/value.go
#	deleted:    vendor/github.com/prometheus/client_golang/prometheus/vec.go
#	deleted:    vendor/github.com/prometheus/client_model/LICENSE
#	deleted:    vendor/github.com/prometheus/client_model/NOTICE
#	deleted:    vendor/github.com/prometheus/client_model/go/metrics.pb.go
#	deleted:    vendor/github.com/prometheus/common/expfmt/decode.go
#	deleted:    vendor/github.com/prometheus/common/expfmt/encode.go
#	deleted:    vendor/github.com/prometheus/common/expfmt/expfmt.go
#	deleted:    vendor/github.com/prometheus/common/expfmt/fuzz.go
#	deleted:    vendor/github.com/prometheus/common/expfmt/json_decode.go
#	deleted:    vendor/github.com/prometheus/common/expfmt/text_create.go
#	deleted:    vendor/github.com/prometheus/common/expfmt/text_parse.go
#	deleted:    vendor/github.com/prometheus/common/model/fingerprinting.go
#	deleted:    vendor/github.com/prometheus/common/model/labels.go
#	deleted:    vendor/github.com/prometheus/common/model/labelset.go
#	deleted:    vendor/github.com/prometheus/common/model/metric.go
#	deleted:    vendor/github.com/prometheus/common/model/model.go
#	deleted:    vendor/github.com/prometheus/common/model/signature.go
#	deleted:    vendor/github.com/prometheus/common/model/time.go
#	deleted:    vendor/github.com/prometheus/common/model/value.go
#	deleted:    vendor/github.com/prometheus/procfs/.travis.yml
#	deleted:    vendor/github.com/prometheus/procfs/AUTHORS.md
#	deleted:    vendor/github.com/prometheus/procfs/CONTRIBUTING.md
#	deleted:    vendor/github.com/prometheus/procfs/LICENSE
#	deleted:    vendor/github.com/prometheus/procfs/NOTICE
#	deleted:    vendor/github.com/prometheus/procfs/README.md
#	deleted:    vendor/github.com/prometheus/procfs/doc.go
#	deleted:    vendor/github.com/prometheus/procfs/fs.go
#	deleted:    vendor/github.com/prometheus/procfs/proc.go
#	deleted:    vendor/github.com/prometheus/procfs/proc_limits.go
#	deleted:    vendor/github.com/prometheus/procfs/proc_stat.go
#	deleted:    vendor/github.com/prometheus/procfs/stat.go

How did you update the Godep? Godep is really confusing. :)

@Random-Liu Random-Liu mentioned this pull request Dec 20, 2016
Merged
@andyxning
Copy link
Member Author

andyxning commented Dec 20, 2016 •
edited
Loading

@Random-Liu It consumes me about almost six hours to make the PR green. However, something is still wrong. :(

I will update this later. Hard work recently. :)

@Random-Liu
Copy link
Member

Random-Liu commented Dec 20, 2016 •
edited
Loading

@Random-Liu It consumes me about almost six hours to make the PR green. However, something is still wrong. :(

Yeah, in K8s, it sometimes takes us 2 days to update Godep dependency... It's really confusing. I think we are going to switch to another dependency management tool.

Currently the Godep of the repo is in a bad condition. It should have been fixed in #39, but I believe it still needs some time to get #39 merged.

I'll send a PR to fix the current Godep to make it easier for you to update kubernetes dependency.

Thanks a lot for your help!

@andyxning andyxning force-pushed the bump_kubernetes_to_v1.4.0-beta.3 branch from 5fe0127 to b3d53b0 Compare December 20, 2016 08:02
@andyxning
Copy link
Member Author

@Random-Liu I have updated the PR. It should be ok now. PTAL.

@andyxning andyxning force-pushed the bump_kubernetes_to_v1.4.0-beta.3 branch from b3d53b0 to 20c8a87 Compare December 20, 2016 08:09
@andyxning
Copy link
Member Author

BTW, imo, it may make npd complicated by linking cgo for supporting systemd.

@Random-Liu
Copy link
Member

Random-Liu commented Dec 20, 2016 •
edited
Loading

@andyxning That's why I added an option to disable journald support in #39. :)

BTW, how did you update the Godep? I'm curious... Because it's really hard to make it work.

@andyxning
Copy link
Member Author

@Random-Liu FYI

@Random-Liu
Copy link
Member

Random-Liu commented Dec 20, 2016 •
edited
Loading

@andyxning I use similar way. However, IIUC, cadvisor and npd is using different versions of go-systemd, which will confuse Godep. I have to run godep save twice to include vendor/github.com/coreos/go-systemd/journal/journal.go.

How did you solve this?

@andyxning
Copy link
Member Author

andyxning commented Dec 20, 2016 •
edited
Loading

@Random-Liu I did not encounter that problem.

However, when i run godep save ./... after godep resotre -v. The golang.org/x/net/idna package is lost and the first updated PR is not passed.

After that, i run godep update golang.org/x/net/... and golang.org/x/net/idna has been added.

I am also curious about Godep, too. Not knowing why it works and why it does not work. 😂

@Random-Liu
Copy link
Member

Random-Liu commented Dec 20, 2016 •
edited
Loading

Hm, ok. It's mystery. :(

I'll validate your PR. Once it works, I'll approve this PR and review #49.

@andyxning Thanks a lot for your help!

@andyxning
Copy link
Member Author

andyxning commented Dec 20, 2016 •
edited
Loading

@Random-Liu OK. Once this PR is accepted, i will rebase #49

@Random-Liu
Copy link
Member

Random-Liu commented Dec 20, 2016 •
edited
Loading

@andyxning I checked your PR, and after I run:

godep restore
rm -rf Godep/ vendor/
godep save ./...

I found that golang.org/x/net/idna is still missing.

#	deleted:    vendor/golang.org/x/net/idna/idna.go
#	deleted:    vendor/golang.org/x/net/idna/punycode.go

I have to run godep save ./... twice or run godep update golang.org/x/net/... to include it.

The reason is that k8s.io/kubernetes and k8s.io/client-go is using a different golang.org/x/net version with npd. That version doesn't have idna package.

The fix is:

godep restore
cd ../../golang.org/x/net
git checkout e90d6d0afc4c315a0d87a568ae68577cc15149a0 # The version kubernetes and client-go are using
cd -
rm -rf Godep/ vendor/
godep save ./...

This kind of Godep problem has happened many times to us. It's really annoying. (See #7)

Another question is that it seems that heapster switched to kubernetes 1.5 from 1.4.0-beta.3. I'm fine with using 1.4 for now, but we should update to 1.5 later. :)

@andyxning With the fix, I think the PR is good to go.

@Random-Liu Random-Liu self-requested a review December 20, 2016 09:43
@Random-Liu Random-Liu self-assigned this Dec 20, 2016
@andyxning andyxning force-pushed the bump_kubernetes_to_v1.4.0-beta.3 branch from 20c8a87 to 6725950 Compare December 20, 2016 10:01
@andyxning andyxning force-pushed the bump_kubernetes_to_v1.4.0-beta.3 branch from 6725950 to 2c12274 Compare December 20, 2016 10:16
@andyxning
Copy link
Member Author

andyxning commented Dec 20, 2016 •
edited
Loading

The reason is that k8s.io/kubernetes and k8s.io/client-go is using a different golang.org/x/net version with npd. That version doesn't have idna package.

Now idna is not a dependency anymore. 👏 Thanks @Random-Liu
godep restore and godep save ./... now produce stable and correct result.

Another question is that it seems that heapster switched to kubernetes 1.5 from 1.4.0-beta.3. I'm fine with using 1.4 for now, but we should update to 1.5 later. :)

Heapster bump to Kubernetes 1.5 for next release 1.3.0. They have the following corresponding relations

Heapster Kubernetes
1.1.0 1.3.0
1.2.0 1.4.0
1.3.0 1.5.0

I also think npd should also be released like this.

NPD Kubernetes
v0.1 1.3.0
v0.2 1.4.0
v0.3 1.5.0

WDYT.
I agree that we should bump to kubernetes version to 1.5.0 only after heapster 1.3.0 is released. :)

@Random-Liu
Copy link
Member

@andyxning Thanks for your suggestion. I'll reference projects like cadvisor, heapster and kubedns and write a simple doc for npd release process. It should be similar with your suggestion.

@Random-Liu
Copy link
Member

Random-Liu commented Dec 20, 2016 •
edited
Loading

The PR LGTM. Thanks for your help!

@Random-Liu Random-Liu added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 20, 2016
@Random-Liu Random-Liu merged commit c0cb748 into kubernetes:master Dec 20, 2016
@andyxning andyxning deleted the bump_kubernetes_to_v1.4.0-beta.3 branch December 20, 2016 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Random-Liu Random-Liu Awaiting requested review from Random-Liu

Assignees

@Random-Liu Random-Liu

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andyxning @Random-Liu @k8s-ci-robot