github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
31,322 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

732 Commits (2d6c632de2f9ac15005c188913f779a81b392c81)

Author SHA1 Message Date
Clayton Coleman 154a91cd33 Rename runtime.DefaultScheme to latest.Codec for ease of readability 2014-09-16 16:19:35 -04:00
Clayton Coleman fe614aeda2 Simple refactor for ease of readability 
runtime.DefaultCodec -> latest.Codec
 2014-09-16 16:12:35 -04:00
Jessica Forrester 0f2b8f4f9f Create passthroughLogger when LogOf is called and request has no logger 2014-09-11 16:48:06 -04:00
Jessica Forrester d82cf7dd48 Rebased and fixed test cases 2014-09-09 17:50:18 -04:00
Jessica Forrester 0cac1c5f79 Switch LogOf from panicking when logger is missing to creating logger with the defaults. 
Update CORS tests to a table-based test and cover more cases.
 2014-09-09 17:50:18 -04:00
Jessica Forrester becf6ca4e7 Move RecoverPanics to be the top level wrapped handler. Add new method to be sure a logger has been generated instead of assuming one has. Move regexp list compilation into a utility and pass regexp list into CORS. 2014-09-09 17:50:18 -04:00
Jessica Forrester 8b4ca9c2a7 Move CORS handler wrapping into cmd/apiserver and switch config flag to a list of allowed origins 2014-09-09 17:50:18 -04:00
Jessica Forrester 8723eece49 Add option to enable a simple CORS implementation for the api server 2014-09-09 17:50:18 -04:00
Brendan Burns 69b359b689 Don't stack trace on 301s 2014-09-09 14:10:46 -07:00
Daniel Smith 9345da0bfd Fix build 2014-09-08 13:05:38 -07:00
brendandburns 753b80c9b8 Merge pull request #1105 from lavalamp/proxy 
Add a generic proxier
 2014-09-08 12:51:24 -07:00
Daniel Smith fc09f988b4 Make tests pass again 2014-09-07 22:26:42 -07:00
Daniel Smith 0d30a656ef Do interface{} -> runtime.Object rename everywhere 2014-09-07 22:19:24 -07:00
Daniel Smith 1c2b65788d Rename Codec and ResourceVersioner to add Default in front, to allow for types of those names 2014-09-07 22:19:24 -07:00
Daniel Smith 7790961011 Rename Object to EmbeddedObject 2014-09-05 14:43:35 -07:00
Daniel Smith b6f1f84875 Extend proxy test to test all URL rewriting cases. 2014-09-05 13:33:31 -07:00
Daniel Smith 6554ee96f7 Rewrite proxy code for clarity and correctness. 2014-09-05 13:33:30 -07:00
Daniel Smith e2b645ec15 Add a generic proxier 
To proxy traffic to anything that implements ResourceLocation.
Currently, this is only services. This is easily extensible to minions
(would supercede existing mechanism) and pods.
 2014-09-05 13:33:30 -07:00
Clayton Coleman 34c40e4e48 Errors should be part of api/errors, not apiserver 
Renames constructor methods to be errors.New<name> which changed a few
places.
 2014-09-03 17:16:00 -04:00
Tim Hockin 6a624a2b4f try to fix data race 2014-09-02 13:51:15 -07:00
Daniel Smith a63966e73c Combine pkg/apitools and pkg/api/common and call the result pkg/runtime 2014-09-02 11:15:44 -07:00
Daniel Smith 099c8fd36f Propagate rename; tests pass again. 2014-09-02 10:42:06 -07:00
Vojtech Vitek (V-Teq) 59f58cd043 Unify Godoc formatting, fix various typos 
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com>
 2014-09-02 13:41:03 +02:00
Daniel Smith aa9b9b9fa8 Invert api and api/v1beta1 dependencies 
This is some cleanup that has been needed for a while.
There's still one more step that could usefully be done, which is to
split up our api package into the part that provides the helper
functions and the part that provides the internal types. That can come
later.

