Skip to content

WIP Fix flaky test #1402

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

Open
vincentdephily wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −19
Open

WIP Fix flaky test #1402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions pkg/proposal/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

configv1 "github.com/openshift/api/config/v1"
proposalv1alpha1 "github.com/openshift/lightspeed-agentic-operator/api/v1alpha1"
"k8s.io/client-go/kubernetes/scheme"

i "github.com/openshift/cluster-version-operator/pkg/internal"
)
Expand All @@ -47,6 +48,12 @@ type getCurrentVersionFunc func() string

type configMapGetterFunc func(ctx context.Context, namespace, name string, opts metav1.GetOptions) (*corev1.ConfigMap, error)

func init() {
if err := proposalv1alpha1.AddToScheme(scheme.Scheme); err != nil {
panic(err)
}
}

// NewController returns Controller to manage Proposals.
// It monitors available and conditional updates, and creates a LightspeedProposal for every target version of them.
// It expires (and replace) any previous LightspeedProposals owned by the CVO after 24h.
Expand Down
8 changes: 0 additions & 8 deletions pkg/proposal/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,11 @@ import (
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kutilerrors "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/client-go/kubernetes/scheme"

configv1 "github.com/openshift/api/config/v1"
proposalv1alpha1 "github.com/openshift/lightspeed-agentic-operator/api/v1alpha1"
)

func init() {
err := proposalv1alpha1.AddToScheme(scheme.Scheme)
if err != nil {
panic(err)
}
}

func TestController_Sync(t *testing.T) {
tests := []struct {
name string
Expand Down
11 changes: 0 additions & 11 deletions pkg/start/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
operatorinformers "github.com/openshift/client-go/operator/informers/externalversions"
"github.com/openshift/library-go/pkg/config/clusterstatus"
libgoleaderelection "github.com/openshift/library-go/pkg/config/leaderelection"
proposalv1alpha1 "github.com/openshift/lightspeed-agentic-operator/api/v1alpha1"

"github.com/openshift/cluster-version-operator/pkg/autoupdate"
"github.com/openshift/cluster-version-operator/pkg/clusterconditions"
Expand Down Expand Up @@ -615,13 +614,6 @@ type Context struct {
OperatorInformerFactory operatorinformers.SharedInformerFactory
}

func addSchemes() error {
if err := proposalv1alpha1.AddToScheme(scheme.Scheme); err != nil {
return fmt.Errorf("failed to add proposalv1alpha1 to scheme: %w", err)
}
return nil
}

// NewControllerContext initializes the default Context for the current Options. It does
// not start any background processes.
func (o *Options) NewControllerContext(
Expand All @@ -647,9 +639,6 @@ func (o *Options) NewControllerContext(
cvoKubeClient := cb.KubeClientOrDie(o.Namespace, useProtobuf)
o.PromQLTarget.KubeClient = cvoKubeClient

if err := addSchemes(); err != nil {
return nil, err
}
rtClient := cb.RuntimeControllerClientOrDie("runtime-controller-client")

cvo, err := cvo.New(
Expand Down