github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,381 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

3025 Commits (a17517ff6e1a1050a7be14e36fdaed165299692d)

Author SHA1 Message Date
Clayton Coleman 3e2e4714a2 Always set ?namespace in query if specified 
Revise our code to only call Request.Namespace() if a namespace
*should* be present.  For root scoped resources, namespace should
be ignored.  For namespaced resources, it is an error to have
Namespace=="".
 2015-02-16 00:23:38 -05:00
Clayton Coleman 9175082a1c Split naming behavior out into objects that are derived from the request 
Fix bug with cross namespace queries not being possible.  Ensure selflink
is set on lists correctly.
 2015-02-16 00:23:38 -05:00
derekwaynecarr c0ce15c588 Make list watch take a ListFunc and WatchFunc, provide default funcs from client 2015-02-15 22:26:05 -05:00
Mike Danese 9f9153256d fix error where we can't use patch and add cmd-test for patch and file 
update
 2015-02-15 10:43:35 -08:00
Clayton Coleman dc3b327951 Allow runtime.SetList() on an api.List 
SetList doesn't allow api.List
 2015-02-14 23:37:23 -05:00
Salvatore Dario Minonne bc868b97b8 Fix typos in vagrant.go 2015-02-14 06:20:03 +01:00
Dawn Chen 1ce999318e Better debugging log for investigating pod unknown status. 2015-02-13 15:27:14 -08:00
Dawn Chen 20dc1c2481 Merge pull request #4410 from brendandburns/fixer 
Don't delete the pod infrastructure container on health check failures.
 2015-02-13 15:18:27 -08:00
Dawn Chen c8b6c62698 Merge pull request #4433 from vmarmol/purge 
Use Docker name (not ID) to parse Kubernetes components.
 2015-02-13 14:31:47 -08:00
Tim Hockin 063ff6677c Merge pull request #4422 from derekwaynecarr/set_difference 
Set should have a difference function
 2015-02-13 14:16:28 -08:00
Victor Marmol 5d6ad845cc Use Docker name (not ID) to parse Kubernetes components. 
Since the parsing function doesn't return an error all the components
returned empty strings. This caused us to enforce the MaxContainerLimit
as a global limit instead of a per-container limit.

Fixes #4413.
 2015-02-13 13:08:15 -08:00
derekwaynecarr e7a0340ad7 Set should have a difference function 2015-02-13 15:39:56 -05:00
Jeff Lowdermilk b23230e616 Merge pull request #4296 from deads2k/deads-allow-dots 
allow dots in config set
 2015-02-13 12:27:36 -08:00
Clayton Coleman c977a45864 Merge pull request #4419 from smarterclayton/expand_generic_resources 
Expand the generic registry
 2015-02-13 13:53:20 -05:00
Clayton Coleman 4b5642450e Merge pull request #4352 from liggitt/user_context 
Make requesting user available in context
 2015-02-13 13:27:09 -05:00
Jeff Lowdermilk fe045ba630 Merge pull request #4416 from deads2k/deads-fix-merge-order 
properly handle mergo map versus value rules
 2015-02-13 10:26:11 -08:00
deads2k 941461044b guard against unexpected type during config manipulation 2015-02-13 13:15:47 -05:00
deads2k 2dcaab75f5 allow dots in config set 2015-02-13 13:11:42 -05:00
Clayton Coleman 8440310ea0 Adapt to changes to generic etcd/registry 2015-02-13 13:11:33 -05:00
Clayton Coleman 23d199ded9 Make generic etcd more powerful and return operations from etcd 
When we complete an operation, etcd usually provides a response
object.  Return that object up instead of querying etcd twice.
 2015-02-13 13:11:33 -05:00
Salvatore Dario Minonne fda17c1b7a kubectl delete resource : remove all resources 2015-02-13 18:25:41 +01:00
Brendan Burns 4ad3ea438d Revert "Revert "Add an event for health check failures."" 
This reverts commit fc4e711a8c.
 2015-02-13 09:23:13 -08:00
Clayton Coleman 78385b1230 Set 201 when RESTCreater returns a simple api.Status object 2015-02-13 12:12:50 -05:00
Clayton Coleman abe8adc2e2 Expose new REST strategy methods for Pods 2015-02-13 12:12:50 -05:00
Clayton Coleman 09f18031fe Merge pull request #4285 from brendandburns/auth 
Add a more detailed error message for potential auth fails in docker pull.
 2015-02-13 12:08:48 -05:00
Saad Ali fc4e711a8c Revert "Add an event for health check failures." 2015-02-13 08:10:45 -08:00
Saad Ali c112f8f1bb Merge pull request #4408 from brendandburns/printing 
Add an event for health check failures.
 2015-02-13 07:59:26 -08:00
Saad Ali 6dca22c9f1 Merge pull request #4409 from brendandburns/docs 
Add some docs to the template format.
 2015-02-13 07:50:16 -08:00
deads2k fef503932f properly handle mergo map versus value rules 2015-02-13 08:29:00 -05:00
Brendan Burns 5e49a606e1 Address changes. 2015-02-12 21:39:42 -08:00
Brendan Burns 8b7dfc9359 Return logs for failed and succeeded pods too. 2015-02-12 21:36:25 -08:00
Brendan Burns 4dbf98e98f Don't delete the pod infrastructure container on health check failures. 2015-02-12 21:28:32 -08:00
Brendan Burns c03a435501 Add an event for health check failures. 2015-02-12 19:08:23 -08:00
Brendan Burns f63cf05d21 Add some docs to the template format. 2015-02-12 18:29:11 -08:00
Jordan Liggitt 083ce268e0 Put user in context, map requests to context above resthandler layer 2015-02-12 20:58:04 -05:00
Jordan Liggitt ec66e5147e Add user helper methods to context 2015-02-12 20:44:20 -05:00
Brendan Burns 0532c46217 Add a more detailed error message for potential auth fails in docker pull. 2015-02-12 17:00:59 -08:00
Saad Ali ae92274e8d Merge pull request #4402 from MikeJeffrey/docs 
Comments go above the sample line in kubectl docs.
 2015-02-12 16:43:35 -08:00
Brendan Burns e300d6c94b Merge pull request #4399 from derekwaynecarr/update_cache_func 
If an object has no namespace, do not add a leading slash
 2015-02-12 16:17:41 -08:00
MikeJeffrey ca1e9f8061 Comments go above the sample line in kubectl docs. 2015-02-12 15:49:25 -08:00
derekwaynecarr 192e186119 If an object has no namespace, do not add a leading slash 2015-02-12 17:14:16 -05:00
Clayton Coleman 0b3162b3f4 Merge pull request #4306 from saad-ali/eventCompression1 
Compress recurring events in to a single event to optimize etcd storage
 2015-02-12 16:59:19 -05:00
Eric Tune dd8f335380 Merge pull request #4376 from dchen1107/podstatus 
Fix podstatus issue caused by docker's resource temporarily unavailable issue
 2015-02-12 13:16:09 -08:00
Saad Ali cdb93a7c46 Merge pull request #4387 from smarterclayton/rename_try_again_later 
Rename TryAgainLater status code to ServerTimeout
 2015-02-12 12:23:57 -08:00
Clayton Coleman c24f4a24b4 Rename TryAgainLater status code to ServerTimeout 2015-02-12 15:01:12 -05:00
Alex Robinson 60ab9904d5 Merge pull request #4371 from a-robinson/port 
Add extra explanation of the purpose of service's ContainerPort field to the API comments.
 2015-02-12 11:45:45 -08:00
Alex Robinson 3301f19a8a Add extra explanation of the purpose of service's ContainerPort field to 
the API comments. We were asked about this in issue #4332.
 2015-02-12 19:37:58 +00:00
Steve Reed 38230ef12f Adds replication controller name to "Too many|few" logging 2015-02-12 09:18:56 -08:00
Saad Ali 3bc8f4e793 Merge pull request #4359 from erictune/no_bound_pod_envs 
Stop putting env vars into BoundPods.
 2015-02-12 09:12:19 -08:00
Clayton Coleman 0a435c815f Merge pull request #4313 from derekwaynecarr/client_watch_namespaces 
Add ability to watch namespaces from client
 2015-02-12 11:51:19 -05:00
Clayton Coleman b2d50ce1cc Merge pull request #4329 from smarterclayton/bindings_incorrectly_removed 
Bindings were not correctly removed across namespaces on pod update and delete
 2015-02-12 11:43:22 -05:00
Eric Tune 5b4569697f Stop putting env vars into BoundPods. 
They will still show up in etcd.  They never were available
through the API.

A subsequent PR(s) will rip out all BoundPods code.
Working in small increments.

This PR will cause users on lagging cloud providers
to not get env vars in their pods if they update to this code.
They have already been warned via email.

Removed unit tests of BasicBoundPodFactory.
There is adequate coverage in pkg/kubelet/kubelet_test.go.
 2015-02-12 08:37:23 -08:00
derekwaynecarr 73aa0cc192 Add a unit test to exercise watch 2015-02-12 11:25:33 -05:00
Saad Ali 42f04587d0 Merge pull request #4363 from yujuhong/defaulting_tests 
Add defaulting tests for API v1beta2 and v1beta3
 2015-02-12 07:56:23 -08:00
Saad Ali b5f4849a53 Merge pull request #4364 from vmarmol/cleanup 
Minor clarification of --server flag.
 2015-02-12 07:54:39 -08:00
Saad Ali 35a62fb89a Merge pull request #4373 from vishh/3391 
Improve error handling for '/containerLogs' API in kubelet.
 2015-02-12 07:51:53 -08:00
Saad Ali c216b2660c Merge pull request #4367 from vmarmol/print-client 
Print client version before evaluating server's.
 2015-02-12 07:48:24 -08:00
Clayton Coleman 7d43971614 Merge pull request #4326 from yujuhong/phantom_pods 
Allow AtomicUpdate() to surface the error when the key doesn't exist
 2015-02-12 10:19:09 -05:00
Clayton Coleman 0a2d713803 Merge pull request #4263 from smarterclayton/simplify_apiserver 
Remove layers of indirection between apiinstaller and resthandler
 2015-02-12 10:03:41 -05:00
Clayton Coleman e6fdac1365 Return an error when names are empty 2015-02-12 09:45:13 -05:00
Clayton Coleman 371349f858 Merge pull request #4125 from derekwaynecarr/store_by_namespace 
Enable look-up by secondary index in cache
 2015-02-12 09:44:26 -05:00
derekwaynecarr e76dcbdfa2 Add ability to watch namespaces 2015-02-12 09:42:29 -05:00
Dawn Chen af54c62766 Fix podstatus issue caused by docker's resource temporarily unavailable error 2015-02-11 23:52:58 -08:00
saadali 033577efa2 Optimize etcd storage by compressing recurring events in to a single event 2015-02-11 22:57:44 -08:00
Yu-Ju Hong 6813683ee2 Allow AtomicUpdate() to surface the error when the key doesn't exist 
In some cases, when the key doesn't exist, AtomicUpdate should simply fail and
surface the error. This change adds a new function parameter "ignoreNotFound"
for this purpose.
 2015-02-11 21:56:28 -08:00
Vishnu Kannan 922881fcd2 Improve error handling for '/containerLogs' API in kubelet. 2015-02-12 02:22:26 +00:00
Victor Marmol d158bbd62a Print client version before evaluating server's. 
This will allow the client version to be printed even if the server
version is not available.

