Skip to content

Rebase kubernetes 1.8.1 #43

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.

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

Merged
merged 68 commits into from
Nov 20, 2017
Merged
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
39918a2
UPSTREAM: 53442: add nested encoder and decoder to admission config
deads2k Oct 4, 2017
3434d64
UPSTREAM: 53731: Use locks in fake dbus
smarterclayton Oct 11, 2017
53494a9
UPSTREAM: <carry>: reallow the ability to post across namespaces in api
Aug 11, 2015
4c19acf
UPSTREAM: <carry>: add kubelet timeouts
soltysh Dec 21, 2015
2ac3f32
UPSTREAM: <carry>: Tolerate node ExternalID changes with no cloud pro…
DirectXMan12 Jan 12, 2016
e80f69e
UPSTREAM: <carry>: Add our types to kubectl get error
Nov 18, 2016
329ae99
UPSTREAM: <carry>: Allow overriding default generators for run
liggitt Mar 16, 2016
d35e40e
UPSTREAM: <carry>: force import ordering for stable codegen
Nov 18, 2016
0c64419
UPSTREAM: <carry>: add service serving cert signer to token controller
deads2k May 26, 2016
8c4bae7
UPSTREAM: <carry>: fix fifo resync, remove after FIFO is dead
deads2k Jul 14, 2016
a2e91f9
UPSTREAM: <carry>: Disable file locking in clientcmd
smarterclayton Sep 13, 2016
a79ed91
UPSTREAM: <carry>: Disable e2e pre-check on scheduler predicates
Nov 28, 2016
a60737a
UPSTREAM: <drop>: merge multiple registrations for the same group
deads2k Feb 1, 2016
f08374e
UPSTREAM: <carry>: Double container probe timeout
smarterclayton Jan 16, 2017
447792c
UPSTREAM: <carry>: Increase service endpoint test timeout
smarterclayton Jan 16, 2017
a0eb7da
UPSTREAM: <carry>: Pod deletion can be contended, causing test failure
smarterclayton Jan 17, 2017
7b2fa48
UPSTREAM: docker/engine-api: 26718: Add Logs to ContainerAttachOptions
sttts Mar 9, 2017
29a0d99
UPSTREAM: carry: google.golang.org/grpc 231b4cfea0e79843053a33f5fe90b…
sttts Mar 15, 2017
f7c4465
UPSTREAM: 00000: make AsVersionedObjects default cleanly
deads2k Apr 25, 2017
bc337cc
UPSTREAM: 00000: disambiguate operation names for legacy discovery
deads2k Jun 7, 2017
b992ae7
UPSTREAM: 47347: actually check for a live discovery endpoint before …
deads2k Jun 12, 2017
db8808e
UPSTREAM: <carry>: commit generated openapi
deads2k Jul 24, 2017
af26db7
UPSTREAM: 49131: expose direct from config new scheduler method
deads2k Jul 6, 2017
168c81d
UPSTREAM: <carry>: make wiring in kubeproxy easy until we sort out co…
deads2k Jul 10, 2017
4e1b57b
UPSTREAM: <carry>: compensate for poor printer behavior
deads2k Jul 11, 2017
b68d613
UPSTREAM: <carry>: increase wait in kubecontrollers
deads2k Jul 10, 2017
3f63f0c
UPSTREAM: <carry>: add patch to allow shimming SCC
deads2k Jun 15, 2017
6dba7fc
UPSTREAM: 48884: Do not mutate pods on update
smarterclayton Jul 13, 2017
b0c09ff
UPSTREAM: 49312: allow the /version endpoint to pass through
deads2k Jul 20, 2017
80b7396
UPSTREAM: <carry>: increase timeout in TestCancelAndReadd even more
soltysh Sep 18, 2017
32e2e1d
UPSTREAM: google/cadvisor: 1741: add CRI-O handler
sjenning Sep 18, 2017
d0a8db3
UPSTREAM: <carry>: allow a filter function on admission registration
deads2k Oct 2, 2017
d1694e7
UPSTREAM: 53318: create separate transports for liveness and readines…
sjenning Oct 2, 2017
2c0fba8
UPSTREAM: 47806: kubelet: fix inconsistent display of terminated pod …
dcbw Jun 20, 2017
2eea9ee
UPSTREAM: <carry>: ignored namespace lifecycle resources
deads2k Jun 14, 2017
69aadde
UPSTREAM: <carry>: openapi generation for createNamespacedDeploymentC…
soltysh Oct 2, 2017
dcfcc59
UPSTREAM: <drop>: generated updates
mfojtik Oct 12, 2017
cf93c46
UPSTREAM: <carry>: allow controller context injection to share informers
deads2k Sep 7, 2017
82dc400
UPSTREAM: <carry>: Fix to avoid REST API calls at log level 2
mfojtik Oct 16, 2017
c35d305
UPSTREAM: <carry>: Do not error out on pods in kube-system
smarterclayton Jul 27, 2017
abb6024
UPSTREAM: 53037: Verify client cert before reusing existing bootstrap
jcbsmpsn Aug 16, 2017
c2214fb
UPSTREAM: <carry>: update clientset generator for openshift groups
mfojtik Oct 23, 2017
3a7da86
UPSTREAM: 53857: kubelet sync pod throws more detailed events
joelsmith Oct 13, 2017
199b3f2
UPSTREAM: 52673: default service resolver for webhook admission
deads2k Oct 12, 2017
e600f1c
UPSTREAM: 53823: allow fail close webhook admission
deads2k Oct 12, 2017
4e23503
UPSTREAM: 53896: decode admission responses into a fresh object
deads2k Oct 13, 2017
fc75a98
UPSTREAM: <drop>: drop in 1.9 rebase. Shims enough admission webhook …
deads2k Oct 13, 2017
735c248
UPSTREAM: 53464: output empty creationTimestamps as null
juanvallejo Oct 4, 2017
ed32dc4
UPSTREAM: 53167: Do not GC exited containers in running pods
sjenning Oct 16, 2017
fab08f0
UPSTREAM: 51750: output `<none>` for colums not found
juanvallejo Oct 24, 2017
4f52607
UPSTREAM: 54593: Removed containers are not always waiting
joelsmith Oct 26, 2017
e609be4
UPSTREAM: <drop>: add origin resource shortcuts to kube shortcut rest…
Dec 19, 2016
9d59240
UPSTREAM: 54763: make iptables wait flag generic; increase the max wa…
Oct 29, 2017
3102892
UPSTREAM: 54812: Allow override of cluster level (default, whitelist)…
Oct 30, 2017
2495f6a
UPSTREAM: 54828: trigger endpoint update on pod deletion
freehan Oct 31, 2017
9318a8b
UPSTREAM: 54921: rename metric reflector_xx_last_resource_version to …
Nov 1, 2017
5b8f4aa
UPSTREAM: 55028: kubelet: dockershim: remove orphaned checkpoint files
sjenning Nov 2, 2017
339287f
UPSTREAM: 54979: When cert dir is relative, cert rotation builds inco…
smarterclayton Nov 2, 2017
0b7ce15
UPSTREAM: 54257: Use GetByKey() in typeLister_NonNamespacedGet
tiran Oct 19, 2017
3052f36
UPSTREAM: 52503: Get fallback termination msg from docker when using …
joelsmith Sep 14, 2017
d84ed50
UPSTREAM: 53793: User separate client for leader election in scheduler
wojtek-t Oct 12, 2017
e0dd265
UPSTREAM: 55223: Fix protobuf generator for aliases to repeated types
mfojtik Nov 7, 2017
24f53e1
UPSTREAM: 53401: Fix spam of multiattach errors in event logs
gnufied Oct 3, 2017
4020059
UPSTREAM: 53682: Make sure we use rwlocks not just RLock
gnufied Oct 10, 2017
2734462
UPSTREAM: 53831: Fix volume reconciler test flake
gnufied Oct 13, 2017
c1d431d
UPSTREAM: 53606: implement ApproximatePodTemplateObject upstream
juanvallejo Sep 18, 2017
140fa32
regenerate listers
mfojtik Nov 8, 2017
0d5291c
UPSTREAM: <drop>: get.go doesn't handle metav1.Status returned by res…
mfojtik Nov 9, 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
Prev Previous commit
UPSTREAM: <drop>: get.go doesn't handle metav1.Status returned by res…
…t.client (drop in 1.9)
  • Loading branch information
mfojtik committed Nov 9, 2017
commit 0d5291cc63b7b3655b11bc15e8afb9a078049d09
13 changes: 13 additions & 0 deletions pkg/kubectl/cmd/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import (

kapierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
unstructuredconverter "k8s.io/apimachinery/pkg/conversion/unstructured"
"k8s.io/apimachinery/pkg/runtime"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/sets"
Expand Down Expand Up @@ -364,6 +366,17 @@ func RunGet(f cmdutil.Factory, out, errOut io.Writer, cmd *cobra.Command, args [
},
}
for _, info := range infos {
// FIXME: This should be fixed in 1.9 and is needed to handle
// oc get projectrequest -o yaml
if _, ok := info.Object.(*metav1.Status); ok {
obj, err := unstructuredconverter.NewConverter(false).ToUnstructured(info.Object)
if err != nil {
errs = append(errs, err)
} else {
list.Items = append(list.Items, unstructured.Unstructured{Object: obj})
}
continue
}
list.Items = append(list.Items, *info.Object.(*unstructured.Unstructured))
}
obj = list
Expand Down