The v1beta1 package is now a good example of what an api plugin should
do to version its types.
 2014-08-29 12:15:30 -07:00
Daniel Smith 4de254444e Add simple service redirection 2014-08-27 20:51:41 -07:00
Brendan Burns 52473bdf11 Deflake operation listing. 2014-08-26 22:48:24 -07:00
Clayton Coleman 0a841a49fd Naming of Reason constants is inconsistent 
Changed ReasonType to StatusReason (to match the field) and
changed CauseReason to CauseType and renamed StatusCause.Reason to
Type.
 2014-08-26 13:39:21 -04:00
Clayton Coleman 52923a1348 Return validation errors from storage create/update 2014-08-26 13:30:55 -04:00
Clayton Coleman d326ba2976 Add a Causes array to status details for validation errors 
Uses the same constant values as api/errors for each nested
reason.
 2014-08-26 13:30:55 -04:00
Satnam Singh 3f0f119e42 Very minor change to use camelCase for ReasonType as suggested in issue #914. 2014-08-25 16:57:13 -07:00
Tim Hockin 0f97a73c1b Rename a bunch of "Make" functions to "New" 
Also rename some to other names that make better reading.  There are still a
bunch of "make" functions but they do things like assemble a string from parts
or build an array of things.  It seemed that "make" there seemed fine.  "New"
is for "constructors".
 2014-08-20 21:27:19 -07:00
Brendan Burns a198bbb0ae Switch api.Status to *api.Status in a bunch of places. 2014-08-20 10:21:49 -07:00
Clayton Coleman bbf3b55e76 Extract RESTHandler and allow API groupings 
Prepare for running multiple API versions on the same HTTP server
by decoupling some of the mechanics of apiserver.  Define a new
APIGroup object which represents a version of the API.
 2014-08-13 10:53:34 -04:00
Daniel Smith 1a5a22c539 Fix files missing gofmt 2014-08-12 17:48:00 -07:00
Daniel Smith f220aa1aba Fix flaky TestOpGet and TestSyncCreateTimeout 2014-08-12 14:23:12 -07:00
Daniel Smith 9050c819dc Merge pull request #722 from smarterclayton/improve_errors 
Normalize apiserver error handling of standard errors
 2014-08-11 12:43:06 -07:00
Clayton Coleman d419eedb06 Watch handler not returning after 404 2014-08-09 10:46:56 -04:00
Clayton Coleman 0083fae453 Provide helpers and tests for common error types 
Unify error handling in apiserver into a single path - RESTStorage
objects must provide appropriate errors individually.  Ensure ALL
errors which can be traced to logical faults with RESTStorage are
returned as api.Status objects.
 2014-08-08 19:44:47 -04:00
Daniel Smith 5dd130a350 Prevent accidental setting of sync or timeout 2014-08-08 14:09:14 -07:00
Daniel Smith 49cded3800 Simplify ResourceWatcher interface to one function. 2014-08-08 14:09:13 -07:00
Daniel Smith 283fdba6ab Add more parameters to Watch 
* Add labels selector (same as List)
* Add fields selector
 * Plan to let you select pods by Host and/or Status
* Add resourceVersion to let you resume a watch where you left off.
 2014-08-08 14:09:13 -07:00
Clayton Coleman a74fac7d70 Centralize path magic in apiserver into the New method 
Make OperationHandler and WatchHandler properly encapsulate their
concerns and make them not depend on the global path
 2014-08-08 16:33:44 -04:00
Clayton Coleman c9fc0bcf3d Decouple apiserver from codec implementation 
The apiserver on initialization must be provided with a codec
for encoding and decoding all handled objects including api.Status
and api.ServerOp.  In addition, the RESTStorage Extract() method
has been changed to New(), which returns a pointer object that the
codec must decode into (the internal object).  Switched registry
methods to use pointers for Create/Update instead of values.
 2014-08-07 13:35:35 -04:00
