internal/openbao/bootstrap.go

@@ -2,7 +2,6 @@ package openbao
 
 import (
 	"bytes"
-	"context"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -46,8 +45,6 @@ var decryptRecovery = func(identityPath, bundlePath string) ([]byte, error) {
 
 var openBaoStatus = getStatus
 
-var commandTimeout = time.Minute
-
 func EnsureRecoveryIdentity(identityPath string) (string, error) {
 	if _, err := os.Stat(identityPath); os.IsNotExist(err) {
 		if err := os.MkdirAll(filepath.Dir(identityPath), 0700); err != nil {
@@ -254,7 +251,7 @@ func waitForPod(kubeconfig string) error {
 
 func getStatus(kubeconfig string) (status, error) {
 	command := []string{"--kubeconfig", kubeconfig, "-n", "openbao", "exec", "openbao-0", "--", "bao", "status", "-format=json"}
-	output, err := commandOutput(nil, "kubectl", command...)
+	output, err := exec.Command("kubectl", command...).Output()
 	if err != nil && !json.Valid(output) {
 		return status{}, fmt.Errorf("get OpenBao status: %w", err)
 	}
@@ -414,27 +411,17 @@ func encryptRecovery(recipient, bundlePath string, plaintext []byte) error {
 
 var execInPod = func(kubeconfig string, input []byte, args ...string) ([]byte, error) {
 	command := append([]string{"--kubeconfig", kubeconfig, "-n", "openbao", "exec", "-i", "openbao-0", "--"}, args...)
-	return commandOutput(input, "kubectl", command...)
+	cmd := exec.Command("kubectl", command...)
+	cmd.Stdin = bytes.NewReader(input)
+	return cmd.CombinedOutput()
 }
 
 var execInUnsealController = func(kubeconfig, script string) ([]byte, error) {
 	command := []string{"--kubeconfig", kubeconfig, "-n", "openbao", "exec", "deployment/openbao-unseal", "--", "sh", "-ec", script}
-	return commandOutput(nil, "kubectl", command...)
+	return exec.Command("kubectl", command...).CombinedOutput()
 }
 
 var kubectlOutput = func(kubeconfig string, args ...string) ([]byte, error) {
 	command := append([]string{"--kubeconfig", kubeconfig}, args...)
-	return commandOutput(nil, "kubectl", command...)
+	return exec.Command("kubectl", command...).Output()
-}
-
-func commandOutput(input []byte, name string, args ...string) ([]byte, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), commandTimeout)
-	defer cancel()
-	cmd := exec.CommandContext(ctx, name, args...)
-	cmd.Stdin = bytes.NewReader(input)
-	output, err := cmd.CombinedOutput()
-	if errors.Is(ctx.Err(), context.DeadlineExceeded) {
-		return output, fmt.Errorf("%s timed out after %s", name, commandTimeout)
-	}
-	return output, err
 }