EVEREST-838 fix incorrect namespace for GetPackageManifest

percona · Feb 14, 2024 · 0538005 · 0538005
1 parent e2186f2
commit 0538005
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/pkg/kubernetes/client/client.go b/pkg/kubernetes/client/client.go
@@ -1279,9 +1279,9 @@ func (c *Client) GetInstallPlan(ctx context.Context, namespace string, name stri
 }
 
 // DoPackageWait for the package to be available in OLM.
-func (c *Client) DoPackageWait(ctx context.Context, name string) error {
+func (c *Client) DoPackageWait(ctx context.Context, namespace, name string) error {
 	packageInstalled := func(ctx context.Context) (bool, error) {
-		_, err := c.GetPackageManifest(ctx, name)
+		_, err := c.GetPackageManifest(ctx, namespace, name)
 		if err != nil {
 			if apierrors.ReasonForError(err) == metav1.StatusReasonUnknown {
 				return false, err
@@ -1294,8 +1294,7 @@ func (c *Client) DoPackageWait(ctx context.Context, name string) error {
 }
 
 // GetPackageManifest returns a package manifest by given name.
-func (c *Client) GetPackageManifest(ctx context.Context, name string) (*packagev1.PackageManifest, error) {
-	namespace := "olm"
+func (c *Client) GetPackageManifest(ctx context.Context, namespace, name string) (*packagev1.PackageManifest, error) {
 	operatorClient, err := packageServerClient.NewForConfig(c.restConfig)
 	if err != nil {
 		return nil, errors.Join(err, errors.New("cannot create an operator client instance"))

diff --git a/pkg/kubernetes/client/kubeclient_interface.go b/pkg/kubernetes/client/kubeclient_interface.go
diff --git a/pkg/kubernetes/client/mock_kube_client_connector.go b/pkg/kubernetes/client/mock_kube_client_connector.go
diff --git a/pkg/kubernetes/kubernetes.go b/pkg/kubernetes/kubernetes.go
@@ -470,7 +470,7 @@ func (k *Kubernetes) InstallPerconaCatalog(ctx context.Context) error {
 	if err := k.client.ApplyFile(data); err != nil {
 		return errors.Join(err, errors.New("cannot apply percona catalog file"))
 	}
-	if err := k.client.DoPackageWait(ctx, "everest-operator"); err != nil {
+	if err := k.client.DoPackageWait(ctx, OLMNamespace, "everest-operator"); err != nil {
 		return errors.Join(err, errors.New("timeout waiting for package"))
 	}
 	return nil