DONOTMERGE: additional debugging

Signed-off-by: timflannagan <[email protected]>

Author: timflannagan

pkg/controller/operators/adoption_controller.go

@@ -281,6 +281,8 @@ func (r *AdoptionReconciler) adopt(ctx context.Context, operator *decorators.Ope
 	}
 	candidate := cObj.DeepCopyObject()
 
+	r.log.Info("adopt - attempting to adopt component", "gvk", cObj.GetObjectKind(), "name", cObj.GetName(), "namespace", cObj.GetNamespace())
+
 	adopted, err := operator.AdoptComponent(candidate)
 	if err != nil {
 		return err
@@ -292,6 +294,8 @@ func (r *AdoptionReconciler) adopt(ctx context.Context, operator *decorators.Ope
 		if !ok {
 			return fmt.Errorf("Unable to typecast runtime.Object to client.Object")
 		}
+		r.log.Info("adopt - successfully adopted component (pre-patch)", "gvk", cObj.GetObjectKind(), "name", cObj.GetName(), "namespace", cObj.GetNamespace())
+
 		return r.Patch(ctx, pCObj, client.MergeFrom(cObj))
 	}
 

test/e2e/ctx/ctx.go

@@ -129,27 +129,29 @@ func (ctx TestContext) DumpNamespaceArtifacts(namespace string) error {
 }
 
 func (ctx TestContext) DescribeResource(command string) error {
+	ctx.Logf("Running command %s", command)
 	stdout, stderr, err := ctx.ExecCommand(command)
 	if err != nil {
-		ctx.Logf("failed to describe resource: %v", stderr.String())
-		return err
+		return fmt.Errorf("failed to run command: %s", strings.TrimSpace(stderr+err.Error()))
 	}
-	ctx.Logf("%s", stdout.String())
+	ctx.Logf("%s", strings.TrimSpace(stdout))
 	return nil
 }
 
-func (ctx TestContext) ExecCommand(command string) (bytes.Buffer, bytes.Buffer, error) {
+func (ctx TestContext) ExecCommand(command string) (string, string, error) {
 	var (
 		stdoutBuf bytes.Buffer
 		stderrBuf bytes.Buffer
 	)
 	cmd := exec.Command("bash", "-c", command)
 	cmd.Stdout = &stdoutBuf
 	cmd.Stderr = &stderrBuf
+	cmd.Env = []string{"KUBECONFIG=" + ctx.kubeconfigPath}
+
 	if err := cmd.Run(); err != nil {
-		return bytes.Buffer{}, bytes.Buffer{}, err
+		return stdoutBuf.String(), stderrBuf.String(), err
 	}
-	return stdoutBuf, stderrBuf, nil
+	return stdoutBuf.String(), stderrBuf.String(), nil
 }
 
 func setDerivedFields(ctx *TestContext) error {