-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Conversation
Looks like you missed two
|
048c005
to
585daca
Compare
This PR also updates the Upstream connection so it connects to the v11 endpoint. This was introduced as wee while ago to support rollout progress with ListServicesWithOptions, but back-filled in the (versioned) RPC clients so that it would work with older fluxd too. Usually there's a gap necessary between introducing a new version and rolling out a Flux release that uses it, so that the service part of it can be rolled out in Weave Cloud -- so probably what happened is that, since it worked with the back-filled RPC client, the latter part of the rollout was forgotten. In any case, I've now Actually Tried It with
and both of these work. Specifically, I was looking for all the UI elements to work OK, and for notifications to be propagated to the service. It should also work fine with justinbarrick/fluxcloud, because that accepts websocket connections at any path. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code changes look solid, and given #2211 (comment) there is enough evidence it works :-)
This commit moves the Upstream methods (Ping, etc., available only over RPC) to the Server v11 interface, and abandons the Upstream interface. This is so that any client, including weaveworks/flux-adapter, can access these methods. It also updates the upstream registration point to v11 -- an incidental but related change.
585daca
to
cf79228
Compare
fluxcd/flux#2211 moved the api.Upstream methods into api.Server, and implemented them for the HTTP API server and client. That means we no longer need a shim to stub the extra methods on top of an HTTP client.
weaveworks/flux-adapter
This (modulo passing tests and review) can be merged now, in principle, because it doesn't alter what is served over the Upstream connection -- it just adds to the HTTP API. But I am going to make it a draft until I've Actually Tried that.
Fixes #2210.