Clayton Coleman 836d2b9808 Fix proxy error condition and simplify method 
Add new minion proxy test case.
 2014-08-06 01:03:17 -04:00
Daniel Smith 860050b507 Merge pull request #745 from smarterclayton/add_structured_reason 
Evolve the api.Status object with Reason/Details
 2014-08-05 13:28:19 -07:00
Clayton Coleman 4f88b778a6 Evolve the api.Status object with Reason/Details 
Contains breaking API change on api.Status#Details (type change)

Turn Details from string -> StatusDetails - a general
bucket for keyed error behavior.  Define an open enumeration
ReasonType exposed as Reason on the status object to provide
machine readable subcategorization beyond HTTP Status Code. Define
a human readable field Message which is common convention (previously
this was joined into Details).

Precedence order: HTTP Status Code, Reason, Details. apiserver would
impose restraints on the ReasonTypes defined by the main apiobject,
and ensure their use is consistent.

There are four long term scenarios this change supports:

1. Allow a client access to a machine readable field that can be
   easily switched on for improving or translating the generic
   server Message.

2. Return a 404 when a composite operation on multiple resources
   fails with enough data so that a client can distinguish which
   item does not exist.  E.g. resource Parent and resource Child,
   POST /parents/1/children to create a new Child, but /parents/1
   is deleted.  POST returns 404, ReasonTypeNotFound, and
   Details.ID = "1", Details.Kind = "parent"

3. Allow a client to receive validation data that is keyed by
   attribute for building user facing UIs around field submission.
   Validation is usually expressed as map[string][]string, but
   that type is less appropriate for many other uses.

4. Allow specific API errors to return more granular failure status
   for specific operations.  An example might be a minion proxy,
   where the operation that failed may be both proxying OR the
   minion itself.  In this case a reason may be defined "proxy_failed"
   corresponding to 502, where the Details field may be extended
   to contain a nested error object.

At this time only ID and Kind are exposed
 2014-08-05 16:17:53 -04:00
Clayton Coleman 325f9ef005 Make create atomic on etcd for Services/ReplControllers 2014-08-05 01:12:27 -04:00
Kouhei Ueno 6288336436 Rename IsEtcdConflict to IsEtcdTestFailed 2014-08-05 08:07:20 +09:00
Brendan Burns d648b2350e Fix unit test build. 2014-08-04 09:50:25 -07:00
brendandburns 81a8ac723f Merge pull request #753 from smarterclayton/remove_expect_no_error_apiserver 
Remove expectNoError from apiserver
 2014-08-04 09:15:34 -07:00
Clayton Coleman 64bf2d9f63 Remove expectNoError from apiserver 2014-08-04 09:37:53 -04:00
Clayton Coleman 75aa364b3c /api/v1beta1/operations was returning Not Found 
Splitting an empty string returns []string{""}, not []string{}
 2014-08-03 19:35:17 -04:00
brendandburns 30b6ab5278 Merge pull request #728 from smarterclayton/improve_apiserver_tests 
Expand apiserver test cases
 2014-08-01 09:32:19 -07:00
Clayton Coleman af4d57b39a Expand apiserver tests 2014-07-31 18:59:54 -04:00
Clayton Coleman 8986a0fc4b Remove debugging statement 2014-07-31 18:52:15 -04:00
Daniel Smith 928092e79e Etcd watcher verification 
To make sure the etcd watcher works, I changed the replication
controller to use watch.Interface. I made apiserver support watches on
controllers, so replicationController can be run only off of the
apiserver. I made sure all the etcd watch testing that used to be in
replicationController is now tested on the new etcd watcher in
pkg/tools/.
 2014-07-31 14:54:30 -07:00
brendandburns 76e2cd70f7 Merge pull request #683 from smarterclayton/slightly_pause_on_return 
Slightly pause on requests to allow most to finish
 2014-07-30 16:05:15 -07:00
