github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity
24,401 Commits 42 Branches 7,905 Tags 1.3 GiB
71bcc25409
Commit Graph

24401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
k8s-merge-robot
ae15a4437b Merge pull request #19944 from mwielgus/simple-cm 
Auto commit by PR queue bot
 2016-02-05 06:41:28 -08:00
Marcin Wielgus
6c2b338af0 Bump heapster from v0.20.0-alpha3 to v.0.20.0-alpha4 2016-02-05 15:33:09 +01:00
dobbymoodge
c22f348f86 SCC proposal edits for clarity and correctness 
This commit fixes a few typographical and wording nits, adds formatting
for keywords where appropriate, and tweaks punctuation for clarity
 2016-02-05 08:45:50 -05:00
Paul Weil
03261146b0 api 2016-02-05 08:45:50 -05:00
Eric Tune
ff35d97663 Cleanup borrowed conversion functions. 
In pkg/apis/extensions/v1beta1/conversion.go,
some conversion code was copied from the
legacy api because Pod conversions cannot be
automatically generated because of something
about deprecatedServiceAccount.

This PR fixes two problems due to that copying.

First, the copied code could drift from its source
To fix that, I replaced the Convert_api_ and Convert_v1
implementations with a call to the original function.
I left a wrapper in case something needed to have
a package-local function name.

Second, the copied Convert_* functions, were copied,
in a way that they refer to other conversion functions
that aren't in the current package.  This prevented
genconverion from working from a clean start
(no conversion_generated.go).  Perhaps the person
who wrote this in the first place had copied
the conversion_generated.go file from legacy,
so it worked.   So, I added the v1
package name to calls to Convert_* functions.
So, when someone Cargo-Cult copies the conversion.go
file, like I did, they now will not have to
wonder why genconversion complains about missing
Convert_ functions.

Deleted the conversion_generated.go and reran genconversion
and it worked, no diffs old vs new conversion_generated.go.
 2016-02-05 05:42:47 -08:00
Paul Weil
367b307dde design 2016-02-05 08:42:04 -05:00
k8s-merge-robot
4ecfe4d207 Merge pull request #20678 from janetkuo/dont-copy-apply-annotation 
Auto commit by PR queue bot
 2016-02-05 05:23:08 -08:00
k8s-merge-robot
df0bbd45d7 Merge pull request #20615 from Random-Liu/deprecate-hostconfig-at-container-start 
Auto commit by PR queue bot
 2016-02-05 04:54:28 -08:00
bryk
46f51d74bb Set kubernetes-dashboard as the default UI addon 
Dashboard release info:
https://github.com/kubernetes/dashboard/releases/tag/v0.1.0

This replaces kube-ui addon
 2016-02-05 13:36:37 +01:00
k8s-merge-robot
6485584fca Merge pull request #20702 from gmarek/controllers 
Auto commit by PR queue bot
 2016-02-05 04:25:21 -08:00
k8s-merge-robot
9d7a3ed9f6 Merge pull request #20563 from roberthbailey/ui-e2e-non-conformance 
Auto commit by PR queue bot
 2016-02-05 03:56:43 -08:00
gmarek
0c191e787b Split controller flags between controllers 2016-02-05 12:17:51 +01:00
Marcin Wielgus
bf0c881263 Set Docker custom metric label for cAdvisor if custom metric volume is mounted 2016-02-05 12:00:02 +01:00
Marcin Wielgus
9a74a60413 Validation of HPA custom metrics annotation 2016-02-05 11:31:51 +01:00
k8s-merge-robot
ce6fd46637 Merge pull request #20539 from mikedanese/kube-scheduler-external 
Auto commit by PR queue bot
 2016-02-05 01:56:43 -08:00
Marek Grabowski
57c80385ef Merge pull request #20700 from wojtek-t/dont_cross_rvs 
Don't mix RVs from different resources
 2016-02-05 10:31:49 +01:00
Wojciech Tyczynski
31a6f90da1 Don't mix RVs from different resources 2016-02-05 09:23:34 +01:00
Daniel Smith
67065b8460 Merge pull request #20697 from wojtek-t/fix_lock_in_watch_cacher 
Fix deadlock in watch cache
 2016-02-05 00:03:38 -08:00
magicwang-cn
d2cf858560 make watch cache sizes configuratable of kube-apiserver 2016-02-05 15:47:27 +08:00
Wojciech Tyczynski
d3639aff73 Fix deadlock in watch cache 2016-02-05 08:31:55 +01:00
Janet Kuo
40849a5b50 Skip apply annotation when copying annotations from deployment to RC 2016-02-04 23:30:31 -08:00
Daniel Smith
2e7993e057 Merge pull request #20674 from caesarxuchao/decode-status 
To be compatible with release 1.1, decode Status even if the APIVersion is not set in the response
 2016-02-04 23:27:47 -08:00
Daniel Smith
15df7c7251 Merge pull request #20592 from erictune/fix-munge-2 
Print line number of failed link conversion.
 2016-02-04 23:26:05 -08:00
