RHCLOUD-36142: Update Clowder to reconcile on changes to non-app secrets/configmaps

controllers/cloud.redhat.com/clowdenvironment_controller.go

@@ -165,6 +165,7 @@ func (r *ClowdEnvironmentReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		env:       &env,
 		log:       &log,
 		oldStatus: env.Status.DeepCopy(),
+		hashCache: r.HashCache,
 	}
 
 	result, resErr := reconciliation.Reconcile()

controllers/cloud.redhat.com/clowdenvironment_reconciliation.go

@@ -7,6 +7,7 @@ import (
 
 	crd "github.com/RedHatInsights/clowder/apis/cloud.redhat.com/v1alpha1"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/clowderconfig"
+	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/hashcache"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers"
 	rc "github.com/RedHatInsights/rhc-osdk-utils/resourceCache"
 	"github.com/go-logr/logr"
@@ -57,6 +58,7 @@ type ClowdEnvironmentReconciliation struct {
 	env       *crd.ClowdEnvironment
 	log       *logr.Logger
 	oldStatus *crd.ClowdEnvironmentStatus
+	hashCache *hashcache.HashCache
 }
 
 // Returns a list of step methods that should be run during reconciliation
@@ -128,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)
@@ -285,12 +288,15 @@ func (r *ClowdEnvironmentReconciliation) isTargetNamespaceMarkedForDeletion() (c
 }
 
 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)
 

controllers/cloud.redhat.com/handlers.go

