From 21e5cb2070dda57c08d7723fd531c598923ca150 Mon Sep 17 00:00:00 2001
From: Ben Ash <bash@hashicorp.com>
Date: Tue, 11 Jun 2024 22:22:08 +0000
Subject: [PATCH] Revert some bits

---
 internal/vault/client_factory.go                | 17 ++++++++---------
 test/integration/modules/vso-helm/main.tf       |  8 --------
 .../vaultdynamicsecret_integration_test.go      |  2 +-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/internal/vault/client_factory.go b/internal/vault/client_factory.go
index ae06a7ccf..366dc7f5c 100644
--- a/internal/vault/client_factory.go
+++ b/internal/vault/client_factory.go
@@ -128,15 +128,14 @@ type cachingClientFactory struct {
 	requestCounterVec      *prometheus.CounterVec
 	requestErrorCounterVec *prometheus.CounterVec
 	taintedClientGauge     *prometheus.GaugeVec
-	// objRefClientGauge     *prometheus.GaugeVec
-	revokeOnEvict         bool
-	pruneStorageOnEvict   bool
-	ctrlClient            ctrlclient.Client
-	clientCallbacks       []ClientCallbackHandler
-	callbackHandlerCh     chan *ClientCallbackHandlerRequest
-	mu                    sync.RWMutex
-	onceDoWatcher         sync.Once
-	callbackHandlerCancel context.CancelFunc
+	revokeOnEvict          bool
+	pruneStorageOnEvict    bool
+	ctrlClient             ctrlclient.Client
+	clientCallbacks        []ClientCallbackHandler
+	callbackHandlerCh      chan *ClientCallbackHandlerRequest
+	mu                     sync.RWMutex
+	onceDoWatcher          sync.Once
+	callbackHandlerCancel  context.CancelFunc
 	// clientLocksLock is a lock for the clientLocks map.
 	clientLocksLock sync.RWMutex
 	// clientLocks is a map of cache keys to locks that allow for concurrent access
diff --git a/test/integration/modules/vso-helm/main.tf b/test/integration/modules/vso-helm/main.tf
index 5caefcda1..cb3fe063d 100644
--- a/test/integration/modules/vso-helm/main.tf
+++ b/test/integration/modules/vso-helm/main.tf
@@ -57,14 +57,6 @@ resource "helm_release" "vault-secrets-operator" {
     name  = "controller.manager.image.tag"
     value = var.operator_image_tag
   }
-  set {
-    name  = "controller.manager.resources.limits.cpu"
-    value = "1000m"
-  }
-  set {
-    name  = "controller.manager.resources.limits.memory"
-    value = "512Mi"
-  }
   set {
     name  = "controller.manager.clientCache.persistenceModel"
     value = var.client_cache_config.persistence_model
diff --git a/test/integration/vaultdynamicsecret_integration_test.go b/test/integration/vaultdynamicsecret_integration_test.go
index f6e5c6ccc..ff6e41214 100644
--- a/test/integration/vaultdynamicsecret_integration_test.go
+++ b/test/integration/vaultdynamicsecret_integration_test.go
@@ -756,7 +756,7 @@ func TestVaultDynamicSecret_vaultClientCallback(t *testing.T) {
 		},
 		{
 			name:   "create-only-vault-auth-update",
-			create: 1,
+			create: 25,
 			triggerFunc: func(t *testing.T, reconciledObjs []*secretsv1beta1.VaultDynamicSecret) {
 				t.Helper()
 				for _, obj := range reconciledObjs {