diff --git a/pkg/cmd/adm/restart.go b/pkg/cmd/adm/restart.go index 7c5ddaa..a5f5271 100644 --- a/pkg/cmd/adm/restart.go +++ b/pkg/cmd/adm/restart.go @@ -92,7 +92,7 @@ func restartDeployment(ctx *clicontext.CommandContext, cl runtimeclient.Client, } if len(olmDeploymentList.Items) == 0 { - return fmt.Errorf("OLM based deployment not found in %s", ns) + fmt.Printf("OLM based deployment not found in %s", ns) } else { for _, olmDeployment := range olmDeploymentList.Items { fmt.Printf("Proceeding to delete the Pods of %v \n", olmDeployment) diff --git a/pkg/cmd/adm/restart_test.go b/pkg/cmd/adm/restart_test.go index 7f7f2a6..36a42cc 100644 --- a/pkg/cmd/adm/restart_test.go +++ b/pkg/cmd/adm/restart_test.go @@ -136,9 +136,9 @@ func TestRestart(t *testing.T) { //when err := restartDeployment(ctx, fakeClient, namespacedName.Namespace, tf, streams) if tc.labelValue == "kubesaw-controller-manager" { - require.NoError(t, err) + require.NoError(t, err, "non-OLM based deployment not found in") } else if tc.labelValue == "codeready-toolchain" { - require.Error(t, err) + require.NoError(t, err, "OLM based deployment not found in") err := restartNonOlmDeployments(*deployment1, tf, streams) require.NoError(t, err) //checking the output from kubectl diff --git a/pkg/cmd/adm/unregister_member_test.go b/pkg/cmd/adm/unregister_member_test.go index 1407919..a1dca35 100644 --- a/pkg/cmd/adm/unregister_member_test.go +++ b/pkg/cmd/adm/unregister_member_test.go @@ -15,7 +15,7 @@ func TestUnregisterMemberWhenAnswerIsY(t *testing.T) { toolchainCluster := NewToolchainCluster(ToolchainClusterName("member-cool-server.com")) hostDeploymentName := test.NamespacedName("toolchain-host-operator", "host-operator-controller-manager") deployment := newDeployment(hostDeploymentName, 1) - deployment.Labels = map[string]string{"olm.owner.namespace": "toolchain-host-operator"} + deployment.Labels = map[string]string{"kubesaw-control-plane": "kubesaw-controller-manager"} newClient, fakeClient := NewFakeClients(t, toolchainCluster, deployment) numberOfUpdateCalls := 0