oauthclients: fix comments

Author: stlaz

pkg/console/controllers/oauthclients/oauthclients.go

@@ -28,7 +28,6 @@ import (
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
 
 	"github.com/openshift/console-operator/pkg/api"
-	"github.com/openshift/console-operator/pkg/console/operator"
 	"github.com/openshift/console-operator/pkg/console/status"
 	oauthsub "github.com/openshift/console-operator/pkg/console/subresource/oauthclient"
 	routesub "github.com/openshift/console-operator/pkg/console/subresource/route"
@@ -114,12 +113,12 @@ func (c *oauthClientsController) sync(ctx context.Context, controllerContext fac
 		routeName = api.OpenshiftConsoleCustomRouteName
 	}
 
-	_, consoleURL, _, routeErr := operator.GetActiveRouteInfo(ctx, c.routesLister, routeName)
+	_, consoleURL, _, routeErr := routesub.GetActiveRouteInfo(c.routesLister, routeName)
 	if routeErr != nil {
 		return routeErr
 	}
 
-	clientSecret, _, secErr := c.syncSecret(ctx, operatorConfig, controllerContext.Recorder())
+	clientSecret, secErr := c.syncSecret(ctx, operatorConfig, controllerContext.Recorder())
 	c.statusHandler.AddConditions(status.HandleProgressingOrDegraded("OAuthClientSecretSync", "FailedApply", secErr))
 	if secErr != nil {
 		return c.statusHandler.FlushAndReturn(secErr)
@@ -155,16 +154,13 @@ func (c *oauthClientsController) handleStatus(ctx context.Context) (bool, error)
 	}
 }
 
