Skip to content

NO-JIRA: fix: resolve some integration tests #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Jan 15, 2025
Merged

NO-JIRA: fix: resolve some integration tests #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cde38c5
bump(library-go):
eggfoobar Jan 13, 2025
b906a10
fix: updated initializations and tests
eggfoobar Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
1 change: 0 additions & 1 deletion pkg/cmd/operator/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package operator

import (
"github.com/spf13/cobra"

"k8s.io/utils/clock"

"github.com/openshift/cluster-authentication-operator/pkg/operator"
Expand Down
4 changes: 4 additions & 0 deletions pkg/operator/replacement_starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -51,6 +52,7 @@ type authenticationOperatorInput struct {
apiregistrationv1Client apiregistrationclient.Interface
migrationClient kubemigratorclient.Interface
eventRecorder events.Recorder
clock clock.PassiveClock

informerFactories []libraryapplyconfiguration.SimplifiedInformerFactory
}
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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
},
Expand Down
1 change: 1 addition & 0 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ func prepareOauthAPIServerOperator(
"oauth-apiserver",
authOperatorInput.authenticationOperatorClient,
eventRecorder,
authOperatorInput.clock,
).WithWorkloadController(
"OAuthAPIServerController",
"openshift-authentication-operator",
Expand Down
2 changes: 1 addition & 1 deletion ...tus/cluster-scoped-resources/operator.openshift.io/authentications/4dff-body-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions ...uster-scoped-resources/config.openshift.io/clusteroperators/0598-body-authentication.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...-data/apply-configuration/overall/minimal-cluster/expected-output/controller-results.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 19 additions & 2 deletions vendor/github.com/openshift/api/config/v1/types_cluster_version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

120 changes: 114 additions & 6 deletions vendor/github.com/openshift/api/config/v1/types_infrastructure.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading