791c694c21
Merge pull request #22132 from pmorie/remove-atomic-sentinel
...
Auto commit by PR queue bot
2016-03-05 12:06:16 -08:00
357a9d1fdf
Merge pull request #22033 from yifan-gu/rkt_get_status
...
Auto commit by PR queue bot
2016-03-05 10:46:47 -08:00
3c5b57b217
Merge pull request #21805 from childsb/CanSupport_fix
...
Auto commit by PR queue bot
2016-03-05 10:09:35 -08:00
2e03822386
Merge pull request #21335 from deads2k/make-rc-logs-work
...
Auto commit by PR queue bot
2016-03-05 09:37:24 -08:00
f359bd96a7
Merge pull request #20578 from dcbw/dont-cni-hostnet-pods
...
Auto commit by PR queue bot
2016-03-05 09:03:12 -08:00
b198c820cd
Merge pull request #22402 from erictune/psp-simplify
...
Auto commit by PR queue bot
2016-03-05 07:55:19 -08:00
822374ff95
Merge pull request #22123 from justinsb/aws_awsinstance_refactor
...
Auto commit by PR queue bot
2016-03-05 06:50:55 -08:00
43e6602c42
AWS: Fix test failure introduced by rebase
2016-03-05 08:11:30 -05:00
cff564b1a6
AWS: Remove dead code and fix up comments
2016-03-05 08:09:40 -05:00
f8e6098e4d
AWS: Update tests for refactoring
2016-03-05 08:09:40 -05:00
af9efa02b4
AWS: Remove getSelfAWSInstance, use field directly
...
Now that we always populate the local instance, we don't need a getter.
2016-03-05 08:09:40 -05:00
8c492c7536
AWS: Don't store the AZ on the cloud
...
Now we have Ubernetes-Lite, an AWSCloud can span multiple AZs.
2016-03-05 08:09:40 -05:00
ddb5072a54
AWS: Don't pretend getSelfAWSInstance can return an error
...
It can't any more; this simplifies calling code.
2016-03-05 08:09:40 -05:00
40d0afbb1b
AWS: Capture VPC ID into AWSCloud, avoiding requeries
...
By storing the VPC ID on AWSCloud, we avoid the need to requery or to
pass it around.
2016-03-05 08:09:40 -05:00
00b666f853
AWS: Rename getInfo -> describeInstance/describeVolume
...
Makes it clearer that we are making an AWS API call
2016-03-05 08:09:40 -05:00
efa68a3590
AWS: Build awsInstance as part of cloud provider creation
...
We need getSelfAWSInstance to be working anyway; we might as well build
it early, and then we can use its methods to extract e.g. the VPC ID
2016-03-05 08:09:40 -05:00
0375fa057f
AWS: Refactor newAWSInstance
...
Now that we can't build an awsInstance from metadata, because of the
PrivateDnsName issue, we might as well simplify the arguments.
Create a 'placeholder' method though - newAWSInstanceFromMetadata - that
documents the desire to use metadata, shows how we would get it, but
links to the bug which explains why we can't use it.
2016-03-05 08:09:40 -05:00
bba65e8afc
Merge pull request #18134 from feihujiang/markGenericTopLevelPrefixProxyDeprecated
...
Auto commit by PR queue bot
2016-03-05 05:08:52 -08:00
2808973503
Merge pull request #22038 from mqliang/daemonset-cache
...
Auto commit by PR queue bot
2016-03-05 03:38:55 -08:00
953e21c8f9
Merge pull request #22526 from kargakis/another-rolling-updater-fix
...
Auto commit by PR queue bot
2016-03-05 03:07:15 -08:00
663f7b8a4c
Merge pull request #22487 from vishh/node-status-cpu-hardcap
...
Auto commit by PR queue bot
2016-03-05 02:32:33 -08:00
a80f6a7ea6
Merge pull request #21905 from justinsb/aws_wrap_security_group_error
...
Auto commit by PR queue bot
2016-03-05 01:25:38 -08:00
e9d3be83ae
Merge pull request #22241 from Random-Liu/recover-back-off-behaviour
...
Auto commit by PR queue bot
2016-03-05 00:05:15 -08:00
20838c3314
Merge pull request #22560 from janetkuo/pod-update-delete-log
...
Auto commit by PR queue bot
2016-03-04 23:32:35 -08:00
0f335df106
Merge pull request #22192 from bprashanth/timeout_client
...
Auto commit by PR queue bot
2016-03-04 22:59:24 -08:00
8ba70b573e
Merge pull request #22483 from yujuhong/force_update
...
Auto commit by PR queue bot
2016-03-04 22:26:14 -08:00
e91048ea96
Merge pull request #22392 from janetkuo/retry-update-precondition
...
Auto commit by PR queue bot
2016-03-04 19:21:14 -08:00
d9d0fdecd3
Merge pull request #22570 from janetkuo/inactive-pods-not-available
...
Auto commit by PR queue bot
2016-03-04 18:11:20 -08:00
264f5786ea
Merge pull request #21987 from justinsb/fixx_21895
...
Auto commit by PR queue bot
2016-03-04 17:07:57 -08:00
f666e87217
Filter out inactive pods first when determining if it's available
2016-03-04 16:32:32 -08:00
3f8086192b
Merge pull request #21982 from justinsb/fix_21952
...
Auto commit by PR queue bot
2016-03-04 16:23:45 -08:00
9bfd70f8f6
Merge pull request #20688 from ArtfulCoder/podhostname
...
Specify Pod hostname by Annotation
2016-03-04 15:17:34 -08:00
2a6d0756d2
Merge pull request #22553 from janetkuo/etcd-storage-update-interpret
...
Auto commit by PR queue bot
2016-03-04 15:14:52 -08:00
a435537e27
Merge pull request #21966 from madhusudancs/scale-deployment-replicaset
...
Auto commit by PR queue bot
2016-03-04 14:40:10 -08:00
59b1f5b8b5
Log contents of pods on creation/update/deletion in controllers
2016-03-04 13:57:34 -08:00
a75c0a3cf0
Merge pull request #22555 from yujuhong/revert_retries
...
Revert "Set timeout for accessing credential provider's URL"
2016-03-04 13:55:41 -08:00
a3c00aadd5
Specify hostname, subdomain via annotation on podspec.
...
The hostname is a DNS A record, if the subdomain maps to a service name
in the same namespace
2016-03-04 13:28:33 -08:00
fd7e323cc6
Revert "Set timeout for accessing credential provider's URL"
...
This reverts commit 9d3806bceb
2016-03-04 12:37:30 -08:00
b45dce5aff
Interpret etcd not found error on a update
2016-03-04 12:06:13 -08:00
fa0794098f
Define etcd storage methods for replicationcontrollers/scale subresource.
...
Also register replicationcontrollers/scale subresource. Along with
registering the resource, also specify the cross-group override for the
subresource since Scale belongs belongs to autoscaling/v1 but
ReplicationController belongs to api/v1.
2016-03-04 11:02:37 -08:00
9e99f9fa0e
Register scale subresource for Deployments and ReplicaSets.
...
Define etcd registry methods for scale subresource in Deployments and
ReplicaSets. Register them with the API server.
2016-03-04 11:01:36 -08:00
c54ba12faa
Update node status to include the absense of cpu hardcapping.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-03-04 10:33:56 -08:00
b25a48d605
Revert "Move discovery client to its own package"
2016-03-04 09:24:54 -08:00
57670edc15
Merge pull request #22345 from fgrzadkowski/hpa_events
...
Auto commit by PR queue bot
2016-03-04 09:18:21 -08:00
627edd2588
Merge pull request #22016 from krousey/discbreak
...
Move discovery client to its own package
2016-03-04 09:17:46 -08:00
b390087a99
kubectl: bring the rolling updater on par with the deployments
...
During a rolling update for Deployments, the total count of surge pods
is calculated by adding the desired number of pods (deployment.Spec.Replicas)
to maxSurge. During a kubectl rolling update, the total count of surge
pods is calculated by adding the original number of pods (oldRc.Spec.Replicas
via an annotation) to maxSurge. This commit changes this to use desired
replicas.
2016-03-04 18:07:09 +01:00
18d8e7b756
Merge pull request #22052 from mwielgus/hpa-average
...
Auto commit by PR queue bot
2016-03-04 08:38:38 -08:00
077fff8f4a
Merge pull request #22447 from yifan-gu/fix_log
...
Auto commit by PR queue bot
2016-03-04 08:01:51 -08:00
bc62096ad5
Clean up host networking plugin checks for docker manager
...
We can save a docker inspect in podInfraContainerChanged() because
it's only used within the useHostNetwork() block. We can also
consolidate some code in createPodInfraContainer() because if
the pod uses the host network, no network plugin will be involved.
Finally, in syncPodWithSyncResult() we can consolidate some
conditionals because both hairpin setup and getting the container
IP are only relevant when host networking is *not* being used.
More specifically, putting the dm.determineContainerIP() call
into the !useHostNetwork() block is OK since if no network plugin
was called to set the container up, it makes no sense to call
the network plugin to retrieve the IP address that it did not
handle. The CNI plugin even calls back into the docker manager
to GetContainerIP() which grabs the IP from docker, which will
always be "" for host networked containers anyway.
2016-03-04 09:27:14 -06:00
d931dab80e
Merge pull request #21889 from swagiaal/unix-user-id
...
Auto commit by PR queue bot
2016-03-04 06:00:16 -08:00
k8s-merge-robot