add kafka msk to the hash cache at the start of reconciliation

RedHatInsights · Feb 7, 2025 · ae123ab · ae123ab
1 parent cd74d7e
commit ae123ab
Show file tree

Hide file tree

Showing 19 changed files with 1,086 additions and 10 deletions.
diff --git a/controllers/cloud.redhat.com/clowdenvironment_reconciliation.go b/controllers/cloud.redhat.com/clowdenvironment_reconciliation.go
@@ -130,11 +130,12 @@ func (r *ClowdEnvironmentReconciliation) markedForDeletion() (ctrl.Result, error
 func (r *ClowdEnvironmentReconciliation) finalizeEnvironmentImplementation() error {
 
 	provider := providers.Provider{
-		Ctx:    r.ctx,
-		Client: r.client,
-		Env:    r.env,
-		Cache:  r.cache,
-		Log:    *r.log,
+		Ctx:       r.ctx,
+		Client:    r.client,
+		Env:       r.env,
+		Cache:     r.cache,
+		Log:       *r.log,
+		HashCache: r.hashCache,
 	}
 
 	err := runProvidersForEnvFinalize(*r.log, provider)
@@ -290,11 +291,12 @@ func (r *ClowdEnvironmentReconciliation) runProviders() (ctrl.Result, error) {
 	r.hashCache.RemoveClowdObjectFromObjects(r.env)
 
 	provider := providers.Provider{
-		Ctx:    r.ctx,
-		Client: r.client,
-		Env:    r.env,
-		Cache:  r.cache,
-		Log:    *r.log,
+		Ctx:       r.ctx,
+		Client:    r.client,
+		Env:       r.env,
+		Cache:     r.cache,
+		Log:       *r.log,
+		HashCache: r.hashCache,
 	}
 	provErr := runProvidersForEnv(*r.log, provider)
 

diff --git a/controllers/cloud.redhat.com/providers/kafka/msk.go b/controllers/cloud.redhat.com/providers/kafka/msk.go
@@ -242,6 +242,14 @@ func (s *mskProvider) configureListeners() error {
 		return err
 	}
 
+	if _, err := s.HashCache.CreateOrUpdateObject(secret, true); err != nil {
+		return err
+	}
+
+	if err := s.HashCache.AddClowdObjectToObject(s.Env, secret); err != nil {
+		return err
+	}
+
 	brokers, err = getBrokerConfig(secret)
 	if err != nil {
 		return err

diff --git a/tests/kuttl/test-clowdapp-watcher-kafka-msk/00-install.yaml b/tests/kuttl/test-clowdapp-watcher-kafka-msk/00-install.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-clowdapp-watcher-kafka-msk
+spec:
+  finalizers:
+  - kubernetes
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-clowdapp-watcher-kafka-msk-sec-source
+spec:
+  finalizers:
+  - kubernetes
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-clowdapp-watcher-kafka-msk-env
+spec:
+  finalizers:
+  - kubernetes
diff --git a/tests/kuttl/test-clowdapp-watcher-kafka-msk/01-assert.yaml b/tests/kuttl/test-clowdapp-watcher-kafka-msk/01-assert.yaml
@@ -0,0 +1,26 @@
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: Kafka
+metadata:
+  name: test-clowdapp-watcher-kafka-msk
+  namespace: test-clowdapp-watcher-kafka-msk
+status:
+  conditions:
+  - reason: ZooKeeperStorage
+    status: "True"
+    type: Warning
+  - reason: KafkaStorage
+    status: "True"
+    type: Warning
+  - status: "True"
+    type: Ready
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaUser
+metadata:
+  labels:
+    strimzi.io/cluster: test-clowdapp-watcher-kafka-msk
+  name: test-clowdapp-watcher-kafka-msk-connect
+  namespace: test-clowdapp-watcher-kafka-msk
+status:
+  username: test-clowdapp-watcher-kafka-msk-connect