-func (c *oauthClientsController) syncSecret(ctx context.Context, operatorConfig *operatorv1.Console, recorder events.Recorder) (*corev1.Secret, bool, error) {
+func (c *oauthClientsController) syncSecret(ctx context.Context, operatorConfig *operatorv1.Console, recorder events.Recorder) (*corev1.Secret, error) {
 	secret, err := c.targetNSSecretsLister.Secrets(api.TargetNamespace).Get(secretsub.Stub().Name)
 	if apierrors.IsNotFound(err) || secretsub.GetSecretString(secret) == "" {
-		return resourceapply.ApplySecret(ctx, c.secretsClient, recorder, secretsub.DefaultSecret(operatorConfig, crypto.Random256BitsString()))
+		secret, _, err = resourceapply.ApplySecret(ctx, c.secretsClient, recorder, secretsub.DefaultSecret(operatorConfig, crypto.Random256BitsString()))
 	}
 	// any error should be returned & kill the sync loop
-	if err != nil {
-		return nil, false, err
-	}
-	return secret, false, nil
+	return secret, err
 }
 
 // applies changes to the oauthclient
@@ -190,7 +186,7 @@ func (c *oauthClientsController) syncOAuthClient(
 
 func (c *oauthClientsController) deregisterClient(ctx context.Context) error {
 	// existingOAuthClient is not a delete, it is a deregister/neutralize
-	existingOAuthClient, err := c.oauthClient.OAuthClients().Get(ctx, oauthsub.Stub().Name, metav1.GetOptions{})
+	existingOAuthClient, err := c.oauthClientLister.Get(oauthsub.Stub().Name)
 	if err != nil {
 		return err
 	}
@@ -199,7 +195,8 @@ func (c *oauthClientsController) deregisterClient(ctx context.Context) error {
 		return nil
 	}
 
-	_, err = c.oauthClient.OAuthClients().Update(ctx, oauthsub.DeRegisterConsoleFromOAuthClient(existingOAuthClient), metav1.UpdateOptions{})
+	updated := oauthsub.DeRegisterConsoleFromOAuthClient(existingOAuthClient.DeepCopy())
+	_, err = c.oauthClient.OAuthClients().Update(ctx, updated, metav1.UpdateOptions{})
 	return err
 
 }

pkg/console/operator/operator.go

@@ -320,7 +320,7 @@ func (c *consoleOperator) Sync(ctx context.Context, controllerContext factory.Sy
 }
 
 func (c *consoleOperator) handleSync(ctx context.Context, controllerContext factory.SyncContext, configs configSet) error {
-	updatedStatus := configs.Operator.DeepCopy()
+	updatedStatus := configs.Operator
 
 	switch updatedStatus.Spec.ManagementState {
 	case operatorsv1.Managed:

pkg/console/operator/sync_v400.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net/url"
 	"os"
 
 	// kube
@@ -22,14 +21,12 @@ import (
 	v1 "github.com/openshift/api/console/v1"
 	operatorv1 "github.com/openshift/api/operator/v1"
 	routev1 "github.com/openshift/api/route/v1"
-	routev1listers "github.com/openshift/client-go/route/listers/route/v1"
 	"github.com/openshift/console-operator/pkg/api"
 	"github.com/openshift/library-go/pkg/controller/factory"
 	"github.com/openshift/library-go/pkg/operator/events"
 	"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
 	"github.com/openshift/library-go/pkg/operator/resource/resourcemerge"
 	"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
-	"github.com/openshift/library-go/pkg/route/routeapihelpers"
 
 	// operator
 	customerrors "github.com/openshift/console-operator/pkg/console/errors"
@@ -61,7 +58,7 @@ func (co *consoleOperator) sync_v400(ctx context.Context, controllerContext fact
 		routeName = api.OpenshiftConsoleCustomRouteName
 	}
 
-	route, consoleURL, routeReasoneErr, routeErr := GetActiveRouteInfo(ctx, co.routeLister, routeName)
+	route, consoleURL, routeReasoneErr, routeErr := routesub.GetActiveRouteInfo(co.routeLister, routeName)
 	// TODO: this controller is no longer responsible for syncing the route.
 	//   however, the route is essential for several of the components below.
 	//   - the loop should exit early and wait until the RouteSyncController creates the route.
@@ -209,19 +206,6 @@ func (co *consoleOperator) sync_v400(ctx context.Context, controllerContext fact
 	return statusHandler.FlushAndReturn(nil)
 }
 
-func GetActiveRouteInfo(ctx context.Context, routeClient routev1listers.RouteLister, activeRouteName string) (route *routev1.Route, routeURL *url.URL, reason string, err error) {
-	route, routeErr := routeClient.Routes(api.TargetNamespace).Get(activeRouteName)
-	if routeErr != nil {
-		return nil, nil, "FailedGet", routeErr
-	}
-	uri, _, uriErr := routeapihelpers.IngressURI(route, route.Spec.Host)
-	if uriErr != nil {
-		return nil, nil, "FailedIngress", uriErr
-	}
-
-	return route, uri, "", nil
-}
-
 func (co *consoleOperator) SyncConsoleConfig(ctx context.Context, consoleConfig *configv1.Console, consoleURL string) (*configv1.Console, error) {
 	oldURL := consoleConfig.Status.ConsoleURL
 	metrics.HandleConsoleURL(oldURL, consoleURL)

pkg/console/subresource/route/route.go

@@ -5,6 +5,7 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
+	"net/url"
 	"time"
 
 	// kube
@@ -18,8 +19,10 @@ import (
 	operatorv1 "github.com/openshift/api/operator/v1"
 	routev1 "github.com/openshift/api/route/v1"
 	routeclient "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
+	routev1listers "github.com/openshift/client-go/route/listers/route/v1"
 	"github.com/openshift/library-go/pkg/operator/resource/resourcemerge"
 	"github.com/openshift/library-go/pkg/operator/resource/resourceread"
+	"github.com/openshift/library-go/pkg/route/routeapihelpers"
 
 	"github.com/openshift/console-operator/bindata"
 	"github.com/openshift/console-operator/pkg/api"
@@ -201,6 +204,19 @@ func ApplyRoute(client routeclient.RoutesGetter, required *routev1.Route) (*rout
 	return actual, true, err
 }
 
+func GetActiveRouteInfo(routeClient routev1listers.RouteLister, activeRouteName string) (route *routev1.Route, routeURL *url.URL, reason string, err error) {
+	route, routeErr := routeClient.Routes(api.TargetNamespace).Get(activeRouteName)
+	if routeErr != nil {
+		return nil, nil, "FailedGet", routeErr
+	}
+	uri, _, uriErr := routeapihelpers.IngressURI(route, route.Spec.Host)
+	if uriErr != nil {
+		return nil, nil, "FailedIngress", uriErr
+	}
+
+	return route, uri, "", nil
+}
+
 func GetCustomTLS(customCertSecret *corev1.Secret) (*CustomTLSCert, error) {
 	customTLS := &CustomTLSCert{}
 	cert, certExist := customCertSecret.Data["tls.crt"]