Merge pull request #750 from eggfoobar/fix-integration-tests

NO-JIRA: fix: resolve some integration tests

go.mod

@@ -6,10 +6,10 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/ghodss/yaml v1.0.0
 	github.com/google/go-cmp v0.6.0
-	github.com/openshift/api v0.0.0-20241101202457-04eb3fd119d2
+	github.com/openshift/api v0.0.0-20241203091751-58d4ac495429
 	github.com/openshift/build-machinery-go v0.0.0-20241126220845-0de670012c09
-	github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
-	github.com/openshift/library-go v0.0.0-20241127135410-64d8d9e80808
+	github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071
+	github.com/openshift/library-go v0.0.0-20250113163708-355465391f40
 	github.com/openshift/multi-operator-manager v0.0.0-20241205181422-20aa3906b99d
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -148,14 +148,14 @@ github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA
 github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
 github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
 github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
-github.com/openshift/api v0.0.0-20241101202457-04eb3fd119d2 h1:CguNy+2KzhJ3a3i7e4Bgm/ByfQpSSSPYmF9NLZskoUs=
-github.com/openshift/api v0.0.0-20241101202457-04eb3fd119d2/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
+github.com/openshift/api v0.0.0-20241203091751-58d4ac495429 h1:fz+u78YFRL14rXqBKWIVYK04mUOy6LccHe3wQsUS3iI=
+github.com/openshift/api v0.0.0-20241203091751-58d4ac495429/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
 github.com/openshift/build-machinery-go v0.0.0-20241126220845-0de670012c09 h1:NibXytu9e89emCQoRiKZR+warzC1bpQgYDyb9jpEI/s=
 github.com/openshift/build-machinery-go v0.0.0-20241126220845-0de670012c09/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
-github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=
-github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
-github.com/openshift/library-go v0.0.0-20241127135410-64d8d9e80808 h1:IUVlNRH6tuA0djyJsfGVTACsjE16hncfU1c/YKOobGw=
-github.com/openshift/library-go v0.0.0-20241127135410-64d8d9e80808/go.mod h1:l/3SegTa9x+ry2J213bh7+DBofXOOvdrqU4JC9ktJa0=
+github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071 h1:l0++HnGVKBcs8kXFL/1yeozxioxPGNpp0PYe3Y+0sq4=
+github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071/go.mod h1:gL0laCCiIaNTNw1ZsMQZXBVu2NeQFpNWm9bLtYO9+ZU=
+github.com/openshift/library-go v0.0.0-20250113163708-355465391f40 h1:ymSK5aMBIfxuo9DlzYslHSB/f8TlGokQ9iMAmBYEF7U=
+github.com/openshift/library-go v0.0.0-20250113163708-355465391f40/go.mod h1:eGSI6tp7yUVr4V2d0WrVt2l5s3iCwAh8Hi0RC9Fo16U=
 github.com/openshift/multi-operator-manager v0.0.0-20241205181422-20aa3906b99d h1:Rzx23P63JFNNz5D23ubhC0FCN5rK8CeJhKcq5QKcdyU=
 github.com/openshift/multi-operator-manager v0.0.0-20241205181422-20aa3906b99d/go.mod h1:iVi9Bopa5cLhjG5ie9DoZVVqkH8BGb1FQVTtecOLn4I=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=

pkg/cmd/operator/cmd.go

