[envtest]Use the common UpdateSecret helper

gibizer · Sep 22, 2023 · 1a8ed26 · 1a8ed26
1 parent 4a535c8
commit 1a8ed26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/test/functional/base_test.go b/test/functional/base_test.go
@@ -643,15 +643,6 @@ func GetDefaultNovaNoVNCProxySpec(cell CellNames) map[string]interface{} {
 	}
 }
 
-func UpdateSecret(secretName types.NamespacedName, key string, newValue []byte) {
-	Eventually(func(g Gomega) {
-		secret := th.GetSecret(secretName)
-		secret.Data[key] = newValue
-		g.Expect(k8sClient.Update(ctx, &secret)).Should(Succeed())
-	}, timeout, interval).Should(Succeed())
-	logger.Info("Secret updated", "secret", secretName, "key", key)
-}
-
 func CreateCellInternalSecret(cell CellNames) *corev1.Secret {
 	return th.CreateSecret(
 		cell.InternalCellSecretName,

diff --git a/test/functional/nova_reconfiguration_test.go b/test/functional/nova_reconfiguration_test.go
@@ -438,7 +438,7 @@ var _ = Describe("Nova reconfiguration", func() {
 	When("the service password in the osp secret is changed", func() {
 		It("reconfigures every nova service", func() {
 			secretName := types.NamespacedName{Namespace: novaNames.NovaName.Namespace, Name: SecretName}
-			UpdateSecret(secretName, "NovaPassword", []byte("new-service-password"))
+			th.UpdateSecret(secretName, "NovaPassword", []byte("new-service-password"))
 
 			// Expect that every service config is updated with the new service password
 			for _, cmName := range []types.NamespacedName{
@@ -486,7 +486,7 @@ var _ = Describe("Nova reconfiguration", func() {
 			}
 
 			secretName := types.NamespacedName{Namespace: novaNames.NovaName.Namespace, Name: SecretName}
-			UpdateSecret(secretName, "NovaPassword", []byte("new-service-password"))
+			th.UpdateSecret(secretName, "NovaPassword", []byte("new-service-password"))
 
 			// Assert that the config hash is updated in each stateful set
 			for i, ss := range ssNames {
@@ -576,7 +576,7 @@ var _ = Describe("Nova reconfiguration", func() {
 		Expect(originalComputeHash).NotTo(BeEmpty())
 
 		secretName := types.NamespacedName{Namespace: novaNames.NovaName.Namespace, Name: SecretName}
-		UpdateSecret(secretName, "MetadataSecret", []byte("new-metadata-secret"))
+		th.UpdateSecret(secretName, "MetadataSecret", []byte("new-metadata-secret"))
 
 		Eventually(func(g Gomega) {
 			configDataMap := th.GetSecret(novaNames.MetadataConfigDataName)