Fixes #4098.
 2015-02-11 17:11:25 -08:00
Victor Marmol 0a64fecaf5 Minor clarification of --server flag. 
Fixes #3425.
 2015-02-11 17:04:41 -08:00
Yu-Ju Hong 4bce52a5f6 Add defaulting tests for API v1beta2 and v1beta3 
This commit also add more tests in v1beta1/defaults_test.go
 2015-02-11 16:08:52 -08:00
roberthbailey 4c4b4261d4 Merge pull request #4354 from simon3z/master 
ovirt: fix IPAddress lookup implementation
 2015-02-11 15:32:03 -08:00
roberthbailey b9d6b3b547 Merge pull request #4345 from vmarmol/noports 
Don't include port in config when not specified.
 2015-02-11 15:07:43 -08:00
Federico Simoncelli 45bc19beb5 ovirt: fix IPAddress lookup implementation 
The ovirt instance is reported using its hostname. The IPAddress
implementation should lookup the ip (instead of parsing it as if
it was already an address).

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
 2015-02-11 17:47:26 -05:00
Clayton Coleman 8f6e3607a9 Add monitoring as a filter 2015-02-11 17:07:23 -05:00
Clayton Coleman 26f08b7807 RESTStorage should not need to know about async behavior 
Also make sure all POST operations return 201 by default.
Removes the remainder of the asych logic in RESTStorage and
leaves it up to the API server to expose that behavior.
 2015-02-11 16:26:08 -05:00
Clayton Coleman 79cb93002e Remove asynchronous channel on RESTStorage interfaces 2015-02-11 16:26:07 -05:00
Clayton Coleman d167c11b59 Remove layers of indirection between apiinstaller and resthandler 
Make the RESTHandler feel more go-restful, set the stage for adding
new types of subresource collections.
 2015-02-11 16:26:06 -05:00
Victor Marmol 6a80553d7b Don't include port in config when not specified. 
When no port is specified the flag default of "-1" is taken.

Fixes #4305
 2015-02-11 13:20:51 -08:00
derekwaynecarr 7b34d6ef8e The namespace context for a get of an individual namespace is the namespace 2015-02-11 16:06:51 -05:00
roberthbailey 15c57efde2 Merge pull request #4327 from a-robinson/timecache 
Remove the unused TimeCache file and its tests.
 2015-02-11 11:46:51 -08:00
Clayton Coleman 6f85b655cc Bindings were not correctly removed across namespaces on pod update and delete 
BoundPods must be checked for Name and Namespace equality, not just name
equality. In the future, we should also check for UID equality.
 2015-02-11 14:35:28 -05:00
Brian Grant 20f7cbb87b Merge pull request #4291 from jlowdermilk/delete-kubecfg 
Remove kubecfg, cleanup a few stray references.
 2015-02-11 11:18:59 -08:00
Eric Tune 9ea4d2f814 Merge pull request #4323 from dchen1107/podstatus 
Check if kubelet does know such Pod before querying status.
 2015-02-11 11:13:50 -08:00
Alex Robinson b58160c5ea Remove the unused TimeCache file and its tests. Fixes issue #4192. 2015-02-11 11:11:43 -08:00
Dawn Chen f5f2b6f773 Check if kubelet does know such Pod before querying status. 2015-02-11 10:16:04 -08:00
Jeff Lowdermilk 8276a9e03d Merge pull request #4295 from MikeJeffrey/kubectldocs 
Clean up kubectl help for auto-gen'd kubectl.md
 2015-02-11 09:41:30 -08:00
Deyuan Deng f431e0e780 Merge pull request #4274 from mikedanese/descirbe-node-condition 
add NodeCondition and PodCondition to kubectl describe node/pod
 2015-02-10 20:15:20 -05:00