brendandburns 59c5fb11c0 Merge pull request #672 from lavalamp/customConversionFuncs 
Custom conversion funcs
 2014-07-30 15:09:01 -07:00
Clayton Coleman 1bdeb058e1 Slightly pause on requests to allow most to finish 
Currently, every write will result in a 202 (etcd adding a few
ms of latency to each request).  This forces clients to go into
a poll loop and pick a reasonable server poll frequency, which
results in 1 + N queries to the server for the single operation
and adds unavoidable latency to each request which affects their
perception of the service.

Add a very slight (25ms by default) delay to wait for requests
to finish.  For clients doing normal writes this reduces the
requests made against the server to 1.  For clients on long requests
this has no effect.  The downside is that http connections are held
on to for a longer period in high write loads.  The decrease in
perceived latency from the kubecfg is significant.
 2014-07-30 17:49:47 -04:00
Daniel Smith 242c8cdaec Add custom conversion function system. 
As an example, demonstrate how Env.Key's deprecation ought to work.
 2014-07-30 14:18:23 -07:00
Clayton Coleman e64a393e1a Move handle* methods to their respective locations 
Fix names
 2014-07-30 17:15:09 -04:00
Clayton Coleman fe7f611d88 Split operations code and add comments 2014-07-30 17:15:09 -04:00
Clayton Coleman 9069696514 Rename write -> writeJSON 2014-07-30 17:15:09 -04:00
Clayton Coleman b84c9f7a1c Rename methods and move parseTimeout 2014-07-30 17:15:09 -04:00
Clayton Coleman 82b78912fc Move prefix methods 2014-07-30 17:15:09 -04:00
Clayton Coleman a2c86e4c97 Simplify helpers 2014-07-30 17:15:09 -04:00
Clayton Coleman c7d311896e Shorten variable name 2014-07-30 17:15:09 -04:00
Clayton Coleman 8b511832ff Split minion 2014-07-30 17:15:09 -04:00
Clayton Coleman a46f6313bc Split interfaces 2014-07-30 17:15:09 -04:00
Clayton Coleman d5e22bfe2a Split index 2014-07-30 17:14:07 -04:00
Clayton Coleman b70a145161 Split operations test 2014-07-30 17:14:06 -04:00
Clayton Coleman db51ea2a17 Split async 2014-07-30 17:14:06 -04:00
Clayton Coleman b911d9265a Split watch 2014-07-30 17:14:06 -04:00
erictune a41aeeca67 Merge pull request #701 from SebastianM/misspelling 
fix misspelling
 2014-07-30 13:36:14 -07:00
Sebastian Müller e1172fc78c fix misspelling 2014-07-30 20:10:12 +02:00
Clayton Coleman dc6fdc423d Merge pull request #627 from lavalamp/fix 
Add /version to server and check it in client.
 2014-07-30 12:52:15 -04:00
brendandburns 0ad9221f5c Merge pull request #695 from danmcp/fix_golint_warnings 
Fixing golint warnings
 2014-07-30 06:49:27 -07:00
Dan McPherson d5fcaa1f03 Fixing golint warnings 2014-07-30 13:41:09 +02:00
Dawn Chen 8e9864e8fc Instead of apiserver panic when proxy a request to a dead minion, 
print out proper message through http.Response
 2014-07-28 16:40:29 -07:00
Daniel Smith 3b8488028d Add /version to server and check it in client. 
Will help detect client/version skew and prevent e2e test from passing
while running a version other than the one you think it's running.
 2014-07-28 15:45:25 -07:00
Dan McPherson 7bbc5e2a19 Fixing typos 2014-07-28 15:15:50 +02:00
Clayton Coleman 1047c57c6d Use http.StatusInternalServerError instead of 500 2014-07-27 15:37:03 -04:00
Brendan Burns bf5ae4bb9d Fork API types. 2014-07-24 21:47:08 -07:00
Daniel Smith 9e9d9b8913 Merge pull request #607 from smarterclayton/return_correct_content_type 
Write the json content type for API responses
 2014-07-24 15:27:31 -07:00
