github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity
10,724 Commits 42 Branches 7,905 Tags 1.3 GiB
c18f7dfde9
Commit Graph

10724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wojciech Tyczynski
c18f7dfde9 Merge pull request #8041 from nak3/fix-filepath-to-pod 
Correct filepath to sample pod.yaml in locally.md
 2015-05-11 12:42:23 +02:00
Jerzy Szczepkowski
63182318c5 Merge pull request #8037 from shawnps/patch-11 
Add missing Errorf formatting directives
 2015-05-11 11:17:58 +02:00
Jerzy Szczepkowski
36ab4b4c2f Merge pull request #8036 from shawnps/patch-10 
Use Errorf in persistent_volume_claim_binder_test.
 2015-05-11 11:17:04 +02:00
Wojciech Tyczynski
6c281ec0f8 Merge pull request #7889 from wjiangjay/master 
Fix wrong link for security context
 2015-05-11 10:34:48 +02:00
Jerzy Szczepkowski
36163969ef Merge pull request #8021 from ddysher/kubelet-fix 
Use error type from docker go-client instead of string
 2015-05-11 09:46:39 +02:00
Jerzy Szczepkowski
54e0f4679e Merge pull request #8024 from BenTheElder/vagrant_cpu_count 
Accurately get hardware cpu count in Vagrantfile.
 2015-05-11 09:46:18 +02:00
Kenjiro Nakayama
cb2c62f0d8 Fix filepath to simple sample pod 2015-05-11 00:21:33 +09:00
Shawn Smith
5d5c660f4b Add missing Errorf formatting directives 2015-05-10 13:25:14 +09:00
Shawn Smith
50f34d013e Use Errorf 2015-05-10 13:23:03 +09:00
BenTheElder
19224deb04 Accurately get hardware cpu count in Vagrantfile. 
In Vagrantfile replace hack that assumed hyper threading was enabled on
the host and divided ncpu by 2 with methods of getting the actual
hardware core count.
 2015-05-09 19:21:58 -04:00
Deyuan Deng
72a563f618 Use error type from docker go-client instead of string 2015-05-09 15:20:45 -04:00
Zach Loafman
738f403eea Merge pull request #8018 from justinsb/aws_ci_dont_copy_gce_keys 
AWS: Don't try to copy gce_keys in jenkins e2e job
 2015-05-09 09:28:01 -07:00
Justin SB
a442918d31 AWS: Don't try to copy gce_keys in jenkins e2e job 
Should fix e2e builds.

For the AWS jenkins jobs, I've been using the secret plugin.
 2015-05-09 08:55:35 -07:00
Jeff Lowdermilk
c2171e8c98 Merge pull request #8017 from jlowdermilk/fix-gke-ci 
fix #7921
 2015-05-09 07:59:06 -07:00
Jeff Lowdermilk
78386e48ad fix #7921 2015-05-09 07:48:29 -07:00
Jeff Lowdermilk
051288c4ee Merge pull request #7921 from roberthbailey/gke-kubeconfig 
Stop setting a GKE specific version of the kubeconfig file
 2015-05-08 19:48:49 -07:00
Victor Marmol
9ded52ac79 Merge pull request #7981 from yujuhong/reasons 
Record failure reasons for image pulling
 2015-05-08 18:00:46 -07:00
Yu-Ju Hong
d185bfd56a Record failure reason for image pulling 2015-05-08 17:37:11 -07:00
Zach Loafman
8314fd9c54 Merge pull request #8004 from mbforbes/jenkinsKeysChange 
Make jenkins e2e runs reuse one key, take two.
 2015-05-08 16:03:59 -07:00
Max Forbes
590d3873ea Make jenkins e2e runs reuse one key, take two. 2015-05-08 15:52:56 -07:00
Zach Loafman
857d88b286 Merge pull request #8002 from GoogleCloudPlatform/revert-7990-jenkinsKeys 
Revert "Make jenkins e2e runs reuse one SSH key."
 2015-05-08 15:46:59 -07:00
Zach Loafman
c6400cab1f Revert "Make jenkins e2e runs reuse one SSH key." 2015-05-08 15:46:42 -07:00
Zach Loafman
6cf760586c Merge pull request #7990 from mbforbes/jenkinsKeys 
Make jenkins e2e runs reuse one SSH key.
 2015-05-08 15:22:34 -07:00
Robert Bailey
128254a097 Merge pull request #7992 from justinsb/aws_copy_config_to_test 
AWS: Copy some new properties from config-default => config.test
 2015-05-08 15:10:44 -07:00
Robert Bailey
9db0c68e3e For GKE, only use the special kubeconfig location if the file exists. 
This will allow Jenkins to keep running after the next gcloud release
without needing to make immediate modifications to this file. We can
then remove the extra logic at our own convenience.
 2015-05-08 14:53:49 -07:00