Jeff Lowdermilk 197059b65d Remove kubecfg, cleanup a few stray references. 2015-02-10 16:43:12 -08:00
Alex Robinson ab62b689a5 Add monitoring instrumentation for the remaining HTTP handlers in the apiserver. 2015-02-10 23:19:49 +00:00
Victor Marmol 535502ead6 Merge pull request #4272 from a-robinson/metrics 
Basic initial instrumentation of the apiserver
 2015-02-10 14:58:14 -08:00
Alex Robinson d39262d743 Consolidate the prometheus Counters into a shared CounterVec and remove 
the "code" label from the latencies SummaryVec.
 2015-02-10 22:47:56 +00:00
Clayton Coleman 06656efe62 Merge pull request #4283 from ncdc/allow-proxy-to-resource-root-path 
Allow proxying to a resource at /
 2015-02-10 17:45:31 -05:00
Mike Danese dac5e9b4d0 add NodeCondition and PodCondition to kubectl describe node/pod 2015-02-10 14:17:31 -08:00
Dawn Chen c55921676c Merge pull request #4271 from ArtfulCoder/logging_etcd 
Updated etcd-pod-dir-fetch logging.
 2015-02-10 13:41:06 -08:00
Alex Robinson 2463cff79c Basic initial instrumentation of the apiserver. This links in the 
prometheus library for monitoring, which exports some basic resource
usage metrics by default, like number of goroutines, open file
descriptors, resident and virtual memory, etc. I've also started adding
in request counters and latency histograms, but have only added them to two
of our HTTP handlers. If this looks reasonable, I'll add them to the rest
in a second PR.
 2015-02-10 20:44:28 +00:00
Abhishek Shah febf8c9b2c Fixed formattting issues in etcd.go 2015-02-10 12:03:40 -08:00
MikeJeffrey e5459c8802 Clean up kubectl help for auto-gen'd kubectl.md 2015-02-10 12:02:05 -08:00
Clayton Coleman dce4cd8b1d Merge pull request #3613 from derekwaynecarr/namespace_as_kind 
Namespace as kind
 2015-02-10 14:49:58 -05:00
roberthbailey 3f90de3f80 Merge pull request #4289 from jlowdermilk/cleanup 
Explicitly send error string to Fatal log 2
 2015-02-10 11:37:26 -08:00
roberthbailey ef71b43056 Merge pull request #4281 from brendandburns/fixer 
Add some error checking to prevent obscure failures.
 2015-02-10 11:22:58 -08:00
Jeff Lowdermilk 96c9a15ed5 Merge pull request #4279 from jimmidyson/proxy-tweaks 
Configurable API prefix for kubectl proxy
 2015-02-10 11:21:22 -08:00
Jeff Lowdermilk aff7f63d7f Explicitly send error string to Fatal log 2 2015-02-10 10:02:16 -08:00
Clayton Coleman 8811fd2971 Merge pull request #4284 from brendandburns/cleanup 
Explicitly send the error string to the Fatal log.
 2015-02-10 12:48:30 -05:00
Jeff Lowdermilk ed9761fef1 Merge pull request #4237 from brendandburns/pd_fix 
Add a label command to kubectl.
 2015-02-10 09:47:18 -08:00
Mike Danese c72c2a0d1e added tests 2015-02-10 08:30:13 -08:00
Mike Danese 3d0cd81feb refactor pkg/probe ProbeRunners to interfaces and move global probers into kubelet field for testability 2015-02-10 08:30:11 -08:00
Mike Danese 043794492e implement readiness. 2015-02-10 08:30:09 -08:00
Brendan Burns 8f3136cd37 Explicitly send the error string to the Fatal log. 2015-02-10 07:12:13 -08:00
Andy Goldstein 4f89ed9d6a Allow proxying to a resource at / 
Add a route for /proxy/<kind>/<name>/ without requiring additional path
information. This allows for e.g. /proxy/service/myservice/, which will
proxy to the service at /, instead of always requiring something in the
path.
 2015-02-10 10:04:40 -05:00
