client secret: fix conditions; secret writing

Author: stlaz

pkg/console/controllers/oauthclients/oauthclients.go

@@ -111,7 +111,6 @@ func (c *oauthClientsController) sync(ctx context.Context, controllerContext fac
 	case "", configv1.AuthenticationTypeIntegratedOAuth:
 	default:
 		// if we're not using integrated oauth, reset all degraded conditions
-		statusHandler.AddConditions(status.HandleProgressingOrDegraded("OAuthClientSecretSync", "", nil))
 		statusHandler.AddConditions(status.HandleProgressingOrDegraded("OAuthClientSync", "", nil))
 		return statusHandler.FlushAndReturn(nil)
 	}

pkg/console/controllers/oauthclientsecret/oauthclientsecret.go

@@ -133,7 +133,8 @@ func (c *oauthClientSecretController) sync(ctx context.Context, syncCtx factory.
 		}
 	default:
 		klog.V(2).Infof("unknown authentication type: %s", authConfig.Spec.Type)
-		return nil
+		statusHandler.AddConditions(status.HandleProgressingOrDegraded("OAuthClientSecretSync", "", nil))
+		return statusHandler.FlushAndReturn(nil)
 	}
 
 	err = c.syncSecret(ctx, secretString, syncCtx.Recorder())
@@ -148,7 +149,7 @@ func (c *oauthClientSecretController) syncSecret(ctx context.Context, clientSecr
 	}
 
 	secret, err := c.targetNSSecretsLister.Secrets(api.TargetNamespace).Get("console-oauth-config")
-	if apierrors.IsNotFound(err) || secretsub.GetSecretString(secret) == clientSecret {
+	if apierrors.IsNotFound(err) || secretsub.GetSecretString(secret) != clientSecret {
 		_, _, err = resourceapply.ApplySecret(ctx, c.secretsClient, recorder, secretsub.DefaultSecret(operatorConfig, clientSecret))
 	}
 	return err

pkg/console/operator/sync_v400.go

@@ -150,7 +150,7 @@ func (co *consoleOperator) sync_v400(ctx context.Context, controllerContext fact
 	}
 
 	clientSecret, secErr := co.secretsLister.Secrets(api.TargetNamespace).Get(secretsub.Stub().Name)
-	statusHandler.AddConditions(status.HandleProgressingOrDegraded("OAuthClientSecretSync", "FailedGet", secErr))
+	statusHandler.AddConditions(status.HandleProgressingOrDegraded("OAuthClientSecretGet", "FailedGet", secErr))
 	if secErr != nil {
 		return statusHandler.FlushAndReturn(secErr)
 	}