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

rebase 1.9.0 beta.1 #17576

Merged
merged 78 commits into from
Dec 13, 2017
Merged

rebase 1.9.0 beta.1 #17576

Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
f0bb2b6
update glide.yaml
deads2k Dec 1, 2017
c671103
update glide.yaml for networking
deads2k Dec 7, 2017
07c6b99
glide.yaml: update ours dependencies
deads2k Dec 8, 2017
710998e
bump(*)
deads2k Dec 4, 2017
c8626b7
UPSTREAM: 57148: expose special storage locations
deads2k Dec 5, 2017
f3769c7
UPSTREAM: 57149: make quota reusable
deads2k Dec 5, 2017
123246b
UPSTREAM: <carry>: exclude some origin resources from quota
deads2k Dec 7, 2017
534c679
UPSTREAM: <drop>: add back PrintSuccess. remove when printing is fixed
deads2k Dec 6, 2017
ca1b85f
UPSTREAM: <drop>: skip controller metric error, drop once we run in a…
deads2k Dec 7, 2017
9ff7f3f
UPSTREAM: <drop>: skip scheduler configz error, drop once we run in a…
deads2k Dec 7, 2017
d34b354
UPSTREAM: <carry>: patch scheduler to apply defaults. drop once we r…
deads2k Dec 7, 2017
df449cc
UPSTREAM: <carry>: make wiring in kubeproxy easy until we sort out co…
deads2k Dec 8, 2017
f046a0b
UPSTREAM: 49312: allow the /version endpoint to pass through
deads2k Jul 20, 2017
3c7a135
UPSTREAM: openshift/api: 17: Rbac fix
deads2k Dec 8, 2017
3f45cdc
UPSTREAM: <drop>: remove usage of bad transport since only GKE routes
deads2k Dec 11, 2017
ee0f726
UPSTREAM: <carry>: keep set working on internal types
deads2k Dec 11, 2017
de36874
UPSTREAM: <drop>: enable beta APIs by default. fixed by several pulls…
deads2k Dec 11, 2017
64974bc
UPSTREAM: 56687: kube-apiserver: enable admissionregistration v1beta1…
deads2k Dec 11, 2017
bf64f2c
UPSTREAM: 57150: allow convert to default on a per object basis
juanvallejo Dec 8, 2017
cf235c2
UPSTREAM: <carry>: switch apply to use the legacyscheme so our types …
deads2k Dec 12, 2017
4bc612e
boring changes
deads2k Dec 4, 2017
66d94ff
skuznets: switch to golang 1.9
deads2k Dec 7, 2017
fc9b4e2
DISABLE ROUTER e2e tests! hopefully fix golang 1.9 before we merge a…
deads2k Dec 11, 2017
5b3859b
update generators
deads2k Dec 4, 2017
d1b5fe8
add secret reference
deads2k Dec 4, 2017
42a1e2c
update image type generation flags
deads2k Dec 4, 2017
d49083e
CreatedByAnnotation is gone, idling probably broke again
deads2k Dec 5, 2017
07e5313
image limit ranger plugin
deads2k Dec 5, 2017
ab033d4
explicitly stop running admission on some resources
deads2k Dec 5, 2017
32a0c9a
add admission validation for *some* special resources
deads2k Dec 5, 2017
27ad23a
NEEDS REVIEW: boring: docker client update
deads2k Dec 5, 2017
f490d38
update internal scale type for dc
deads2k Dec 5, 2017
2f11419
interesting: update the dc/scale integration test to use the generic …
deads2k Dec 7, 2017
b3fa18d
minimal lease reconciler change
deads2k Dec 5, 2017
22f0b91
remove deprecated dc rollback generator
deads2k Dec 5, 2017
0aedd29
QUOTA: refactor our use of quota
deads2k Dec 5, 2017
7f86e08
SEPARATE: needs picking to webconsole server when they rebase
deads2k Dec 5, 2017
99c59c6
interesting: use listener instead of bindport
deads2k Dec 5, 2017
afdcb87
jvallejo: printing debt to fix
deads2k Dec 6, 2017
2abedd5
SROSS: hack new start for hpa controller for https support
deads2k Dec 6, 2017
5d40a0f
weird: clusterresourceoverride admission with a fake limit ranger
deads2k Dec 6, 2017
4383cd7
admission wiring changes
deads2k Dec 6, 2017
7ffc267
SJENNING: node wiring changes
deads2k Dec 6, 2017
244afd3
DANW: update networking related code for rebase
deads2k Dec 4, 2017
30fe89a
update deletion strategies
deads2k Dec 11, 2017
de21f14
authorization changes
deads2k Dec 5, 2017
80cef2d
authorization: updates to bootstrap roles
deads2k Dec 11, 2017
a92560d
add roundtripping for aggregation rules
deads2k Dec 8, 2017
a1cef1f
apiserver default changes
deads2k Dec 8, 2017
8454d7d
etcd storage test updates
deads2k Dec 11, 2017
9344e48
BPAREES: simplify concurrent controller test
deads2k Dec 8, 2017
062ffb1
BPAREES: crio values seem half changed
deads2k Dec 11, 2017
93bd84a
router/f5: move test types into testing sub-pkg
sttts Dec 12, 2017
0089bbb
oc: simple
deads2k Dec 6, 2017
ad7d2fc
oc: interesting: handle switch to external types in printers and set
deads2k Dec 6, 2017
60d3fa9
oc: make printers work again - sortof
deads2k Dec 6, 2017
b15c3b6
oc: builder updates
deads2k Dec 6, 2017
1d18e82
oc: cluster up dockername parsing
deads2k Dec 7, 2017
31f33b0
oc: first round of fixes for test-cmd
juanvallejo Dec 7, 2017
2cf15a3
oc: break oc explain
deads2k Dec 11, 2017
ee8266b
oc: adm migrate isn't getting a full scheme. add missing types
deads2k Dec 12, 2017
bb2ecf0
oc: stop testing upstream shortcuts, we no longer statically include …
deads2k Dec 8, 2017
2db374f
oc: CLAYTON: using internal gives me external types
deads2k Dec 11, 2017
a4d2794
needs review: boring: change e2e status check
deads2k Dec 7, 2017
ebc468c
needs review: boring: ignore pod dns config for deployer pods
deads2k Dec 11, 2017
7256949
boring: needs review: update deletion so it never waits. Something c…
deads2k Dec 12, 2017
6c58566
boring: test updates
deads2k Dec 7, 2017
d4ee63c
generated
deads2k Dec 4, 2017
9e3ca9a
DANW: comments
deads2k Dec 12, 2017
6b39f30
separate kube controller informers in advance of splitting process
deads2k Dec 12, 2017
2fa3a79
BPAREES: don't pass unused streams to streamoptions because it hangs
deads2k Dec 12, 2017
d826d91
make migration printing work again
deads2k Dec 12, 2017
a783419
UPSTREAM: 57107: Check ns setup error during e2e
deads2k Dec 12, 2017
5c42201
make cluster quota admission wait for namespace to be present
deads2k Dec 12, 2017
b80c0d2
boring: update tsb e2e to exclude new events group
deads2k Dec 12, 2017
088b81d
update bootstrap role for router
deads2k Dec 12, 2017
cdc12ca
skip some networking tests that fail in the rebase
deads2k Dec 13, 2017
b374cbd
increase DC hook timeouts. indicates pod start latency problem and f…
deads2k Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/oc/admin/migrate/storage/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ import (

"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api/legacyscheme"

apiextensioninstall "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
apiregistrationinstall "k8s.io/kube-aggregator/pkg/apis/apiregistration/install"
"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/resource"
Expand Down Expand Up @@ -161,6 +164,9 @@ func NewCmdMigrateAPIStorage(name, fullName string, f *clientcmd.Factory, in io.
Long: internalMigrateStorageLong,
Example: fmt.Sprintf(internalMigrateStorageExample, fullName),
Run: func(cmd *cobra.Command, args []string) {
apiextensioninstall.Install(legacyscheme.GroupFactoryRegistry, legacyscheme.Registry, legacyscheme.Scheme)
Copy link
Contributor

Choose a reason for hiding this comment

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

Brute force. Wondering how kubectl is importing the internal types right now (not everything is ported to versioned types). Looks like there is no single point where everything is imported (anymore).

apiregistrationinstall.Install(legacyscheme.GroupFactoryRegistry, legacyscheme.Registry, legacyscheme.Scheme)
Copy link
Contributor

Choose a reason for hiding this comment

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

need a follow up to figure out what we need to do to revert this... migrate shouldn't need registered types... it reads into unstructured and puts back

Copy link
Contributor Author

Choose a reason for hiding this comment

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

need a follow up to figure out what we need to do to revert this... migrate shouldn't need registered types... it reads into unstructured and puts back

done


kcmdutil.CheckErr(options.Complete(f, cmd, args))
kcmdutil.CheckErr(options.Validate())
kcmdutil.CheckErr(options.Run())
Expand Down