derekwaynecarr 0bd0e12bbc Add support for Namespace as Kind 
Add example for using namespaces
 2015-02-10 09:50:50 -05:00
derekwaynecarr 151be7773c Rename api.Namespace to api.NamespaceValue to avoid name collision 2015-02-10 09:44:29 -05:00
Brendan Burns e7b11d09de Add some error checking to prevent obscure failures. 2015-02-10 06:32:26 -08:00
Jimmi Dyson f4a9b62d06 Configurable API prefix for kubectl proxy 2015-02-10 13:58:46 +00:00
Brendan Burns 3fa9ddd1e1 Add an (optional) proxy to the TLS config. 
Also fill in some other reasonable defaults.
 2015-02-10 05:20:47 -08:00
Brendan Burns ac35aa5e32 Add a label command. 2015-02-09 20:09:02 -08:00
Mike Danese 27dfebed98 api changes to support readiness. 2015-02-09 18:27:46 -08:00
Abhishek Shah f136886dde Updated logging. If etcd-pod-dir-fetch fails because dir was absent, an info message is logged. 2) For all other reasons, the regular error message is logged. 2015-02-09 18:03:58 -08:00
Brian Grant e27d534b87 Merge pull request #4262 from vishh/api_resources 
Rename ResourceRequirementSpec to ResourceRequirements.
 2015-02-09 17:26:05 -08:00
Saad Ali 6167aeb8fa Merge pull request #4233 from thockin/mastersvc 
Fix wrong port on kubernetes service
 2015-02-09 17:24:07 -08:00
Vishnu Kannan d0524d4778 Rename ResourceRequirementSpec to ResourceRequirements. 2015-02-09 23:19:38 +00:00
Deyuan Deng 4c6f6e0efc Refactor RegisterRetryCount, improve tests 2015-02-09 17:55:28 -05:00
Deyuan Deng 55b9944cfe Remove pods from failed node 2015-02-09 17:50:24 -05:00
derekwaynecarr 53f1efa484 Make sure we remove old object from index before adding new 2015-02-09 16:44:51 -05:00
derekwaynecarr 1cf69bdefc Support multiple index functions, address feedback 2015-02-09 16:44:51 -05:00
derekwaynecarr 7a2d63048d Enable look-up by secondary index in cache 2015-02-09 16:44:51 -05:00
Ravi Sankar Penta 3a5ef05f64 Make periodic sync nodes from cloud provider optional. 
--sync_nodes=false gives user flexibility to add/remove nodes in the
cluster using REST api/kubectl cli and at the same time can use
cloud provider for other resources like persistent disks, etc.
 2015-02-09 13:42:44 -08:00
Jeff Lowdermilk 6021dcba30 Merge pull request #4213 from smarterclayton/use_name_from_server 
Use name from server when displaying create/update
 2015-02-09 09:41:20 -08:00
Marek Grabowski 72a066a992 Add more information to Validator error messages. 2015-02-09 18:07:09 +01:00
Deyuan Deng 91b43a4b16 Merge pull request #4165 from smarterclayton/ignore_already_exists_errors_on_create_node 
NodeController should tolerate when nodes already exist
 2015-02-09 11:01:17 -05:00
Clayton Coleman 8c1206ca2d NodeController should tolerate when nodes already exist 
During startup, if nodes have already been defined the controller
does not need to create them, just needs to keep them up to date.
When defining a static list, the controller would loop and fail
repeatedly if the node existed.

I don't know if we need to update the node during registration,
as long as the sync loop checks it later.
 2015-02-08 21:44:08 -05:00
Clayton Coleman 52c6c60b15 Use name from server when displaying create/update 
Allows generated names from files to be displayed so users can
interact with them.
 2015-02-08 21:40:47 -05:00
Tim Hockin 2707bcf10e Fix wrong port on kubernetes service 
* Rename a field to make it more obvious.
* Fix some comments and other minor artifacts.