@@ -2,7 +2,6 @@ package operator
 
 import (
 	"github.com/spf13/cobra"
-
 	"k8s.io/utils/clock"
 
 	"github.com/openshift/cluster-authentication-operator/pkg/operator"

pkg/operator/replacement_starter.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	kubeinformers "k8s.io/client-go/informers"
+	"k8s.io/utils/clock"
 
 	kubemigratorclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset"
 	migrationv1alpha1informer "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/informer"
@@ -51,6 +52,7 @@ type authenticationOperatorInput struct {
 	apiregistrationv1Client      apiregistrationclient.Interface
 	migrationClient              kubemigratorclient.Interface
 	eventRecorder                events.Recorder
+	clock                        clock.PassiveClock
 
 	informerFactories []libraryapplyconfiguration.SimplifiedInformerFactory
 }
@@ -129,6 +131,7 @@ func CreateOperatorInputFromMOM(ctx context.Context, momInput libraryapplyconfig
 		apiregistrationv1Client:      apiregistrationv1Client,
 		migrationClient:              migrationClient,
 		eventRecorder:                eventRecorder,
+		clock:                        momInput.Clock,
 		informerFactories: []libraryapplyconfiguration.SimplifiedInformerFactory{
 			libraryapplyconfiguration.DynamicInformerFactoryAdapter(dynamicInformers), // we don't share the dynamic informers, but we only want to start when requested
 		},
@@ -199,6 +202,7 @@ func CreateControllerInputFromControllerContext(ctx context.Context, controllerC
 		apiregistrationv1Client:      apiregistrationv1Client,
 		migrationClient:              migrationClient,
 		eventRecorder:                eventRecorder,
+		clock:                        controllerContext.Clock,
 		informerFactories: []libraryapplyconfiguration.SimplifiedInformerFactory{
 			libraryapplyconfiguration.DynamicInformerFactoryAdapter(dynamicInformers), // we don't share the dynamic informers, but we only want to start when requested
 		},

pkg/operator/starter.go

@@ -435,6 +435,7 @@ func prepareOauthAPIServerOperator(
 		"oauth-apiserver",
 		authOperatorInput.authenticationOperatorClient,
 		eventRecorder,
+		authOperatorInput.clock,
 	).WithWorkloadController(
 		"OAuthAPIServerController",
 		"openshift-authentication-operator",

test-data/apply-configuration/overall/minimal-cluster/expected-output/Management/ApplyStatus/cluster-scoped-resources/operator.openshift.io/authentications/4dff-body-cluster.yaml

@@ -6,8 +6,8 @@ status:
   conditions:
   - lastTransitionTime: "2024-10-14T22:38:20Z"
     message: |-
-      endpoints/host-etcd-2 in the openshift-etcd namespace: not found
       configmap openshift-etcd/etcd-endpoints not found, and fallback observer failed
+      endpoints/host-etcd-2 in the openshift-etcd namespace: not found
       oauth.config.openshift.io "cluster" not found
     reason: Error
     status: "True"

test-data/apply-configuration/overall/minimal-cluster/expected-output/Management/UpdateStatus/cluster-scoped-resources/config.openshift.io/clusteroperators/0598-body-authentication.yaml

@@ -6,23 +6,23 @@ metadata:
 spec: {}
 status:
   conditions:
-  - lastTransitionTime: "2024-12-05T18:54:45Z"
+  - lastTransitionTime: "2024-10-14T22:38:20Z"
     reason: NoData
     status: Unknown
     type: Degraded
-  - lastTransitionTime: "2024-12-05T18:54:45Z"
+  - lastTransitionTime: "2024-10-14T22:38:20Z"
     reason: NoData
     status: Unknown
     type: Progressing
-  - lastTransitionTime: "2024-12-05T18:54:45Z"
+  - lastTransitionTime: "2024-10-14T22:38:20Z"
     reason: NoData
     status: Unknown
     type: Available
-  - lastTransitionTime: "2024-12-05T18:54:45Z"
+  - lastTransitionTime: "2024-10-14T22:38:20Z"
     reason: NoData
     status: Unknown
     type: Upgradeable
-  - lastTransitionTime: "2024-12-05T18:54:45Z"
+  - lastTransitionTime: "2024-10-14T22:38:20Z"
     reason: NoData
     status: Unknown
     type: EvaluationConditionsDetected

test-data/apply-configuration/overall/minimal-cluster/expected-output/controller-results.yaml

@@ -55,8 +55,8 @@ controllerResults:
 - controllerName: TODO-other-configObserver
   errors:
   - message: |-
-      endpoints/host-etcd-2 in the openshift-etcd namespace: not found
       configmap openshift-etcd/etcd-endpoints not found, and fallback observer failed
+      endpoints/host-etcd-2 in the openshift-etcd namespace: not found
       oauth.config.openshift.io "cluster" not found
   status: Failed
 - controllerName: TODO-payloadConfigController