Max Forbes
41cc8027ab Make jenkins e2e runs reuse one key. 2015-05-08 14:51:42 -07:00
Justin Santa Barbara
3cf8d72d96 Copy some new properties from config-default => config.test 
ENABLE_MINION_PUBLIC_IP was causing a failure because the variable wasn't declared.

ADMISSION_CONTROL should just be set the same for both test & default
 2015-05-08 14:30:17 -07:00
Daniel Smith
b02149d3d2 Merge pull request #7950 from satnam6502/head2 
Make the API server deal with HEAD requests via the service proxy
 2015-05-08 14:13:21 -07:00
Abhi Shah
1014831a4f Merge pull request #7959 from eparis/bash-completions-fun-if-crap 
Remove useless bash conditional
 2015-05-08 13:33:40 -07:00
Abhi Shah
90c11061d6 Merge pull request #7983 from wattsteve/patch-2 
GlusterFS Critical Bug Resolved - Removing warning in README
 2015-05-08 13:32:14 -07:00
Victor Marmol
2c0a047f62 Merge pull request #7967 from yujuhong/uname_n 
Don't use the first token `uname -n` as the hostname
 2015-05-08 13:30:43 -07:00
Brian Grant
97004c87c1 Merge pull request #7942 from goltermann/master 
Simple nginx Guide Fixes
 2015-05-08 12:09:25 -07:00
Steve Watt
374d245734 Bug Resolved - Removing warning in README 2015-05-08 14:05:56 -05:00
Daniel Smith
d136728df7 Merge pull request #7875 from satnam6502/elasticsearch 
Elasticsearch Discovery with Kubernetes
 2015-05-08 12:04:11 -07:00
Derek Carr
39de2ee5b8 Merge pull request #7982 from BenTheElder/vagrant_test_fixes 
Call kube-down in test-teardown for vagrant.
 2015-05-08 15:01:21 -04:00
BenTheElder
0b32bb1e4c Call kube-down in test-teardown 
See https://github.com/GoogleCloudPlatform/kubernetes/issues/7978
 2015-05-08 14:50:35 -04:00
Abhi Shah
a453d0b187 Merge pull request #7977 from GoogleCloudPlatform/revert-7734-iscsi_pv2 
Revert "Added ISCSI to PV structs"
 2015-05-08 11:32:05 -07:00
Abhi Shah
87e85e25f1 Revert "Added ISCSI to PV structs" 2015-05-08 11:31:35 -07:00
Abhi Shah
9b2a0df811 Merge pull request #7734 from markturansky/iscsi_pv2 
Added ISCSI to PV structs
 2015-05-08 10:55:41 -07:00
Satnam Singh
220e754f3e Make the API server deal with HEAD requests 2015-05-08 10:33:51 -07:00
Yu-Ju Hong
170f426fb6 Don't use the first token uname -n as the hostname 
This change partially reverts the change made in #7910, which takes only the
first token of `uname -n` as the hostname.
 2015-05-08 10:09:06 -07:00
Abhi Shah
0d16f43475 Merge pull request #7917 from caesarxuchao/redis-example 
verify the v1beta3 yaml files all work; merge the yaml files
 2015-05-08 09:56:18 -07:00
Robert Bailey
a7bb598889 Merge pull request #7928 from manolitto/disable_minion_public_ip 
AWS: make it possible to disable minion public ip assignment
 2015-05-08 09:52:42 -07:00
Victor Marmol
f7e3df4e66 Merge pull request #7952 from yifan-gu/rkt_switch 
kubelet: Add container runtime option for rkt.
 2015-05-08 09:43:17 -07:00
Eric Paris
d28660ae49 Remove useless bash conditional 
bash just returns the last return code, why are we testing and then
doing the same?
 2015-05-08 12:22:07 -04:00
Manfred Geiler
c5c62f7d57 fixed second missing $ and added curly brackets 2015-05-08 17:18:52 +02:00
Victor Marmol
86e347ffc3 Merge pull request #7951 from yifan-gu/rkt_pty 
kubelet/container: Move pty*.go to container runtime package.
 2015-05-08 08:12:36 -07:00
Victor Marmol
3c184fa5ef Merge pull request #7948 from pmorie/kubelet-image 
Ease building kubelet image
 2015-05-08 08:08:49 -07:00
Victor Marmol
92bd8577e0 Merge pull request #7931 from pmorie/typo 
Fix typos in different config comments
 2015-05-08 08:05:51 -07:00
Manfred Geiler
1119340260 fixed missing $ 2015-05-08 16:58:49 +02:00