github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 22:05:59 +00:00
Code Issues Projects Releases Wiki Activity
6,343 Commits 42 Branches 7,905 Tags 1.3 GiB
60c014334f
Commit Graph

6343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clayton Coleman
60c014334f Split TLS loading to allow 3rd parties to load keys easily 
The LoadTLSFiles method is useful for configuration code that needs
to read the current client config and get values out for creating
other config files.
 2015-02-19 20:54:21 -05:00
Vish Kannan
5eb71a1877 Merge pull request #4632 from satnam6502/cluster-services 
Add kubernetes.io/cluster-service label to cluster level logging service...
 2015-02-19 16:39:47 -08:00
Satnam Singh
df2dfd6695 Add kubernetes.io/cluster-service label to cluster level logging services 2015-02-19 16:03:41 -08:00
Satnam Singh
e2c97e000d Merge pull request #4624 from thockin/dnslabels 
Add cluster-service label to DNS
 2015-02-19 14:43:43 -08:00
Yu-Ju Hong
adc10d9f47 Merge pull request #4616 from lavalamp/fix7 
clean up rest installation code a little
 2015-02-19 14:31:32 -08:00
Daniel Smith
40f8dfc54c Merge pull request #4621 from ironcladlou/fifo-add-if-not-present 
Support AddIfNotPresent function
 2015-02-19 14:22:29 -08:00
Tim Hockin
fcfe420685 Add cluster-service label to DNS 
Also rename the rc, pod, and service, which I have meant to do for a long time.
 2015-02-19 14:15:48 -08:00
Dan Mace
45372a90f8 Support AddIfNotPresent function 
Add an AddIfNotPresent function to support single producer/consumer
retry scenarios. Provides the consumer with a means to prefer items
already enqueued by the producer at the point of retry.
 2015-02-19 17:04:55 -05:00
Daniel Smith
5b96a454d2 clean up rest installation code a little 2015-02-19 13:26:27 -08:00
Daniel Smith
d2cf55e1a8 Merge pull request #4617 from lavalamp/fix4 
fix docs
 2015-02-19 13:25:37 -08:00
Daniel Smith
2c30455048 fix docs 2015-02-19 13:22:29 -08:00
Brendan Burns
e4e68e2fa5 Merge pull request #4138 from justinsb/fix_duplicate_master_arg 
Remove duplicate --master arg from kube-scheduler
 2015-02-19 11:58:23 -08:00
Brendan Burns
ce9cb81e19 Merge pull request #4613 from brendandburns/master 
Merging 4011
 2015-02-19 11:57:56 -08:00
Brendan Burns
352f633bc3 Merge branch 'eparis-kubectl-man' 
COMMIT_BLOCKED_ON_GENDOCS
 2015-02-19 11:54:30 -08:00
Brendan Burns
d9d5837510 Merge branch 'kubectl-man' of https://github.com/eparis/kubernetes into eparis-kubectl-man 
Conflicts:
	docs/kubectl.md

    COMMIT_BLOCKED_ON_GENDOCS
 2015-02-19 11:53:38 -08:00
Brendan Burns
a57d6a10e5 Merge pull request #3922 from ZJU-SEL/ubuntu-cluster 
Scripts to install k8s on ubuntu cluster with flannel network
 2015-02-19 11:48:57 -08:00
Brendan Burns
f2cf462f78 Merge pull request #3897 from marctrem/master 
Calling 'vagrant up' directly is not supported.  Instead, please run the...
 2015-02-19 11:48:43 -08:00
Saad Ali
1ab93f89ff Merge pull request #4611 from yujuhong/fixuidoc 
Fix the command in ui.md
 2015-02-19 11:45:50 -08:00
David Oppenheimer
c99a37d3a3 Merge pull request #4587 from gmarek/client2 
Fix monit config for etcd
 2015-02-19 11:37:47 -08:00
Yu-Ju Hong
1e0a2ebdb5 Fix the command in ui.md 
Tested by running the command locally.
 2015-02-19 11:37:03 -08:00
Yu-Ju Hong
eb0eb2bb9e Merge pull request #4609 from fabioy/dev1 
Clean up events.go test by removing HostPort
 2015-02-19 11:36:10 -08:00
Yu-Ju Hong
fc9550698e Merge pull request #4605 from lavalamp/fix4 
Set GOMAXPROCS. Print errors on stderr.
 2015-02-19 11:14:12 -08:00
Daniel Smith
f6ab47cc2e Merge pull request #4608 from yujuhong/fixgomt 
Run gofmt for hash.go to fix formatting errors
 2015-02-19 10:58:05 -08:00
