toSquash: aaa

Author: hongkailiu

pkg/cvo/availableupdates_test.go

@@ -248,7 +248,7 @@ func TestSyncAvailableUpdates(t *testing.T) {
 		return nil, nil, nil
 	}, fake.NewClientBuilder().Build(), func(_ string) (*configv1.ClusterVersion, error) {
 		return &configv1.ClusterVersion{}, nil
-	}, func(name, namespace string) (*corev1.ConfigMap, error) {
+	}, func(_ context.Context, namespace, name string, _ metav1.GetOptions) (*corev1.ConfigMap, error) {
 		return &corev1.ConfigMap{}, nil
 	}, func() string {
 		return optr.release.Version
@@ -346,7 +346,7 @@ func TestSyncAvailableUpdates_ConditionalUpdateRecommendedConditions(t *testing.
 				return nil, nil, nil
 			}, fake.NewClientBuilder().Build(), func(_ string) (*configv1.ClusterVersion, error) {
 				return &configv1.ClusterVersion{}, nil
-			}, func(name, namespace string) (*corev1.ConfigMap, error) {
+			}, func(_ context.Context, namespace, name string, _ metav1.GetOptions) (*corev1.ConfigMap, error) {
 				return &corev1.ConfigMap{}, nil
 			}, func() string {
 				return optr.release.Version
@@ -791,7 +791,7 @@ func TestSyncAvailableUpdatesDesiredUpdate(t *testing.T) {
 				return nil, nil, nil
 			}, fake.NewClientBuilder().Build(), func(_ string) (*configv1.ClusterVersion, error) {
 				return &configv1.ClusterVersion{}, nil
-			}, func(name, namespace string) (*corev1.ConfigMap, error) {
+			}, func(_ context.Context, namespace, name string, _ metav1.GetOptions) (*corev1.ConfigMap, error) {
 				return &corev1.ConfigMap{}, nil
 			}, func() string {
 				return optr.release.Version

pkg/cvo/cvo.go

@@ -324,17 +324,23 @@ func New(
 
 	optr.configuration = configuration.NewClusterVersionOperatorConfiguration(operatorClient, operatorInformerFactory)
 
-	optr.proposalController = proposal.NewController(func() ([]configv1.Release, []configv1.ConditionalUpdate, error) {
-		availableUpdates := optr.getAvailableUpdates()
-		if availableUpdates == nil {
-			return nil, nil, nil
-		}
-		return availableUpdates.Updates, availableUpdates.ConditionalUpdates, nil
-	}, rtClient, cvInformer.Lister().Get, func(namespace, name string) (*corev1.ConfigMap, error) {
-		return cmConfigManagedInformer.Lister().ConfigMaps(namespace).Get(name)
-	}, func() string {
-		return optr.release.Version
-	})
+	optr.proposalController = proposal.NewController(
+		func() ([]configv1.Release, []configv1.ConditionalUpdate, error) {
+			availableUpdates := optr.getAvailableUpdates()
+			if availableUpdates == nil {
+				return nil, nil, nil
+			}
+			return availableUpdates.Updates, availableUpdates.ConditionalUpdates, nil
+		},
+		rtClient,
+		cvInformer.Lister().Get,
+		func(ctx context.Context, namespace, name string, opts metav1.GetOptions) (*corev1.ConfigMap, error) {
+			return kubeClient.CoreV1().ConfigMaps(namespace).Get(ctx, name, opts)
+		},
+		func() string {
+			return optr.release.Version
+		},
+	)
 
 	return optr, nil
 }

pkg/cvo/cvo_test.go

@@ -2764,7 +2764,7 @@ func TestOperator_availableUpdatesSync(t *testing.T) {
 				return nil, nil, nil
 			}, ctrlruntimefake.NewClientBuilder().Build(), func(_ string) (*configv1.ClusterVersion, error) {
 				return &configv1.ClusterVersion{}, nil
-			}, func(name, namespace string) (*corev1.ConfigMap, error) {
+			}, func(_ context.Context, namespace, name string, _ metav1.GetOptions) (*corev1.ConfigMap, error) {
 				return &corev1.ConfigMap{}, nil
 			}, func() string {
 				return optr.release.Version

pkg/proposal/controller.go

@@ -45,7 +45,7 @@ type cvGetterFunc func(name string) (*configv1.ClusterVersion, error)
 
 type getCurrentVersionFunc func() string
 
-type configMapGetterFunc func(namespace, name string) (*corev1.ConfigMap, error)
+type configMapGetterFunc func(ctx context.Context, namespace, name string, opts metav1.GetOptions) (*corev1.ConfigMap, error)
 
 // NewController returns Controller to manage Proposals.
 // It monitors available and conditional updates, and creates a LightspeedProposal for every target version of them.
@@ -128,7 +128,7 @@ func (c *Controller) Sync(ctx context.Context, key string) error {
 	}
 
 	var prompt string
-	promptConfigMap, err := c.configMapGetterFunc(c.config.Namespace, c.config.PromptConfigMap)
+	promptConfigMap, err := c.configMapGetterFunc(ctx, c.config.Namespace, c.config.PromptConfigMap, metav1.GetOptions{})
 	if err != nil {
 		klog.V(i.Normal).Infof("Failed to get prompt ConfigMap %s/%s: %v", c.config.Namespace, c.config.PromptConfigMap, err)
 		return fmt.Errorf("failed to get prompt ConfigMap %s/%s: %w", c.config.Namespace, c.config.PromptConfigMap, err)

pkg/proposal/controller_test.go

@@ -107,7 +107,7 @@ Update path: Recommended
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewController(tt.updatesGetterFunc, tt.client, tt.cvGetterFunc, func(name, namespace string) (*corev1.ConfigMap, error) {
+			c := NewController(tt.updatesGetterFunc, tt.client, tt.cvGetterFunc, func(_ context.Context, namespace, name string, _ metav1.GetOptions) (*corev1.ConfigMap, error) {
 				return &corev1.ConfigMap{
 					Data: map[string]string{
 						"prompt": "prompt-abc",

test/cvo/proposal.go

@@ -47,6 +47,8 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator`,
 		ctx         = context.Background()
 		needRecover bool
 		backup      configv1.ClusterVersionSpec
+
+		proposalDefaultConfig = proposal.DefaultConfig()
 	)
 
 	g.BeforeEach(func() {
@@ -113,13 +115,17 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator`,
 		needRecover = true
 
 		g.By("Checking if the namespace exists")
-		_, err = kubeClient.CoreV1().Namespaces().Get(ctx, proposal.DefaultConfig().Namespace, metav1.GetOptions{})
+		_, err = kubeClient.CoreV1().Namespaces().Get(ctx, proposalDefaultConfig.Namespace, metav1.GetOptions{})
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		g.By("Checking if the prompt ConfigMap exists")
+		_, err = kubeClient.CoreV1().ConfigMaps(proposalDefaultConfig.Namespace).Get(ctx, proposalDefaultConfig.PromptConfigMap, metav1.GetOptions{})
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		g.By("Checking if the proposal are created")
 		o.Expect(wait.PollUntilContextTimeout(ctx, 30*time.Second, 5*time.Minute, true, func(ctx context.Context) (done bool, err error) {
 			proposals := proposalv1alpha1.ProposalList{}
-			err = rtClient.List(ctx, &proposals, ctrlruntimeclient.InNamespace(proposal.DefaultConfig().Namespace),
+			err = rtClient.List(ctx, &proposals, ctrlruntimeclient.InNamespace(proposalDefaultConfig.Namespace),
 				ctrlruntimeclient.MatchingLabels(proposal.CVOProposalLabels))
 			o.Expect(err).NotTo(o.HaveOccurred())
 			if len(proposals.Items) == 0 {