Skip to content

Commit 00c065a

Browse files
committed
Fix previous rebase
1 parent 304000e commit 00c065a

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

test/extended/two_node/utils/apis/baremetalhost.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package apis
33

44
import (
5-
"encoding/base64"
5+
"context"
66
"fmt"
77
"regexp"
88
"strings"
@@ -12,6 +12,7 @@ import (
1212
"github.com/openshift/origin/test/extended/two_node/utils/core"
1313
exutil "github.com/openshift/origin/test/extended/util"
1414
corev1 "k8s.io/api/core/v1"
15+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1516
k8srand "k8s.io/apimachinery/pkg/util/rand"
1617
)
1718

@@ -152,6 +153,13 @@ func RestoreBMCPassword(oc *exutil.CLI, namespace, name string, originalPassword
152153
secretClient := oc.AdminKubeClient().CoreV1().Secrets(BMCSecretNamespace)
153154
secret, err := secretClient.Get(ctx, name, metav1.GetOptions{})
154155
if err != nil {
156+
return fmt.Errorf("failed to re-fetch BMC secret %s/%s: %w", namespace, name, err)
157+
}
158+
159+
updated := secret.DeepCopy()
160+
updated.Data[secretsDataPasswordKey] = originalPassword
161+
162+
if _, err := secretClient.Update(ctx, updated, metav1.UpdateOptions{}); err != nil {
155163
return fmt.Errorf("failed to restore password for %s/%s: %w", namespace, name, err)
156164
}
157165

0 commit comments

Comments
 (0)