Fabio Yeon
84b0bcf739 Clean up events.go test by removing HostPort 2015-02-19 10:55:37 -08:00
Yu-Ju Hong
7379502cc9 Run gofmt for hash.go to fix formatting errors 2015-02-19 10:51:46 -08:00
Victor Marmol
40cb417901 Merge pull request #4531 from wojtek-t/batch_requests_in_kubelet 
Batch updates of multiple Pods.
 2015-02-19 10:50:26 -08:00
Daniel Smith
fcddefa184 Set GOMAXPROCS. Print errors on stderr. 2015-02-19 10:30:31 -08:00
Dawn Chen
053dd7834e Merge pull request #4586 from jszczepkowski/volume-event 
Fire event for pod when mount fails.
 2015-02-19 10:26:42 -08:00
Jeff Lowdermilk
703b642886 Merge pull request #4517 from liggitt/kubeconfig_cert_data 
Let .kubeconfig be a single-source config for API clients
 2015-02-19 10:22:58 -08:00
Yu-Ju Hong
1b5d14423c Merge pull request #4595 from rsokolowski/deterministic-hash 
Make DeepHashObject function deterministic.
 2015-02-19 10:10:08 -08:00
roberthbailey
bab8393e6a Merge pull request #4278 from brendandburns/kubecfg 
Add an (optional) proxy to the TLS config.
 2015-02-19 09:17:27 -08:00
Eric Tune
1ee3357d8e Merge pull request #4600 from pmorie/secrets_proposal 
Minor addendums to secrets proposal
 2015-02-19 09:09:14 -08:00
Paul Morie
777b464de5 Minor addendums to secrets proposal 2015-02-19 12:02:18 -05:00
Yu-Ju Hong
13f3f3015e Merge pull request #4581 from liggitt/kubeconfig_load_errors 
Surface load errors when reading .kubeconfig files
 2015-02-19 08:46:07 -08:00
Yu-Ju Hong
cc6c48616b Merge pull request #4584 from brendandburns/master 
Remove kubecfg from the client tools we attempt to distribute.
 2015-02-19 08:44:27 -08:00
Jordan Liggitt
abb38cf793 Let .kubeconfig populate ca/cert/key data, and basic-auth username/password in client configs 2015-02-19 11:29:42 -05:00
rsokolowski
14e93a112b Make DeepHashObject function deterministic. 2015-02-19 16:46:19 +01:00
Zach Loafman
413e1dba7e Merge pull request #4569 from a-robinson/e2e-times 
Fix the e2e --times flag for running tests more than once
 2015-02-19 07:20:01 -08:00
gmarek
19b7c01084 Fix monit config for etcd 2015-02-19 13:11:43 +01:00
Jerzy Szczepkowski
d614fc7fcc Fire event for pod when mount fails. 
Implemented firing event for pod when mount of external volume fails. Fixes #4540.
 2015-02-19 11:08:36 +01:00
Wojciech Tyczynski
702ad7732f Applied comments 2015-02-19 08:01:16 +01:00
Brendan Burns
c9657cad04 Merge pull request #4319 from justinsb/aws_fixes 
Fixes to get AWS tests to run
 2015-02-18 22:43:46 -08:00
Brendan Burns
664de16c81 Remove kubecfg from the client tools we attempt to distribute. 2015-02-18 22:26:26 -08:00
Jordan Liggitt
945616a6f9 Surface load errors when reading .kubeconfig files 2015-02-18 23:34:51 -05:00
roberthbailey
43088bc58e Merge pull request #4579 from brendandburns/master 
Fix update.sh if DOCKER_HUB_USER isn't defined.
 2015-02-18 19:43:39 -08:00
Brendan Burns
6e2b733d4b Fix update.sh if DOCKER_HUB_USER isn't defined. 2015-02-18 19:38:26 -08:00
Yu-Ju Hong
4e0deab57a Merge pull request #4576 from ghodss/patch-5 
Update api-conventions.md to fix heading link
 2015-02-18 18:37:56 -08:00
Sam Ghods
046c11d5fd Update api-conventions.md to fix heading link 2015-02-18 18:31:37 -08:00
Jeff Lowdermilk
46cbc700eb Merge pull request #4573 from roberthbailey/update-sh 
Remove the numbered shell scripts from the live update example and the update.sh e2e test.
 2015-02-18 17:13:50 -08:00
Brian Grant
1ba1c1c4a8 Merge pull request #4541 from yujuhong/lies 
Remove obsolete comments in types.go
 2015-02-18 17:05:56 -08:00