[RHCLOUD-20340] Config/Secret restarter (#776)

* Secret/Config restarter
RedHatInsights · Mar 3, 2023 · 97d1820 · 97d1820
1 parent 1c06352
commit 97d1820
Show file tree

Hide file tree

Showing 33 changed files with 1,294 additions and 49 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -12,3 +12,18 @@ issues:
         - goimports
   exclude:
     - "G108: Profiling endpoint is automatically"
+linters:
+  enable:
+    - errcheck
+    - gocritic
+    - gofmt
+    - goimports
+    - gosec
+    - gosimple
+    - govet
+    - ineffassign
+    - revive
+    - staticcheck
+    - typecheck
+    - unused
+    - bodyclose
diff --git a/controllers/cloud.redhat.com/clowdapp_controller.go b/controllers/cloud.redhat.com/clowdapp_controller.go
@@ -40,6 +40,7 @@ import (
 
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/clowderconfig"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/config"
+	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/hashcache"
 
 	// These imports are to register the providers with the provider registration system
 	_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/autoscaler"
@@ -120,9 +121,10 @@ func (rm *ReconciliationMetrics) stop() {
 // ClowdAppReconciler reconciles a ClowdApp object
 type ClowdAppReconciler struct {
 	client.Client
-	Log      logr.Logger
-	Scheme   *runtime.Scheme
-	Recorder record.EventRecorder
+	Log       logr.Logger
+	Scheme    *runtime.Scheme
+	Recorder  record.EventRecorder
+	HashCache *hashcache.HashCache
 }
 
 // Reconcile fn
@@ -139,13 +141,14 @@ func (r *ClowdAppReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 	log.Info("Reconciliation started")
 
 	reconciliation := ClowdAppReconciliation{
-		ctx:      ctx,
-		client:   r.Client,
-		recorder: r.Recorder,
-		app:      &app,
-		log:      &log,
-		req:      &req,
-		config:   &config.AppConfig{},
+		ctx:       ctx,
+		client:    r.Client,
+		recorder:  r.Recorder,
+		app:       &app,
+		log:       &log,
+		req:       &req,
+		config:    &config.AppConfig{},
+		hashCache: r.HashCache,
 	}
 	res, err := reconciliation.Reconcile()
 	if err != nil {
@@ -161,7 +164,7 @@ func (r *ClowdAppReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 }
 
 // SetupWithManager sets up with Manager
-func (r *ClowdAppReconciler) SetupWithManager(mgr ctrl.Manager) error {
+func (r *ClowdAppReconciler) SetupWithManager(mgr ctrl.Manager, hashCache *hashcache.HashCache) error {
 	r.Log.Info("Setting up manager")
 	utils.Log = r.Log.WithValues("name", "util")
 	r.Recorder = mgr.GetEventRecorderFor("app")
@@ -181,10 +184,10 @@ func (r *ClowdAppReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		handler.EnqueueRequestsFromMapFunc(r.appsToEnqueueUponEnvUpdate),
 		builder.WithPredicates(environmentPredicate(r.Log, "app")),
 	)
-	ctrlr.Watches(&source.Kind{Type: &apps.Deployment{}}, createNewHandler(deploymentFilter, r.Log, "app", &crd.ClowdApp{}))
-	ctrlr.Watches(&source.Kind{Type: &core.Service{}}, createNewHandler(generationOnlyFilter, r.Log, "app", &crd.ClowdApp{}))
-	ctrlr.Watches(&source.Kind{Type: &core.ConfigMap{}}, createNewHandler(generationOnlyFilter, r.Log, "app", &crd.ClowdApp{}))
-	ctrlr.Watches(&source.Kind{Type: &core.Secret{}}, createNewHandler(alwaysFilter, r.Log, "app", &crd.ClowdApp{}))
+	ctrlr.Watches(&source.Kind{Type: &apps.Deployment{}}, createNewHandler(deploymentFilter, r.Log, "app", &crd.ClowdApp{}, r.HashCache))
+	ctrlr.Watches(&source.Kind{Type: &core.Service{}}, createNewHandler(generationOnlyFilter, r.Log, "app", &crd.ClowdApp{}, r.HashCache))
+	ctrlr.Watches(&source.Kind{Type: &core.ConfigMap{}}, createNewHandler(generationOnlyFilter, r.Log, "app", &crd.ClowdApp{}, r.HashCache))
+	ctrlr.Watches(&source.Kind{Type: &core.Secret{}}, createNewHandler(alwaysFilter, r.Log, "app", &crd.ClowdApp{}, r.HashCache))
 	ctrlr.WithOptions(controller.Options{
 		RateLimiter: workqueue.NewItemExponentialFailureRateLimiter(time.Duration(500*time.Millisecond), time.Duration(60*time.Second)),
 	})

diff --git a/controllers/cloud.redhat.com/clowdapp_reconciliation.go b/controllers/cloud.redhat.com/clowdapp_reconciliation.go
@@ -9,6 +9,7 @@ import (
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/clowderconfig"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/config"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/errors"
+	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/hashcache"
 	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers"
 	provutils "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/utils"
 	rc "github.com/RedHatInsights/rhc-osdk-utils/resourceCache"
@@ -35,6 +36,7 @@ type ClowdAppReconciliation struct {
 	reconciliationMetrics ReconciliationMetrics
 	config                *config.AppConfig
 	oldStatus             *crd.ClowdAppStatus
+	hashCache             *hashcache.HashCache
 }
 
 func (r *ClowdAppReconciliation) steps() []func() (ctrl.Result, error) {
@@ -255,13 +257,17 @@ func (r *ClowdAppReconciliation) createCache() (ctrl.Result, error) {
 }
 
 func (r *ClowdAppReconciliation) runProviders() (ctrl.Result, error) {
+
+	r.hashCache.RemoveClowdObjectFromObjects(r.app)
+
 	provider := providers.Provider{
-		Client: r.client,
-		Ctx:    r.ctx,
-		Env:    r.env,
-		Cache:  r.cache,
-		Log:    *r.log,
-		Config: r.config,
+		Client:    r.client,
+		Ctx:       r.ctx,
+		Env:       r.env,
+		Cache:     r.cache,
+		Log:       *r.log,
+		Config:    r.config,
+		HashCache: r.hashCache,
 	}
 
 	if provErr := r.runProvidersImplementation(&provider); provErr != nil {

diff --git a/controllers/cloud.redhat.com/clowdenvironment_controller.go b/controllers/cloud.redhat.com/clowdenvironment_controller.go
@@ -39,6 +39,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	// Import the providers to initialize them
+	"github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/hashcache"
+
+	// These blank imports make the providers go wheeeeee
 	_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/confighash"
 	_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/cronjob"
 	_ "github.com/RedHatInsights/clowder/controllers/cloud.redhat.com/providers/database"
@@ -82,9 +85,10 @@ const (
 // ClowdEnvironmentReconciler reconciles a ClowdEnvironment object
 type ClowdEnvironmentReconciler struct {
 	client.Client
-	Log      logr.Logger
-	Scheme   *runtime.Scheme
-	Recorder record.EventRecorder
+	Log       logr.Logger
+	Scheme    *runtime.Scheme
+	Recorder  record.EventRecorder
+	HashCache *hashcache.HashCache
 }
 
 // +kubebuilder:rbac:groups=cloud.redhat.com,resources=clowdenvironments,verbs=get;list;watch;create;update;patch;delete
@@ -212,25 +216,25 @@ func runProvidersForEnvFinalize(log logr.Logger, provider providers.Provider) er
 }
 
 // SetupWithManager sets up with manager
-func (r *ClowdEnvironmentReconciler) SetupWithManager(mgr ctrl.Manager) error {
+func (r *ClowdEnvironmentReconciler) SetupWithManager(mgr ctrl.Manager, hashCache *hashcache.HashCache) error {
 	r.Recorder = mgr.GetEventRecorderFor("env")
 
 	ctrlr := ctrl.NewControllerManagedBy(mgr).For(&crd.ClowdEnvironment{})
 
-	ctrlr.Watches(&source.Kind{Type: &apps.Deployment{}}, createNewHandler(deploymentFilter, r.Log, "env", &crd.ClowdEnvironment{}))
-	ctrlr.Watches(&source.Kind{Type: &core.Service{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}))
-	ctrlr.Watches(&source.Kind{Type: &core.Secret{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}))
+	ctrlr.Watches(&source.Kind{Type: &apps.Deployment{}}, createNewHandler(deploymentFilter, r.Log, "env", &crd.ClowdEnvironment{}, r.HashCache))
+	ctrlr.Watches(&source.Kind{Type: &core.Service{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}, r.HashCache))
+	ctrlr.Watches(&source.Kind{Type: &core.Secret{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}, r.HashCache))
 	ctrlr.Watches(
 		&source.Kind{Type: &crd.ClowdApp{}},
 		handler.EnqueueRequestsFromMapFunc(r.envToEnqueueUponAppUpdate),
 		builder.WithPredicates(predicate.GenerationChangedPredicate{}),
 	)
 
 	if clowderconfig.LoadedConfig.Features.WatchStrimziResources {
-		ctrlr.Watches(&source.Kind{Type: &strimzi.Kafka{}}, createNewHandler(kafkaFilter, r.Log, "env", &crd.ClowdEnvironment{}))
-		ctrlr.Watches(&source.Kind{Type: &strimzi.KafkaConnect{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}))
-		ctrlr.Watches(&source.Kind{Type: &strimzi.KafkaUser{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}))
-		ctrlr.Watches(&source.Kind{Type: &strimzi.KafkaTopic{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}))
+		ctrlr.Watches(&source.Kind{Type: &strimzi.Kafka{}}, createNewHandler(kafkaFilter, r.Log, "env", &crd.ClowdEnvironment{}, r.HashCache))
+		ctrlr.Watches(&source.Kind{Type: &strimzi.KafkaConnect{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}, r.HashCache))
+		ctrlr.Watches(&source.Kind{Type: &strimzi.KafkaUser{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}, r.HashCache))
+		ctrlr.Watches(&source.Kind{Type: &strimzi.KafkaTopic{}}, createNewHandler(alwaysFilter, r.Log, "env", &crd.ClowdEnvironment{}, r.HashCache))
 	}
 
 	ctrlr.WithOptions(controller.Options{

diff --git a/controllers/cloud.redhat.com/clowderconfig/config.go b/controllers/cloud.redhat.com/clowderconfig/config.go
@@ -17,7 +17,7 @@ type ClowderConfig struct {
 	DebugOptions struct {
 		Logging struct {
 			DebugLogging bool `json:"debugLogging"`
-		}
+		} `json:"logging"`
 		Trigger struct {
 			Diff bool `json:"diff"`
 		} `json:"trigger"`
@@ -46,6 +46,7 @@ type ClowderConfig struct {
 	} `json:"features"`
 	Settings struct {
 		ManagedKafkaEphemDeleteRegex string `json:"managedKafkaEphemDeleteRegex"`
+		RestarterAnnotationName      string `json:"restarterAnnotation"`
 	} `json:"settings"`
 }
 
@@ -73,6 +74,10 @@ func getConfig() ClowderConfig {
 		return ClowderConfig{}
 	}
 
+	if clowderConfig.Settings.RestarterAnnotationName == "" {
+		clowderConfig.Settings.RestarterAnnotationName = "qontract.recycle"
+	}
+
 	return clowderConfig
 }
 

diff --git a/controllers/cloud.redhat.com/config/schema.json b/controllers/cloud.redhat.com/config/schema.json
@@ -70,6 +70,10 @@
                 "BOPURL": {
                     "description": "Defines the path to the BOPURL.",
                     "type": "string"
+                },
+                "hashCache": {
+                    "description": "A set of config/secret hashes",
+                    "type": "string"
                 }
             },
             "required": [

diff --git a/controllers/cloud.redhat.com/config/types.go b/controllers/cloud.redhat.com/config/types.go