Commit Graph

10588 Commits

Author SHA1 Message Date
Jerzy Szczepkowski
58962100db Merge pull request #7827 from zmerlynn/safe_format_cleanup
Clean up safe_format_and_mount spam in the startup logs
2015-05-06 10:50:32 +02:00
Rodolfo Carvalho
075ae79826 Fix metric label
Signed-off-by: Rodolfo Carvalho <rcarvalh@redhat.com>
2015-05-06 10:29:50 +02:00
Robert Bailey
3a24c0e898 Merge pull request #7667 from antoineco/master
update AWS CloudFormation template and cloud-configs
2015-05-06 00:28:10 -07:00
Jerzy Szczepkowski
ce590ff961 Merge pull request #7797 from pmorie/kubelet-image
Create docker image for kubelet
2015-05-06 09:23:07 +02:00
Jerzy Szczepkowski
4d655e3fcf Merge pull request #7803 from yifan-gu/rkt_docker_image
kubelet/rkt: Add docker prefix to image string.
2015-05-06 09:22:50 +02:00
Jerzy Szczepkowski
4f83749d9e Merge pull request #7829 from roberthbailey/allocate-node-cidrs
Set allocate_node_cidrs to be blank by default.
2015-05-06 09:02:39 +02:00
Robert Bailey
357df12c02 Set allocate_node_cidrs to be blank by default. 2015-05-05 23:41:30 -07:00
Robert Bailey
06c2f4e3d5 Merge pull request #7799 from cjcullen/test_pull_5246
Fix sync problems in #5246
2015-05-05 22:31:10 -07:00
Zach Loafman
399f7dee43 Clean up safe_format_and_mount spam in the startup logs
Totally minor cleanup, but I'm tired of seeing it's spam in the
startup logs.
2015-05-05 21:23:57 -07:00
Yu-Ju Hong
c075719f05 Kubelet: fix the runtime cache to not cache the stale pods
If a pod worker sees stale pods from the runtime cache which were retrieved
before their last sync finished, it may think that the pod were not started
correctly, and attemp to fix that by killing/restarting containers.
There are two issues that may cause runtime cache to store stale pods:
  1. The timstamp is recorded *after* getting the pods from the container
     runtime. This may lead the consumer to think the pods are newer than they
     actually are.
  2. The cache updates are triggered by many goroutines (pod workers, and the
     updating thread). There is no mechanism to enforece that the cache would
     only be updated to newer pods.

