test/e2e-oidc: validate oauth resources missing when OIDC gets rolled out

Author: liouk

pkg/operator/extractors.go

@@ -0,0 +1,42 @@
+package operator
+
+import (
+	"fmt"
+
+	operatorv1 "github.com/openshift/api/operator/v1"
+	applyoperatorv1 "github.com/openshift/client-go/operator/applyconfigurations/operator/v1"
+
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func ExtractOperatorSpec(obj *unstructured.Unstructured, fieldManager string) (*applyoperatorv1.OperatorSpecApplyConfiguration, error) {
+	castObj := &operatorv1.Authentication{}
+	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, castObj); err != nil {
+		return nil, fmt.Errorf("unable to convert to Authentication: %w", err)
+	}
+	ret, err := applyoperatorv1.ExtractAuthentication(castObj, fieldManager)
+	if err != nil {
+		return nil, fmt.Errorf("unable to extract fields for %q: %w", fieldManager, err)
+	}
+	if ret.Spec == nil {
+		return nil, nil
+	}
+	return &ret.Spec.OperatorSpecApplyConfiguration, nil
+}
+
+func ExtractOperatorStatus(obj *unstructured.Unstructured, fieldManager string) (*applyoperatorv1.OperatorStatusApplyConfiguration, error) {
+	castObj := &operatorv1.Authentication{}
+	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, castObj); err != nil {
+		return nil, fmt.Errorf("unable to convert to Authentication: %w", err)
+	}
+	ret, err := applyoperatorv1.ExtractAuthenticationStatus(castObj, fieldManager)
+	if err != nil {
+		return nil, fmt.Errorf("unable to extract fields for %q: %w", fieldManager, err)
+	}
+
+	if ret.Status == nil {
+		return nil, nil
+	}
+	return &ret.Status.OperatorStatusApplyConfiguration, nil
+}

pkg/operator/replacement_starter.go

@@ -104,8 +104,8 @@ func CreateOperatorInputFromMOM(ctx context.Context, momInput libraryapplyconfig
 		momInput.MutationTrackingClient.GetHTTPClient(),
 		operatorv1.GroupVersion.WithResource("authentications"),
 		operatorv1.GroupVersion.WithKind("Authentication"),
-		extractOperatorSpec,
-		extractOperatorStatus,
+		ExtractOperatorSpec,
+		ExtractOperatorStatus,
 	)
 	if err != nil {
 		return nil, err
@@ -189,8 +189,8 @@ func CreateControllerInputFromControllerContext(ctx context.Context, controllerC
 		controllerContext.KubeConfig,
 		operatorv1.GroupVersion.WithResource("authentications"),
 		operatorv1.GroupVersion.WithKind("Authentication"),
-		extractOperatorSpec,
-		extractOperatorStatus,
+		ExtractOperatorSpec,
+		ExtractOperatorStatus,
 	)
 	if err != nil {
 		return nil, err

pkg/operator/starter.go

@@ -14,7 +14,6 @@ import (
 	"github.com/openshift/api/features"
 	operatorv1 "github.com/openshift/api/operator/v1"
 	routev1 "github.com/openshift/api/route/v1"
-	applyoperatorv1 "github.com/openshift/client-go/operator/applyconfigurations/operator/v1"
 	"github.com/openshift/cluster-authentication-operator/bindata"
 	"github.com/openshift/cluster-authentication-operator/pkg/controllers/common"
 	"github.com/openshift/cluster-authentication-operator/pkg/controllers/configobservation/configobservercontroller"
@@ -60,10 +59,8 @@ import (
 	certapiv1 "k8s.io/api/certificates/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/selection"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -827,37 +824,6 @@ func loadSystemCACertBundle() ([]byte, error) {
 	return systemCABundle, nil
 }
 
-func extractOperatorSpec(obj *unstructured.Unstructured, fieldManager string) (*applyoperatorv1.OperatorSpecApplyConfiguration, error) {
-	castObj := &operatorv1.Authentication{}
-	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, castObj); err != nil {
-		return nil, fmt.Errorf("unable to convert to Authentication: %w", err)
-	}
-	ret, err := applyoperatorv1.ExtractAuthentication(castObj, fieldManager)
-	if err != nil {
-		return nil, fmt.Errorf("unable to extract fields for %q: %w", fieldManager, err)
-	}
-	if ret.Spec == nil {
-		return nil, nil
-	}
-	return &ret.Spec.OperatorSpecApplyConfiguration, nil
-}
-
-func extractOperatorStatus(obj *unstructured.Unstructured, fieldManager string) (*applyoperatorv1.OperatorStatusApplyConfiguration, error) {
-	castObj := &operatorv1.Authentication{}
-	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, castObj); err != nil {
-		return nil, fmt.Errorf("unable to convert to Authentication: %w", err)
-	}
-	ret, err := applyoperatorv1.ExtractAuthenticationStatus(castObj, fieldManager)
-	if err != nil {
-		return nil, fmt.Errorf("unable to extract fields for %q: %w", fieldManager, err)
-	}
-
-	if ret.Status == nil {
-		return nil, nil
-	}
-	return &ret.Status.OperatorStatusApplyConfiguration, nil
-}
-
 func oidcAvailable(authConfigChecker common.AuthConfigChecker) bool {
 	oidcAvailable, err := authConfigChecker.OIDCAvailable()
 	if err != nil {