Improve the output of the swagger API for watch events

[smarterclayton]

Stopgap to improve this prior to converting watch resources to
versioned objects.

Spawned from #6182

[googlebot]

Thanks for your pull request.

It looks like this may be your first contribution to a Google open source project, in which case you'll need to sign a Contributor License Agreement (CLA) at https://cla.developers.google.com/.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check the information on your CLA or see this help article on setting the email on your git commits.

Once you've done that, please reply here to let us know. If you signed the CLA as a corporation, please let us know the company's name.

[bgrant0607]

LGTM. Thanks. @thockin can rebase on top of this and regenerate the swagger.

[brendandburns]

Tests are failing:

# github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json
_output/local/go/src/github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json/decoder_test.go:45: undefined: watchEvent
FAIL    github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json [build failed]

[bgrant0607]

Merged multi-port services. Please run hack/update-swagger-spec.sh.

[smarterclayton]

Rebased, test fixed, and docs updated.

----- Original Message -----

Merged multi-port services. Please run hack/update-swagger-spec.sh.

---

Reply to this email directly or view it on GitHub:
#6232 (comment)

[bgrant0607]

Something's not right here. This is reverting multi-port services, among other things.

[smarterclayton]

Bad merge, let me delete and regen.

----- Original Message -----

"v1beta3.ServiceSpec": {
 "id": "v1beta3.ServiceSpec",
 "required": [

• "ports",
  

• "port",
  

Something's not right here. This is reverting multi-port services, among
other things.

---

Reply to this email directly or view it on GitHub:
https://github.com/GoogleCloudPlatform/kubernetes/pull/6232/files#r27528460

[smarterclayton]

Fixed, sorry.

----- Original Message -----

Bad merge, let me delete and regen.

----- Original Message -----

"v1beta3.ServiceSpec": {
 "id": "v1beta3.ServiceSpec",
 "required": [

• "ports",
  

• "port",
  

Something's not right here. This is reverting multi-port services, among
other things.

---

Reply to this email directly or view it on GitHub:
https://github.com/GoogleCloudPlatform/kubernetes/pull/6232/files#r27528460

[bgrant0607]

Weird. I'm not seeing the comments I received via email, nor the latest push.

[bgrant0607]

@smarterclayton Maybe try to make clean, rebuild, and regenerate the swagger?

@nikhiljindal Any guess about what's going on with the swagger generation? A stale go-restful dependency?

[nikhiljindal]

@smarterclayton : Did you rebuild the binary before running update-swagger-spec?
That script uses the existing binary rather then re-building it.

[bgrant0607]

@nikhiljindal He picked up some recent API changes, so I'd guess he did build it.

[nikhiljindal]

The type changes and addition of a path parameter in swagger spec are coming from #6143 and #6117.

[bgrant0607]

Ok, sorry. Swagger has been updated from earlier changes. Please rebase and re-update swagger again. Feel free to self-merge.

[bgrant0607]

@smarterclayton Could we try to get this in before something breaks it again? :-) It might be easier if you didn't update the swagger in this PR.

[smarterclayton]

Rebased, split swagger out.

[bgrant0607]

LGTM. Thanks.

When looking at this I noticed that the /log content types are wrong.

The shippable failure is a known kubelet test problem.