Eric Paris
6766b732a5
Update verify-godeps.sh to actually work
...
The diff was incorrect. It was doing `diff -NIaupr`. And so diff was
interpreting the argument to -I to be `aupr`. So it was not running
recursively. The fix is not so simple because there is an intentionally
broken symlink in one of the godeps. Which diff -r fails on by default.
On linux there is an options to not dereference symlink and just make
sure they point to the same thing. No so on OS X. So we have to exclude
all files called "symlink". Which thankfully there is only one of.
2015-09-19 16:55:12 -04:00
Eric Paris
c95a7470f1
Update godeps using the new -t option
...
I want to drop all _test.go files, but godep will drop dependancies for
OUR _test.go files. Which is bad. So we have to keep them until that
bug is fixed in godep...
2015-09-19 16:55:12 -04:00
Eric Paris
750cbe306e
Merge pull request #14233 from kubernetes/revert-14202-prometheus
...
Revert "Update prometheus library usage"
2015-09-19 15:37:56 -05:00
Marek Grabowski
98a971cc2e
Revert "Update prometheus library usage"
2015-09-19 22:18:15 +02:00
k8s-merge-robot
a2dcd3b78d
Merge pull request #14175 from alfred-huangjian/l7-ingress-api-type-init-version
...
Auto commit by PR queue bot
2015-09-19 12:55:30 -07:00
Eric Paris
20c01f072d
Merge pull request #14202 from timstclair/prometheus
...
Update prometheus library usage
2015-09-19 10:06:13 -05:00
Jian Huang
44477b246b
Add Ingress API resource type - auto generated files
2015-09-19 17:40:52 +08:00
Jian Huang
a5e23ef5ca
Add Ingress API Resource Type for L7 loadbalancing
2015-09-19 17:40:49 +08:00
Quinton Hoole
dafb3cc7a5
Merge pull request #14224 from quinton-hoole/2015-09-18-fix-kubeproxy-e2e-regex
...
Don't run slow e2e tests in the parallel runs.
2015-09-19 01:01:51 -07:00
Quinton Hoole
62a0aba550
Fix regex to banish KubeProxy test as slow.
2015-09-19 00:59:03 -07:00
k8s-merge-robot
3d71d8f38b
Merge pull request #14220 from ghodss/replication-manager-comments
...
Auto commit by PR queue bot
2015-09-19 00:55:59 -07:00
k8s-merge-robot
83192aac45
Merge pull request #13964 from liguangbo/fix_make_ca_cert_proxy
...
Auto commit by PR queue bot
2015-09-19 00:15:54 -07:00
k8s-merge-robot
fa86f0749d
Merge pull request #14195 from mikedanese/daemon-log
...
Auto commit by PR queue bot
2015-09-18 23:33:12 -07:00
k8s-merge-robot
7425cd5a22
Merge pull request #14209 from nikhiljindal/deploymentController
...
Auto commit by PR queue bot
2015-09-18 22:51:47 -07:00
k8s-merge-robot
5de212ed29
Merge pull request #14134 from eparis/string-set-intersection
...
Auto commit by PR queue bot
2015-09-18 21:24:28 -07:00
k8s-merge-robot
3eabb81e5d
Merge pull request #14196 from mikedanese/various-job
...
Auto commit by PR queue bot
2015-09-18 20:02:09 -07:00
nikhiljindal
89e9691080
Adding scale up/down code to DeploymentController
2015-09-18 19:24:16 -07:00
Quinton Hoole
8a95a82c88
Merge pull request #14206 from ixdy/jenkins-configs
...
Demote "KubeProxy should test kube-proxy" to slow tests
2015-09-18 19:10:00 -07:00
Quinton Hoole
851e3c1c24
Merge pull request #14218 from kubernetes/revert-13417-kubelet_tolerates_dead_cloud_api
...
Revert "Update node status even if cloudprovider API dies"
2015-09-18 19:01:41 -07:00
k8s-merge-robot
5d67c2ce1f
Merge pull request #12894 from nikhiljindal/PodCondition
...
Auto commit by PR queue bot
2015-09-18 18:59:51 -07:00
Sam Ghods
436fedd672
Clean up comments on replication manager
2015-09-18 18:52:50 -07:00
k8s-merge-robot
7ddbdc478d
Merge pull request #14114 from hurf/qt_agg_errors
...
Auto commit by PR queue bot
2015-09-18 18:15:01 -07:00
Tim Hockin
6df2139d5a
Revert "Update node status even if cloudprovider API dies"
2015-09-18 17:44:24 -07:00
Nikhil Jindal
8754eea749
Merge pull request #14160 from zhengguoyong/minions
...
change minions to nodes
2015-09-18 17:37:33 -07:00
k8s-merge-robot
cad5f03311
Merge pull request #14185 from tmrts/formatting
...
Auto commit by PR queue bot
2015-09-18 15:16:00 -07:00
Jeff Grafton
85179f3352
Demote "KubeProxy should test kube-proxy" to slow tests
2015-09-18 15:00:41 -07:00
Mike Danese
0ae2334a4f
sort jobs by creation timestamp to make getPodJob deterministic
2015-09-18 14:48:22 -07:00
Mike Danese
5965760751
change log level on a lot of glog calls in job controller
2015-09-18 14:48:22 -07:00
Mike Danese
267cc9de91
serialize access to active with a lock
2015-09-18 14:48:22 -07:00
Tim Hockin
e07eb387bb
Merge pull request #14142 from mikedanese/job-update
...
Various fixes to job
2015-09-18 14:44:41 -07:00
k8s-merge-robot
8d7038eef0
Merge pull request #13825 from rootfs/path_len
...
Auto commit by PR queue bot
2015-09-18 14:44:33 -07:00
Tim Hockin
6def707f9c
Merge pull request #12887 from djosborne/master
...
added calico-kubernetes-fedora-digitalocean demo
2015-09-18 14:43:54 -07:00
Tim Hockin
9698e957a6
Merge pull request #12717 from tamnd/fixdockercfg
...
Fix new docker config format for private registries
2015-09-18 14:43:38 -07:00
Tim St. Clair
045238563a
Remove deprecated prometheus extraction libraries
2015-09-18 14:38:44 -07:00
Tim St. Clair
3a94f3b5c2
Use up-to-date prometheus extraction libraries
2015-09-18 14:38:44 -07:00
Tim St. Clair
495f6ef212
Added new prometheus extraction godep & update prometheus library godeps
2015-09-18 14:38:44 -07:00
k8s-merge-robot
9537c43a62
Merge pull request #14092 from nikhiljindal/deploymentAPI
...
Auto commit by PR queue bot
2015-09-18 13:03:34 -07:00
Mike Danese
144d72ca7b
fix incorrect log statement in daemon controller
2015-09-18 12:19:07 -07:00
Mike Danese
e29e606792
make JobController RestartPolicy independent
2015-09-18 11:48:47 -07:00
Mike Danese
22072af90d
rename jobmanager to jobcontroller
2015-09-18 11:48:47 -07:00
Mike Danese
9d1838fb64
only allow updates of parrallelism in jobspec
2015-09-18 11:48:47 -07:00
k8s-merge-robot
e7d4426158
Merge pull request #14136 from mikedanese/deamon-e2e
...
Auto commit by PR queue bot
2015-09-18 11:43:01 -07:00
k8s-merge-robot
3762d60a44
Merge pull request #14174 from tmrts/refactor/downwardAPItest
...
Auto commit by PR queue bot
2015-09-18 11:06:34 -07:00
Tim Hockin
9f5afb1b70
Merge pull request #14180 from ArtfulCoder/renameVar
...
renamed variable in test file
2015-09-18 10:36:18 -07:00
Tim Hockin
8e4b09df8f
Merge pull request #14077 from nikhiljindal/update-swagger-docs
...
Updating stale api-reference docs
2015-09-18 09:59:32 -07:00
Tamer Tas
cb5f921df1
Add newline to the end of bash scripts
2015-09-18 19:35:05 +03:00
Tim Hockin
c013e22a03
Merge pull request #14158 from linzichang/fix-service-link
...
Fix document link
2015-09-18 09:12:22 -07:00
Tim Hockin
9659ab131a
Merge pull request #14179 from eparis/fix-godeps
...
Hack to make godep work again
2015-09-18 09:04:45 -07:00
Abhishek Shah
485e1930e4
renamed variable in test file
2015-09-18 09:04:03 -07:00
Eric Paris
ed5668f405
Hack to make godep work again
2015-09-18 11:03:29 -05:00