Jonathan Boulle c43035088b assorted formatting and typo fixes 2014-07-24 15:10:36 -07:00
Clayton Coleman 30e881c3f9 Write JSON content type for API responses 2014-07-24 17:45:02 -04:00
Dawn Chen 47ad71f92d HandleIndex when URL.Path == "/" 2014-07-22 14:12:16 -07:00
Dawn Chen dc921b8c65 comment changes 2014-07-21 14:46:59 -07:00
Dawn Chen 064237a5b8 Add support to query kubelet's logs and cadvisor's stats through 
apiserver by passing rawquery.

minor changes

Fixed a minor rebase issues.

Using ioutil.ReadAll instead of httputil.DumpResponse
 2014-07-21 11:52:32 -07:00
Daniel Smith 69c483f620 Add APIObject for generic inclusion of API objects. 
Includes test and json/yaml getters and setters.
 2014-07-18 22:35:08 -07:00
Daniel Smith eda30d4f20 Add watch mechanism to apiserver 
Implemented via HTTP and websocket. A test is present but this isn't
yet wired into anything.

Eventual purpose of this is to allow a scheduler to watch for new pods.
Or allow replication controller to watch for new items it controlls.
Generally, it'll be good to turn everything possible into a push instead
of a poll.
 2014-07-18 16:47:17 -07:00
Clayton Coleman 0ccf1b7812 Operation server was not returning in error cases 2014-07-18 12:36:27 -04:00
Yuki Yugui Sonoda 2aa3de12d4 Make RESTful operations return 404 Not Found when the target resource 
does not exist.

In the original implementation, GET, DELETE and PUT operations on
non-existent resources used to return 500 but not 404.
 2014-07-18 14:16:56 +09:00
Daniel Smith 90afdb06c1 Move logger to own package; clean up apiserver to use serve mux. 2014-07-15 21:25:33 -07:00
Yifan Gu 0e9e2ee7f4 Changed op.notify<-true to close(op.notify). 2014-07-15 15:08:04 -07:00
Daniel Smith 61917a0628 Revert "Changed op.notify<-true to close(op.notify)." 2014-07-15 10:34:05 -07:00
Yifan Gu 90cc060699 Changed op.notify<-true to close(op.notify). 2014-07-15 00:29:43 -07:00
Yuki Yugui Sonoda 5cfbed4453 Fixes golint errors in pkg/apiserver 2014-07-08 16:10:11 +09:00
Daniel Smith 3b9735d787 Test atomic PUTs, and make them work. 
Improve apiserver/logger.go's interface (it's pretty cool now).

Improve apiserver's error reporting to clients.

Improve client's handling of errors from apiserver.

Make failed PUTs return 409 (conflict)-- http status codes are amazingly
well defined for what we're doing!
 2014-07-02 15:42:05 -07:00
Dawn Chen 85152fc137 Add a FileServer for master's logs 2014-06-30 16:33:54 -07:00
Daniel Smith afd13edd6a Address comments; also, demonstrate one more property in test. 2014-06-26 11:36:15 -07:00
Daniel Smith c9246dc130 Implement required sync changes everywhere. 
Make requests sync by default, so that usage of them doesn't have to
change.
 2014-06-26 10:33:21 -07:00
Daniel Smith 59a6489e84 Add tracked operations to apiserver 2014-06-26 10:33:21 -07:00
Tim Hockin 9f9e75f508 Switch to glog for logging, bridge logging to glog. 
1) imported glog to third_party (previous commit)
2) add support for third_party/update.sh to update just one pkg
3) search-and-replace:
  s/log.Printf/glog.Infof/
  s/log.Print/glog.Info/
  s/log.Fatalf/glog.Fatalf/
  s/log.Fatal/glog.Fatal/
4) convert glog.Info.*, err into glog.Error*

