Skip to content

Commit b9e631f

Browse files
Merge pull request #17663 from deads2k/bparees-01-hyper
Automatic merge from submit-queue (batch tested with PRs 17663, 17661, 17219). UPSTREAM: <drop>: stop adding federation to hyperkube one release early We no longer have a direct dependency on federation, so federation deps are being dropped. Since we build hyperkube (out of the vendor dir), this causes a failure. Long term, we should build hyperkube out of a fork of kubernetes, not the vendor tree of openshift. This removes the federation dependency (which is removed in 1.9 anyway) and hopefully we build from the correct repo in 3.9. /assign bparees
2 parents 959bc67 + 052ca7c commit b9e631f

File tree

3 files changed

+0
-81
lines changed

3 files changed

+0
-81
lines changed

vendor/k8s.io/kubernetes/cmd/hyperkube/federation-apiserver.go

Lines changed: 0 additions & 39 deletions
This file was deleted.

vendor/k8s.io/kubernetes/cmd/hyperkube/federation-controller-manager.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

vendor/k8s.io/kubernetes/cmd/hyperkube/main.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)