This change fixes the above two issues by making sure one always record the
timestamp before getting pods from the container runtime, and updates the
cached pods only if the timestamp is newer.
2015-05-05 18:28:38 -07:00
Maxwell Forbes
7adaaa4c64 Merge pull request #7823 from saad-ali/fix-event-doc-link
Fix event doc link
2015-05-05 18:18:06 -07:00
Chao Xu
eee11dee1b update logging-demo to use API v1beta3; modify the way to access Elasticsearch and Kibana services
COMMIT_BLOCKED_ON_GENDOCS
2015-05-05 18:14:17 -07:00
Saad Ali
66e0985715 Fix event doc link 2015-05-05 18:11:58 -07:00
Zach Loafman
c78eabbfac Update to container-vm-v20150505 2015-05-05 17:15:54 -07:00
Paul Morie
7b22218f67 Create docker image for kubelet 2015-05-05 20:14:26 -04:00
Jeff Lowdermilk
221553b147 Merge pull request #7776 from eparis/minor-bash-fixes
Cobra update and bash completions fix
2015-05-05 17:12:39 -07:00
CJ Cullen
292d33e33c Add synchronization around nodeMap 2015-05-05 17:11:38 -07:00
Daniel Smith
1d0067abea Merge pull request #7782 from deads2k/bow-to-the-go-oracle
make go-oracle happy
2015-05-05 16:46:47 -07:00
Daniel Smith
8a47574644 Merge pull request #7468 from simon3z/serialized-reference
replica: serialize created-by reference
2015-05-05 16:42:42 -07:00
Eric Paris
930f8645b5 Update bash completions
Because we updated cobra, we get a better set of bash completions
2015-05-05 19:19:47 -04:00
Eric Paris
1f702138b8 Bump cobra to latest upstream
Picks up some bash completions fixes and implements deprecated cobra
commands
2015-05-05 19:19:47 -04:00
Jerzy Szczepkowski
e967ffd522 Added flag to set cluster class B network address for pods, add flag to disable allocation CIDRs for Pods. Fixed synchornization bug in NodeController registerNodes(). 2015-05-05 16:10:43 -07:00
Tomek Kulczynski
290c7b94ef Make nodecontroller configure nodes' pod IP ranges 2015-05-05 16:10:42 -07:00
Zach Loafman
91dcf856e7 Merge pull request #7814 from GoogleCloudPlatform/revert-7809-revert-7343-security-context-types
Revert "Revert "Security context - types, kubelet, admission""
2015-05-05 16:07:36 -07:00
Max Forbes
5ba39646c7 Update volumes doc to fix broken link and describe new file. 2015-05-05 16:06:49 -07:00
Zach Loafman
875e83a741 Revert "Revert "Security context - types, kubelet, admission"" 2015-05-05 16:02:13 -07:00
Victor Marmol
db6586bdab Merge pull request #7813 from GoogleCloudPlatform/revert-7811-revert-7806-revert-7743-runtime-switch
Revert "Revert "Revert "Kubelet: Add rkt as a runtime option"""
2015-05-05 15:59:56 -07:00
Zach Loafman
3fcea23185 Revert "Revert "Revert "Kubelet: Add rkt as a runtime option""" 2015-05-05 15:55:12 -07:00
Yifan Gu
ec68f1a85a kubelet/rkt: Add docker prefix to image string.
This change makes rkt to run only docker image for now,
which enables us to test with all existing pods.
2015-05-05 15:41:13 -07:00
Zach Loafman
d92a4061aa Merge pull request #7811 from GoogleCloudPlatform/revert-7806-revert-7743-runtime-switch
Revert "Revert "Kubelet: Add rkt as a runtime option""
2015-05-05 15:34:07 -07:00
Zach Loafman
92ca92f43a Revert "Revert "Kubelet: Add rkt as a runtime option"" 2015-05-05 15:28:09 -07:00
Alex Robinson
5be3a5a9dc Merge pull request #7783 from GoogleCloudPlatform/revert-7609-lb
Revert "Truncate GCE load balancer names to 63 chars"
2015-05-05 15:23:35 -07:00
Zach Loafman
5d7b33b8f2 Merge pull request #7809 from GoogleCloudPlatform/revert-7343-security-context-types
Revert "Security context - types, kubelet, admission"
2015-05-05 15:22:03 -07:00
Zach Loafman
f48904fd5e Revert "Security context - types, kubelet, admission" 2015-05-05 15:20:39 -07:00
Zach Loafman
3931ee9f51 Merge pull request #7806 from GoogleCloudPlatform/revert-7743-runtime-switch
Revert "Kubelet: Add rkt as a runtime option"
2015-05-05 15:16:39 -07:00
Zach Loafman
6016408096 Revert "Kubelet: Add rkt as a runtime option" 2015-05-05 15:15:15 -07:00
Victor Marmol
e28625f7a6 Merge pull request #7796 from yifan-gu/local
hack/local-up-cluster.sh: Add env to enable rkt in local cluster.
2015-05-05 15:04:02 -07:00
Yifan Gu
102a2c4269 hack/local-up-cluster.sh: Add env to enable rkt in local cluster.
This makes testing rkt easier.
2015-05-05 14:07:10 -07:00
Yu-Ju Hong
b2c0ea37b4 Merge pull request #7743 from vmarmol/runtime-switch
Kubelet: Add rkt as a runtime option
2015-05-05 13:36:46 -07:00
Paul Morie
1625e231dd Merge pull request #7343 from pweil-/security-context-types
Security context - types, kubelet, admission
2015-05-05 16:26:09 -04:00
Federico Simoncelli
37038c4877 replica: serialize created-by reference
Fixes #7322

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2015-05-05 16:06:41 -04:00
Maxwell Forbes
b9ea2c33f4 Merge pull request #7787 from jlowdermilk/kubeconfig-doc
Update kubeconfig-file doc.
2015-05-05 12:53:18 -07:00
Clayton Coleman
6e031ae01a Merge pull request #7780 from derekwaynecarr/incorrect_error
Throw an API error when deleting namespace in termination
2015-05-05 15:17:46 -04:00
Maxwell Forbes
39f3260ce0 Merge pull request #7773 from csrwng/fix_podexecopt
Fix command field PodExecOptions
2015-05-05 12:14:58 -07:00
Clayton Coleman
c30428a117 Merge pull request #7769 from deads2k/fix-deep-copy
fix DeepCopy to properly support runtime.EmbeddedObject
2015-05-05 15:03:42 -04:00
Yu-Ju Hong
08d25c3ed4 Merge pull request #7785 from vmarmol/fix-start
Start ImageManager housekeeping in Run().
2015-05-05 12:00:00 -07:00
Quinton Hoole
8a4a39d9b4 Merge pull request #7273 from lavalamp/fix7
fix master service endpoint system for multiple masters
2015-05-05 11:59:30 -07:00
Eric Paris
63e3366581 Merge pull request #7757 from nak3/build_genbashcomp_with_make_all
Add genbashcomp to KUBE_TEST_TARGETS
2015-05-05 13:47:11 -05:00
Quinton Hoole
8bc481d65c Merge pull request #7669 from a-robinson/lb
Change the cloud provider TCPLoadBalancerExists function to GetTCPLoadBalancer...
2015-05-05 11:42:06 -07:00
Jeff Lowdermilk
d8b970e8cf Update kubeconfig-file doc.
Remove the '.' in references to '.kubeconfig file' to avoid confusion as
default location is now ~/.kube/config. Also remove auth-path examples,
as that option is deprecated and should not be used.
2015-05-05 11:36:22 -07:00