Skip to content

Commit a9ec252

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #750 from eggfoobar/fix-integration-tests
NO-JIRA: fix: resolve some integration tests
2 parents ca163e0 + b906a10 commit a9ec252

File tree

65 files changed

+2010
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2010
-124
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ require (
66
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
77
github.com/ghodss/yaml v1.0.0
88
github.com/google/go-cmp v0.6.0
9-
github.com/openshift/api v0.0.0-20241101202457-04eb3fd119d2
9+
github.com/openshift/api v0.0.0-20241203091751-58d4ac495429
1010
github.com/openshift/build-machinery-go v0.0.0-20241126220845-0de670012c09
11-
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
12-
github.com/openshift/library-go v0.0.0-20241127135410-64d8d9e80808
11+
github.com/openshift/client-go v0.0.0-20241203091221-452dfb8fa071
12+
github.com/openshift/library-go v0.0.0-20250113163708-355465391f40
1313
github.com/openshift/multi-operator-manager v0.0.0-20241205181422-20aa3906b99d
1414
github.com/spf13/cobra v1.8.1
1515
github.com/stretchr/testify v1.9.0

‎go.sum‎

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

‎pkg/cmd/operator/cmd.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package operator
22

33
import (
44
"github.com/spf13/cobra"
5-
65
"k8s.io/utils/clock"
76

87
"github.com/openshift/cluster-authentication-operator/pkg/operator"

‎pkg/operator/replacement_starter.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"time"
88

99
kubeinformers "k8s.io/client-go/informers"
10+
"k8s.io/utils/clock"
1011

1112
kubemigratorclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset"
1213
migrationv1alpha1informer "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/informer"
@@ -51,6 +52,7 @@ type authenticationOperatorInput struct {
5152
apiregistrationv1Client apiregistrationclient.Interface
5253
migrationClient kubemigratorclient.Interface
5354
eventRecorder events.Recorder
55+
clock clock.PassiveClock
5456

5557
informerFactories []libraryapplyconfiguration.SimplifiedInformerFactory
5658
}
@@ -129,6 +131,7 @@ func CreateOperatorInputFromMOM(ctx context.Context, momInput libraryapplyconfig
129131
apiregistrationv1Client: apiregistrationv1Client,
130132
migrationClient: migrationClient,
131133
eventRecorder: eventRecorder,
134+
clock: momInput.Clock,
132135
informerFactories: []libraryapplyconfiguration.SimplifiedInformerFactory{
133136
libraryapplyconfiguration.DynamicInformerFactoryAdapter(dynamicInformers), // we don't share the dynamic informers, but we only want to start when requested
134137
},
@@ -199,6 +202,7 @@ func CreateControllerInputFromControllerContext(ctx context.Context, controllerC
199202
apiregistrationv1Client: apiregistrationv1Client,
200203
migrationClient: migrationClient,
201204
eventRecorder: eventRecorder,
205+
clock: controllerContext.Clock,
202206
informerFactories: []libraryapplyconfiguration.SimplifiedInformerFactory{
203207
libraryapplyconfiguration.DynamicInformerFactoryAdapter(dynamicInformers), // we don't share the dynamic informers, but we only want to start when requested
204208
},

‎pkg/operator/starter.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ func prepareOauthAPIServerOperator(
435435
"oauth-apiserver",
436436
authOperatorInput.authenticationOperatorClient,
437437
eventRecorder,
438+
authOperatorInput.clock,
438439
).WithWorkloadController(
439440
"OAuthAPIServerController",
440441
"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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ status:
66
conditions:
77
- lastTransitionTime: "2024-10-14T22:38:20Z"
88
message: |-
9-
endpoints/host-etcd-2 in the openshift-etcd namespace: not found
109
configmap openshift-etcd/etcd-endpoints not found, and fallback observer failed
10+
endpoints/host-etcd-2 in the openshift-etcd namespace: not found
1111
oauth.config.openshift.io "cluster" not found
1212
reason: Error
1313
status: "True"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ metadata:
66
spec: {}
77
status:
88
conditions:
9-
- lastTransitionTime: "2024-12-05T18:54:45Z"
9+
- lastTransitionTime: "2024-10-14T22:38:20Z"
1010
reason: NoData
1111
status: Unknown
1212
type: Degraded
13-
- lastTransitionTime: "2024-12-05T18:54:45Z"
13+
- lastTransitionTime: "2024-10-14T22:38:20Z"
1414
reason: NoData
1515
status: Unknown
1616
type: Progressing
17-
- lastTransitionTime: "2024-12-05T18:54:45Z"
17+
- lastTransitionTime: "2024-10-14T22:38:20Z"
1818
reason: NoData
1919
status: Unknown
2020
type: Available
21-
- lastTransitionTime: "2024-12-05T18:54:45Z"
21+
- lastTransitionTime: "2024-10-14T22:38:20Z"
2222
reason: NoData
2323
status: Unknown
2424
type: Upgradeable
25-
- lastTransitionTime: "2024-12-05T18:54:45Z"
25+
- lastTransitionTime: "2024-10-14T22:38:20Z"
2626
reason: NoData
2727
status: Unknown
2828
type: EvaluationConditionsDetected

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ controllerResults:
5555
- controllerName: TODO-other-configObserver
5656
errors:
5757
- message: |-
58-
endpoints/host-etcd-2 in the openshift-etcd namespace: not found
5958
configmap openshift-etcd/etcd-endpoints not found, and fallback observer failed
59+
endpoints/host-etcd-2 in the openshift-etcd namespace: not found
6060
oauth.config.openshift.io "cluster" not found
6161
status: Failed
6262
- controllerName: TODO-payloadConfigController

‎vendor/github.com/openshift/api/config/v1/types_cluster_version.go‎

Lines changed: 19 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1/types_infrastructure.go‎

Lines changed: 114 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)