WIP

Author: wking

pkg/cvo/availableupdates.go

@@ -20,6 +20,31 @@ import (
 	"github.com/openshift/cluster-version-operator/pkg/cincinnati"
 )
 
+// AvailableUpdatesRequest is a request for available updates for a given cluster.
+type AvailableUpdatesRequest {
+	// ClusterID uniquely identifies this cluster.
+	ClusterID ClusterID
+
+	// Upstream is the Cincinnati service URI.
+	Upstream configv1.URL
+
+	// Version is the current release image version.
+	Version string
+
+	// Channel is the subscribed release channel.
+	Channel string
+
+	// Architecture is the cluster's current architecture.
+	Architecture string
+}
+
+// AvailableUpdatesResponse is a response listing available updates.
+type AvailableUpdatesResponse struct {
+	// Request is the request ...
+	Request AvailableUpdatesRequest
+
+}
+
 // availableUpdatesSync is triggered on cluster version change (and periodic requeues) to
 // sync available updates. It only modifies cluster version.
 func (optr *Operator) availableUpdatesSync(key string) error {

pkg/cvo/cvo.go

@@ -120,11 +120,13 @@ type Operator struct {
 
 	// queue tracks applying updates to a cluster.
 	queue workqueue.RateLimitingInterface
-	// availableUpdatesQueue tracks checking for updates from the update server.
-	availableUpdatesQueue workqueue.RateLimitingInterface
 	// upgradeableQueue tracks checking for upgradeable.
 	upgradeableQueue workqueue.RateLimitingInterface
 
+	// availableUpdatesTrigger allows the...Queue tracks checking for updates from the update server.
+	availableUpdatesTrigger <-chan string
+
+
 	// statusLock guards access to modifying available updates
 	statusLock       sync.Mutex
 	availableUpdates *availableUpdates
@@ -314,8 +316,8 @@ func loadConfigMapVerifierDataFromUpdate(update *payload.Update, clientBuilder v
 	return nil, nil, nil
 }
 
-// Run runs the cluster version operator until stopCh is completed. Workers is ignored for now.
-func (optr *Operator) Run(ctx context.Context, workers int) {
+// Run runs the cluster version operator until the context completes.
+func (optr *Operator) Run(ctx context.Context, availableUpdatesTrigger <-chan struct{}, availableUpdatesStatus chan-> configv1.ClusterVersionStatus) {
 	defer utilruntime.HandleCrash()
 	defer optr.queue.ShutDown()
 	stopCh := ctx.Done()

pkg/start/start.go

@@ -27,6 +27,7 @@ import (
 	"k8s.io/client-go/util/flowcontrol"
 	"k8s.io/klog"
 
+	configv1 "github.com/openshift/api/config/v1"
 	clientset "github.com/openshift/client-go/config/clientset/versioned"
 	externalversions "github.com/openshift/client-go/config/informers/externalversions"
 	"github.com/openshift/cluster-version-operator/pkg/autoupdate"
@@ -178,12 +179,13 @@ func (o *Options) run(ctx context.Context, controllerCtx *Context, lock *resourc
 			OnStartedLeading: func(localCtx context.Context) {
 
 				availableUpdatesTrigger := make(chan struct{}, 1)
+				availableUpdatesStatus := make(chan configv1.ClusterVersionStatus, 1)
 				errorChannelCount++
 				go func() {
-					errorChannel <- cvo.RunAvailableUpdates(runContext, shutdownContext, availableUpdatesTrigger)
+					errorChannel <- cvo.RunAvailableUpdates(runContext, shutdownContext, availableUpdatesTrigger, availableUpdatesStatus)
 				}()
 
-				controllerCtx.Start(runContext, availableUpdatesTrigger)
+				controllerCtx.Start(runContext, availableUpdatesTrigger, availableUpdatesStatus)
 				select {
 				case <-runContext.Done():
 					// WARNING: this is not completely safe until we have Kube 1.14 and ReleaseOnCancel
@@ -401,10 +403,10 @@ func (o *Options) NewControllerContext(cb *ClientBuilder) *Context {
 
 // Start launches the controllers in the provided context and any supporting
 // infrastructure. When ch is closed the controllers will be shut down.
-func (c *Context) Start(ctx context.Context, availableUpdatesTrigger <-chan struct{}, availableUpdatesStatus ->..) {
+func (c *Context) Start(ctx context.Context, availableUpdatesTrigger <-chan struct{}, availableUpdatesStatus chan-> configv1.ClusterVersionStatus) {
 	ch := ctx.Done()
 
-	go c.CVO.Run(ctx, 2)
+	go c.CVO.Run(ctx, availableUpdatesTrigger, availableUpdatesStatus)
 	if c.AutoUpdate != nil {
 		go c.AutoUpdate.Run(2, ch)
 	}