Commit Graph

298 Commits

Author SHA1 Message Date
k8s-merge-robot
3f1c99f013 Merge pull request #20515 from mikedanese/fix-proxy-mode
Auto commit by PR queue bot
2016-02-06 07:49:30 -08:00
k8s-merge-robot
b45a94bc78 Merge pull request #20765 from janetkuo/remove-podtemplate-key
Auto commit by PR queue bot
2016-02-06 00:44:47 -08:00
k8s-merge-robot
fcf9c4a1e4 Merge pull request #19741 from pwittrock/syncfsmetrics
Auto commit by PR queue bot
2016-02-05 17:54:22 -08:00
Mike Danese
b1743a6887 this is a manual reversion of #20702
I can't revert with github which says "Sorry, this pull request couldn’t be
reverted automatically. It may have already been reverted, or the content may
have changed since it was merged."

Reverts commit: 0c191e787b
2016-02-05 16:34:02 -08:00
Janet Kuo
7e9fb97b7d Remove UniqueLabelKey from deployment spec 2016-02-05 16:21:44 -08:00
Phillip Wittrock
3de94cd23c Supply volume fs metrics to server/stats/handler.go
* Metrics will not be expose until they are hooked up to a handler
* Metrics are not cached and expose a dos vector, this must be fixed before release or the stats should not be exposed through an api endpoint
2016-02-05 16:00:24 -08:00
Daniel Smith
5fe99f44c8 Merge pull request #20542 from mikedanese/kube-proxy-defaulting
componentconfig: move kube proxy defaulting into the exetrnal api
2016-02-05 15:51:12 -08:00
k8s-merge-robot
6b20879a7f Merge pull request #20142 from bprashanth/ing_tls
Auto commit by PR queue bot
2016-02-05 15:07:09 -08:00
Daniel Smith
1c7b5e126a Merge pull request #20609 from erictune/add-api-package
Cleanup borrowed conversion functions.
2016-02-05 14:02:30 -08:00
Prashanth Balasubramanian
c56bebf594 Basic TLS support. 2016-02-05 11:00:04 -08:00
Rudi Chiarito
a2d1bb7acf Add httpHeaders to httpGet liveness probe
Also update existing documentation and try to steer users away from 'host'.
Add validation.
2016-02-05 11:20:04 -05:00
k8s-merge-robot
3cfb090939 Merge pull request #7893 from pweil-/security-policy
Auto commit by PR queue bot
2016-02-05 07:14:37 -08:00
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
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
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
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
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
Saad Ali
0952dcd349 Merge pull request #20389 from mqliang/deployment-MinReadySeconds
Move MinReadySeconds out of RollingUpdateDeployment
2016-02-03 22:44:14 -08:00
Mike Danese
ee4e60d78c componentconfig: move kube proxy defaulting into the exetrnal api 2016-02-03 11:04:24 -08:00
k8s-merge-robot
a7ef693f84 Merge pull request #20464 from thockin/proxymode-iptables
Auto commit by PR queue bot
2016-02-03 00:17:38 -08:00
Mike Danese
097a1d6dd1 autogenerated 2016-02-02 23:17:21 -08:00
Mike Danese
7df86e1ecf create external api for scheduler config
move defaulting into external pacakge
2016-02-02 23:17:18 -08:00
mqliang
c4a1ab42e3 Move MinReadySeconds out of RollingUpdateDeployment 2016-02-03 11:38:11 +08:00
Mike Danese
044b69cbda componentconfig: fix proxy mode set func 2016-02-02 13:31:49 -08:00
Tim Hockin
7ed83ad4f9 Make kube-proxy default to iptables (regression)
This was accidentally introduced as part of the component config changes.
2016-02-02 12:45:11 -08:00
k8s-merge-robot
71727385e8 Merge pull request #20069 from BugRoger/cephfs_subtree_mount_master
Auto commit by PR queue bot
2016-02-02 02:15:35 -08:00
Mike Danese
c5ab2cae15 autogenerated 2016-02-01 16:01:19 -08:00
Michael Schmidt
92d814725b add generated code 2016-02-01 22:31:44 +01:00
Chao Xu
7722a50647 generate client for replicaset 2016-01-31 15:42:03 -08:00
Marcin
23e74368b9 HPA annotation structs for Custom Metrics 2016-01-31 17:27:03 +01:00
Janet Kuo
3396db9510 Add rollback subresource; add rollback logic to deployment controller 2016-01-30 16:00:34 -08:00
mqliang
c5cda2012a cleanup-policy 2016-01-30 09:57:21 +08:00
k8s-merge-robot
c3a9b77d41 Merge pull request #19669 from mikedanese/scheduler-config
Auto commit by PR queue bot
2016-01-29 15:44:00 -08:00
k8s-merge-robot
8b66e93127 Merge pull request #19510 from madhusudancs/daemonset-nonpointer-template
Auto commit by PR queue bot
2016-01-29 02:17:23 -08:00
Mike Danese
bb108fb03c autogenerated 2016-01-29 00:00:59 -08:00
Mike Danese
126b1df879 Create componentconfig object for scheduler configuration.
Signed-off-by: Mike Danese <mikedanese@google.com>
2016-01-28 23:17:00 -08:00
Madhusudan.C.S
c2fd8bd7c5 Auto-generated code. 2016-01-28 22:57:20 -08:00
Madhusudan.C.S
559bf168ff Fix tests. 2016-01-28 22:51:58 -08:00
Madhusudan.C.S
73fb6dca62 DaemonSetSpec.Template should not be a pointer.
Pod template for DaemonSets isn't optional, like Deployments and Jobs,
so the DaemonSetSpec.Template field should not be a pointer.
2016-01-28 22:51:58 -08:00
Mike Danese
3ebbeb3c8c autogenerated 2016-01-28 15:46:40 -08:00
Mike Danese
309eac5f7f update proxy server 2016-01-28 15:46:40 -08:00
Mike Danese
60c5db5e87 update api types 2016-01-28 15:46:40 -08:00
Paul Morie
f2d1a20178 Regen for ConfigMap API move 2016-01-28 17:17:24 -05:00
Paul Morie
7be3bbb694 Remove old generated code for ConfigMap 2016-01-28 17:07:05 -05:00
Paul Morie
9030f16071 Move ConfigMap to main API 2016-01-28 17:07:05 -05:00
k8s-merge-robot
bd7255a27e Merge pull request #18901 from kargakis/inert-deployments
Auto commit by PR queue bot
2016-01-27 05:14:38 -08:00
Michail Kargakis
06c0a4718a extensions: generated code for paused deployments 2016-01-26 18:40:05 +01:00