Adds some util interfaces to logging and calls them from each cmd, which
will set the default log output to write to glog.  Pass glog-wrapped
Loggers to etcd for logging.

Log files will go to /tmp - we should probably follow this up with a
default log dir for each cmd.

The glog lib is sort of weak in that it only flushes every 30 seconds, so
we spin up our own flushing goroutine.
 2014-06-24 20:51:57 -07:00
brendandburns 49c25a4e28 Merge pull request #196 from lavalamp/marshal 
Make api able to marshal its types correctly
 2014-06-23 13:22:52 -07:00
Daniel Smith b850d36166 Fix boilerplate everywhere 2014-06-23 11:32:11 -07:00
Daniel Smith ee75bb8dbe Address comments; Also internally start using JSONBase instead of reflect.Value of JSONBase. 2014-06-23 09:54:17 -07:00
Daniel Smith 41534c1cc5 Encode/decode working everywhere now. 2014-06-23 09:54:17 -07:00
Daniel Smith 14361e336a Make apiserver work with new encode/decode 2014-06-23 09:54:17 -07:00
Daniel Smith fb991fb84e Change type to []byte 2014-06-23 09:54:17 -07:00
Daniel Smith 5de9071b5c Add improved logging: record latency & call stack on error 2014-06-22 11:17:23 -07:00
Daniel Smith 466be48c74 Merge pull request #166 from brendandburns/sync 
Part #1 of synchronous requests: Add channels and a mechanism for waiting
 2014-06-19 16:40:25 -07:00
Brendan Burns 2640de5c02 Part #1 of synchronous requests: Add channels and a mechanism for waiting on them 2014-06-19 16:13:13 -07:00
Daniel Smith bc02b3c21a Rename [label] query to selector 2014-06-19 13:31:42 -07:00
Daniel Smith 246db91cb5 Merge pull request #135 from brendandburns/lb 
Add load balancing support to services.
 2014-06-17 18:40:42 -07:00
Justin Huff 3072ccf088 When the apiserver panics, log a stacktrace. 2014-06-17 14:59:37 -07:00
Brendan Burns 2759b2367f Add load balancing support to services. 2014-06-17 12:37:39 -07:00
Daniel Smith 154ec0db1e apiserver builds again 2014-06-16 22:05:12 -07:00
Daniel Smith 1c6342a794 Move labels to own package 2014-06-16 22:05:11 -07:00
Daniel Smith 3ab2f8a3a2 First piece of improving labels 2014-06-16 22:05:11 -07:00
Daniel Smith 6d3af1f8ff Make success status public so it will actually get sent to clients 2014-06-16 22:05:11 -07:00
Daniel Smith b3ab658c71 consistent filenames 2014-06-15 23:30:58 -07:00
Brendan Burns 32071289e6 Add some documentation 2014-06-15 22:42:19 -07:00
Daniel Smith 2324dc1510 Merge pull request #102 from brendandburns/errors 
Make all error strings lower case, for readability.
 2014-06-13 15:56:40 -07:00
Brendan Burns 482a360f9e Make all error strings lower case, for readability. 2014-06-13 15:45:19 -07:00
Daniel Smith b95eef522b Add nice(r) error message on api server panic. Fix nil ptr derefs. 2014-06-13 14:59:36 -07:00
Brendan Burns 164160adef Address package level comments for readability. 2014-06-12 20:26:12 -07:00
Johan Euphrosine 4f6bed03ae gofmt -s pkg/ cmd/ 2014-06-12 14:16:19 -07:00
Brendan Burns 6018497174 Task -> Pod part #3 2014-06-08 22:38:45 -07:00
Brendan Burns 6e7b3fd969 Fix a compile error. 2014-06-07 21:56:14 -07:00
Brendan Burns ef7cce5dad Populate 'Kind' field in all API types being returned. 2014-06-07 21:07:20 -07:00
Joe Beda 2c4b3a562c First commit 2014-06-06 16:40:48 -07:00