@@ -106,7 +106,14 @@ func (e *enqueueRequestForObjectCustom) updateHashCacheForConfigMapAndSecret(obj
 	switch obj.(type) {
 	case *core.ConfigMap, *core.Secret:
 		if obj.GetAnnotations()[clowderconfig.LoadedConfig.Settings.RestarterAnnotationName] == "true" {
-			return e.hashCache.CreateOrUpdateObject(obj)
+			return e.hashCache.CreateOrUpdateObject(obj, false)
+		}
+		hcOjb, err := e.hashCache.Read(obj)
+		if err != nil {
+			return false, err
+		}
+		if hcOjb.Always {
+			return e.hashCache.CreateOrUpdateObject(obj, false)
 		}
 	}
 	return false, nil

controllers/cloud.redhat.com/hashcache/hashcache.go

@@ -32,6 +32,7 @@ type HashObject struct {
 	Hash      string
 	ClowdApps map[types.NamespacedName]bool
 	ClowdEnvs map[types.NamespacedName]bool
+	Always    bool // Secret/ConfigMap should be always updated
 }
 
 type HashCache struct {
@@ -46,11 +47,12 @@ func NewHashCache() HashCache {
 	}
 }
 
-func NewHashObject(hash string) HashObject {
+func NewHashObject(hash string, always bool) HashObject {
 	return HashObject{
 		Hash:      hash,
 		ClowdApps: map[types.NamespacedName]bool{},
 		ClowdEnvs: map[types.NamespacedName]bool{},
+		Always:    always,
 	}
 }
 
@@ -101,7 +103,9 @@ func (hc *HashCache) RemoveClowdObjectFromObjects(obj client.Object) {
 	}
 }
 
-func (hc *HashCache) CreateOrUpdateObject(obj client.Object) (bool, error) {
+// CreatesOrUpdates HashObject and adding attribute alwaysUpdate.
+// This function returns a boolean indicating whether the hashCache should be updated.
+func (hc *HashCache) CreateOrUpdateObject(obj client.Object, alwaysUpdate bool) (bool, error) {
 	hc.lock.Lock()
 	defer hc.lock.Unlock()
 
@@ -129,7 +133,7 @@ func (hc *HashCache) CreateOrUpdateObject(obj client.Object) (bool, error) {
 	hashObject, ok := hc.data[id]
 
 	if !ok {
-		hashObj := NewHashObject(hash)
+		hashObj := NewHashObject(hash, alwaysUpdate)
 		hc.data[id] = &hashObj
 		return true, nil
 	}
@@ -177,11 +181,6 @@ func (hc *HashCache) GetSuperHashForClowdObject(clowdObj object.ClowdObject) str
 }
 
 func (hc *HashCache) AddClowdObjectToObject(clowdObj object.ClowdObject, obj client.Object) error {
-
-	if obj.GetAnnotations()[clowderconfig.LoadedConfig.Settings.RestarterAnnotationName] != "true" {
-		return nil
-	}
-
 	var oType string
 
 	switch obj.(type) {
@@ -198,6 +197,10 @@ func (hc *HashCache) AddClowdObjectToObject(clowdObj object.ClowdObject, obj cli
 	if !ok {
 		return ItemNotFoundError{item: fmt.Sprintf("%s/%s", id.NN.Name, id.NN.Namespace)}
 	}
+	if obj.GetAnnotations()[clowderconfig.LoadedConfig.Settings.RestarterAnnotationName] != "true" && !hc.data[id].Always {
+		return nil
+	}
+
 	hc.lock.Lock()
 	defer hc.lock.Unlock()
 

controllers/cloud.redhat.com/hashcache/hashcache_test.go

@@ -21,7 +21,7 @@ func TestHashCacheAddItemAndRetrieve(t *testing.T) {
 	}
 
 	hc := NewHashCache()
-	update, err := hc.CreateOrUpdateObject(sec)
+	update, err := hc.CreateOrUpdateObject(sec, false)
 	assert.NoError(t, err)
 	assert.True(t, update)
 	obj, err := hc.Read(sec)
@@ -39,7 +39,7 @@ func TestHashCacheDeleteItem(t *testing.T) {
 	}
 
 	hc := NewHashCache()
-	shouldUpdate, err := hc.CreateOrUpdateObject(sec)
+	shouldUpdate, err := hc.CreateOrUpdateObject(sec, false)
 	assert.True(t, shouldUpdate)
 	assert.NoError(t, err)
 	obj, err := hc.Read(sec)
@@ -63,7 +63,7 @@ func TestHashCacheUpdateItem(t *testing.T) {
 	}
 
 	hc := NewHashCache()
-	_, err := hc.CreateOrUpdateObject(sec)
+	_, err := hc.CreateOrUpdateObject(sec, false)
 	assert.NoError(t, err)
 
 	obj, err := hc.Read(sec)
@@ -75,7 +75,7 @@ func TestHashCacheUpdateItem(t *testing.T) {
 		"test2": []byte("test2"),
 	}
 
-	update, err := hc.CreateOrUpdateObject(sec)
+	update, err := hc.CreateOrUpdateObject(sec, false)
 	assert.NoError(t, err)
 	assert.True(t, update)
 	obj, err = hc.Read(sec)
@@ -120,7 +120,7 @@ func TestHashCacheAddClowdObj(t *testing.T) {
 	}
 
 	hc := NewHashCache()
-	_, err := hc.CreateOrUpdateObject(sec)
+	_, err := hc.CreateOrUpdateObject(sec, false)
 	assert.NoError(t, err)
 
 	err = hc.AddClowdObjectToObject(capp, sec)
@@ -152,7 +152,7 @@ func TestHashCacheDeleteClowdObj(t *testing.T) {
 	}
 
 	hc := NewHashCache()
-	_, err := hc.CreateOrUpdateObject(sec)
+	_, err := hc.CreateOrUpdateObject(sec, false)
 	assert.NoError(t, err)
 
 	err = hc.AddClowdObjectToObject(capp, sec)
@@ -196,15 +196,15 @@ func TestHashCacheSuperCache(t *testing.T) {
 	}
 
 	hc := NewHashCache()
-	_, err := hc.CreateOrUpdateObject(sec)
+	_, err := hc.CreateOrUpdateObject(sec, false)
 	assert.NoError(t, err)
 	err = hc.AddClowdObjectToObject(capp, sec)
 	assert.NoError(t, err)
 	obj, err := hc.Read(sec)
 	assert.NoError(t, err)
 	assert.Contains(t, obj.ClowdApps, clowdObjNamespaceName)
 
-	_, err = hc.CreateOrUpdateObject(sec2)
+	_, err = hc.CreateOrUpdateObject(sec2, false)
 	assert.NoError(t, err)
 	err = hc.AddClowdObjectToObject(capp, sec2)
 	assert.NoError(t, err)

controllers/cloud.redhat.com/providers/confighash/config.go

@@ -36,6 +36,11 @@ func (ch *confighashProvider) envConfigMap(app *crd.ClowdApp, env core.EnvVar) e
 		}
 		return fmt.Errorf("could not get env configmap: %w", err)
 	}
+	_, err := ch.HashCache.CreateOrUpdateObject(cf, false)
+	if err != nil {
+		return nil
+	}
+
 	return ch.HashCache.AddClowdObjectToObject(app, cf)
 }
 
@@ -60,6 +65,10 @@ func (ch *confighashProvider) envSecret(app *crd.ClowdApp, env core.EnvVar) erro
 		}
 		return fmt.Errorf("could not get env secret: %w", err)
 	}
+	_, err := ch.HashCache.CreateOrUpdateObject(sec, false)
+	if err != nil {
+		return nil
+	}
 	return ch.HashCache.AddClowdObjectToObject(app, sec)
 }
 
@@ -81,6 +90,10 @@ func (ch *confighashProvider) volConfigMap(app *crd.ClowdApp, volume core.Volume
 		}
 		return fmt.Errorf("could not get vol configmap: %w", err)
 	}