Verified by hitting the service on 443, and by hitting the master on 8080,
6443, and 7080.
 2015-02-06 20:23:17 -08:00
Brendan Burns cc7279f6a8 Actually use the safeFormatAndMounter... 2015-02-06 17:01:05 -08:00
Brian Grant a8964c58c9 Merge pull request #4130 from ddysher/node-lifecycle 
Populate node status transition timestamp and reason
 2015-02-06 16:05:36 -08:00
Deyuan Deng 08721e0a00 Populate node statu transition timestamp and reason 2015-02-06 18:42:41 -05:00
Tim Hockin e89a4ef33f Merge pull request #4151 from brendandburns/fixer 
Adjust replication controller validation to be more flexible. Fix docs.
 2015-02-06 15:26:13 -08:00
Brendan Burns 31ce2a9411 Adjust replication controller validation to be more flexible about 
read/write volumes.
Update docs to reflect reality as it is implemented.
 2015-02-06 14:58:21 -08:00
Zach Loafman b77abb5945 Merge pull request #4221 from brendandburns/pd_fix 
Make gce_safe_format_and_mount actually work correctly.
 2015-02-06 14:50:20 -08:00
Dawn Chen 8f69192be4 Merge pull request #4222 from brendandburns/status 
Add some more verbose logging around pod status.
 2015-02-06 13:06:12 -08:00
Brendan Burns b527b8a9ef Add some more verbose logging around pod status. 2015-02-06 12:42:17 -08:00
Brendan Burns 3d6c9fc9e8 Fix gce_pd to only use safe_format_and_mount when mounting block devices. 2015-02-06 12:41:21 -08:00
Jeff Lowdermilk 9c7817577b Merge pull request #4200 from brendandburns/race 
Add some locking to prevent go data race logic from tripping.
 2015-02-06 12:29:56 -08:00
Brendan Burns 35fa143b29 Revert "Revert "Start using GCE safe format and mount for mounting disks."" 
This reverts commit 858a85e8fe.
 2015-02-06 10:09:00 -08:00
Brendan Burns 94d852e8a6 Merge pull request #4214 from brendandburns/pd_fix 
Revert "Start using GCE safe format and mount for mounting disks."
 2015-02-06 09:58:51 -08:00
Brendan Burns 858a85e8fe Revert "Start using GCE safe format and mount for mounting disks." 
This reverts commit 3f109d6d46.
 2015-02-06 09:58:03 -08:00
Dawn Chen 05de54249f Merge pull request #4191 from simon3z/master 
api: add image's id to ContainerStatus
 2015-02-06 09:35:44 -08:00
Federico Simoncelli e01df69565 api: add image's id to ContainerStatus 
Sometimes for external applications it is important to identify
exactly what images are running. Since tags can be moved to point
to newer builds this information can be used to identify old images
running.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
 2015-02-06 09:01:14 -05:00
saadali 79cbcf918e Modify Event struct to allow compressing multiple recurring events in to a single event. 
# *** ERROR: *** Some API files are missing the required field descriptions
# Add description tags to all non-inline fields in the following files:
#   pkg/api/v1beta1/types.go
#   pkg/api/v1beta2/types.go
#
# Your commit will be aborted unless you fix these.
#   COMMIT_BLOCKED_ON_DESCRIPTION
 2015-02-05 21:50:29 -08:00
Brendan Burns ff4c23d803 Merge pull request #4208 from brendandburns/e2e2 
Revert filtering unknown pods, as I believe that it is causing e2e flakes.
 2015-02-05 21:46:13 -08:00
Brendan Burns 234f951867 Revert filtering unknown pods, as I believe that it is causing e2e flakes. 2015-02-05 20:57:01 -08:00
Brendan Burns 783e1de5bb Add some locking to prevent go data race logic from tripping. 2015-02-05 17:27:58 -08:00