Daniel Smith
62e0eed21c Merge pull request #20660 from thockin/e2e-also-log-fails 
Logf() failures for nicer logs
 2016-02-04 23:24:15 -08:00
Daniel Smith
c399b49c29 Merge pull request #20431 from deads2k/tighten-api-installer 
tighten api server installation for bad groups
 2016-02-04 23:19:08 -08:00
Daniel Smith
d84ac764a9 Merge pull request #20492 from erictune/labselunver 
Move extensions.LabelSelector to unversioned
 2016-02-04 23:17:40 -08:00
Daniel Smith
f932f3aea2 Merge pull request #20425 from ihmccreery/namespace-experimental 
Use [Feature:ComprehensiveNamespaceDraining] instead of `PIt`
 2016-02-04 23:17:20 -08:00
Daniel Smith
9a76c022ec Merge pull request #20408 from kylegordon/patch-1 
Use kube account to make changes via govc
 2016-02-04 23:16:44 -08:00
Daniel Smith
e6639de333 Merge pull request #20380 from mqliang/podcidr-validation 
pod cidr validation
 2016-02-04 23:16:02 -08:00
Tim Hockin
df6ac92976 Merge pull request #20663 from thockin/svc-ctrl-defer-ip-release 
Use defer for IP release
 2016-02-04 22:47:46 -08:00
Tim Hockin
91c4f89de6 Merge pull request #20693 from thockin/e2e-util-region-not-zone 
e2e util: Pass region, not zone
 2016-02-04 22:36:40 -08:00
Tim Hockin
ea35158a32 e2e util: Pass region, not zone 2016-02-04 20:40:42 -08:00
nikhiljindal
d267ab5f92 Moving /apis handler to generic server 2016-02-04 17:58:13 -08:00
k8s-merge-robot
c09b67f60f Merge pull request #20591 from caesarxuchao/legacy-to-core 
Auto commit by PR queue bot
 2016-02-04 17:37:12 -08:00
Daniel Smith
f28c368550 Merge pull request #20683 from mesosphere/jdef_fix_mesosphere_tc_git 
mount teamcity git workspace if running in TC
 2016-02-04 17:09:25 -08:00
k8s-merge-robot
2084fba199 Merge pull request #18842 from vishh/kubelet_docker 
Auto commit by PR queue bot
 2016-02-04 17:08:34 -08:00
James DeFelice
321a10a2d5 mount teamcity git workspace if running in TC 2016-02-05 00:44:26 +00:00
Tim Hockin
a6cb6d76e3 Use defer for IP release 2016-02-04 16:40:28 -08:00
k8s-merge-robot
5b046cccdb Merge pull request #20448 from justinsb/aws_fix_e2e_detect_master 
Auto commit by PR queue bot
 2016-02-04 16:24:20 -08:00
Chao Xu
0d772a7a52 To be compatible with release 1.1, decode Status even if the APIVersion is not set. 2016-02-04 16:12:17 -08:00
Lantao Liu
8118092d11 Deprecate HostConfig at container start 2016-02-04 15:35:14 -08:00
Alex Robinson
e5c5f76402 Update the default fluentd images to parse system logs. 2016-02-04 23:29:27 +00:00
k8s-merge-robot
003b231867 Merge pull request #19576 from maclof/master 
Auto commit by PR queue bot
 2016-02-04 15:20:00 -08:00
Saad Ali
386aab82de Merge pull request #19932 from pwittrock/ra2 
Nodes Metrics API - Summary Impl
 2016-02-04 14:40:29 -08:00
Chao Xu
1b047f8e67 rename legacy to core 2016-02-04 14:26:56 -08:00
Phillip Wittrock
ba5be34574 Kubelet Metrics Summary Api Implementation 2016-02-04 14:05:28 -08:00
Eric Tune
eba2c56566 hack/update-generated-swagger-docs.sh 2016-02-04 13:46:34 -08:00
Eric Tune
fead374844 Regenerate types, conversions. 2016-02-04 13:46:34 -08:00
Eric Tune
6133cb1f21 Move extensions.LabelSelector to unversioned. 
Move type LabelSelector and type LabelSelectorRequirement from pkg/apis/extensions
This avoids an import loop when Job (and later DaemonSet, Deployment, ReplicaSet)
are moved out of extensions to new api groups.

Also Move LabelSelectorAsSelector utility from pkg/apis/extensions/ to pkg/api/unversioned/
Also its test.
Also LabelSelectorOp* constants.
Also the pkg/apis/extensions/validation functions ValidateLabelSelectorRequirement and
ValidateLabelSelector move to pkg/api/unversioned

The related type in pkg/apis/extensions/v1beta1/ is staying there.  I might move
it in another PR if neccessary.
 2016-02-04 13:46:34 -08:00
Vishnu kannan
df1f164b34 Do not fail container creation if the contaienr exits before applyting 
oom score adjust.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-04 13:39:19 -08:00