+	_, err := ch.HashCache.CreateOrUpdateObject(cf, false)
+	if err != nil {
+		return nil
+	}
 	return ch.HashCache.AddClowdObjectToObject(app, cf)
 }
 
@@ -102,6 +115,10 @@ func (ch *confighashProvider) volSecret(app *crd.ClowdApp, volume core.Volume) e
 		}
 		return fmt.Errorf("could not get vol secret: %w", err)
 	}
+	_, err := ch.HashCache.CreateOrUpdateObject(sec, false)
+	if err != nil {
+		return nil
+	}
 	return ch.HashCache.AddClowdObjectToObject(app, sec)
 }
 

controllers/cloud.redhat.com/providers/featureflags/appinterface.go

@@ -45,6 +45,14 @@ func (ff *appInterfaceFeatureFlagProvider) Provide(_ *crd.ClowdApp) error {
 		return err
 	}
 
+	if _, err := ff.HashCache.CreateOrUpdateObject(sec, true); err != nil {
+		return err
+	}
+
+	if err := ff.HashCache.AddClowdObjectToObject(ff.Env, sec); err != nil {
+		return err
+	}
+
 	accessToken, ok := sec.Data["CLIENT_ACCESS_TOKEN"]
 	if !ok {
 		return errors.NewClowderError("Missing data")

controllers/cloud.redhat.com/providers/kafka/appinterface.go

@@ -51,6 +51,15 @@ func (a *appInterface) setKafkaCA(broker *config.BrokerConfig) error {
 			return err
 		}
 
+		_, err := a.HashCache.CreateOrUpdateObject(&kafkaCASecret, true)
+		if err != nil {
+			return err
+		}
+
+		if err = a.HashCache.AddClowdObjectToObject(a.Env, &kafkaCASecret); err != nil {
+			return err
+		}
+
 		broker.Cacert = utils.StringPtr(string(kafkaCASecret.Data["ca.crt"]))
 		broker.Port = utils.IntPtr(9093)
 		broker.SecurityProtocol = utils.StringPtr("SSL")

controllers/cloud.redhat.com/providers/kafka/managed.go

@@ -154,6 +154,15 @@ func (k *managedKafkaProvider) getSecret() (*core.Secret, error) {
 		return nil, err
 	}
 
+	_, err = k.HashCache.CreateOrUpdateObject(secret, true)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = k.HashCache.AddClowdObjectToObject(k.Env, secret); err != nil {
+		return nil, err
+	}
+
 	return secret, nil
 }
 

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

controllers/cloud.redhat.com/providers/kafka/strimzi.go

@@ -89,6 +89,15 @@ func (s *strimziProvider) Provide(app *crd.ClowdApp) error {
 		return err
 	}
 
+	_, err := s.HashCache.CreateOrUpdateObject(&kafkaCASecret, true)
+	if err != nil {
+		return err
+	}
+
+	if err = s.HashCache.AddClowdObjectToObject(s.Env, &kafkaCASecret); err != nil {
+		return err
+	}
+
 	kafkaCACert := string(kafkaCASecret.Data["ca.crt"])
 
 	s.Config.Kafka = &config.KafkaConfig{}
@@ -805,6 +814,15 @@ func (s *strimziProvider) setBrokerCredentials(app *crd.ClowdApp, configs *confi
 				return err
 			}
 
+			_, err = s.HashCache.CreateOrUpdateObject(kafkaSecret, true)
+			if err != nil {
+				return err
+			}
+
+			if err = s.HashCache.AddClowdObjectToObject(s.Env, kafkaSecret); err != nil {
+				return err
+			}
+
 			if kafkaSecret.Data["password"] == nil {
 				return errors.NewClowderError("no password in kafkauser secret")
 			}

controllers/cloud.redhat.com/providers/logging/appinterface.go

@@ -42,6 +42,14 @@ func setCloudwatchSecret(ns string, p *providers.Provider, c *config.LoggingConf
 		return errors.Wrap("Failed to fetch cloudwatch secret", err)
 	}
 
+	if _, err := p.HashCache.CreateOrUpdateObject(&secret, true); err != nil {
+		return err
+	}
+
+	if err := p.HashCache.AddClowdObjectToObject(p.Env, &secret); err != nil {
+		return err
+	}
+
 	c.Cloudwatch = &config.CloudWatchConfig{
 		AccessKeyId:     string(secret.Data["aws_access_key_id"]),
 		SecretAccessKey: string(secret.Data["aws_secret_access_key"]),

tests/kuttl/test-clowdapp-watcher-ff-app-interface/00-install.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-clowdapp-watcher-ff-app-interface
+spec:
+  finalizers:
+  - kubernetes
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: test-clowdapp-watcher-ff-app-interface-ff-location
+spec:
+  finalizers:
+  - kubernetes