Merge pull request #783 from 3scale/upgrade-system-sphinx-secret-key

THREESCALE-8491 upgrade system sphinx secret key env var

Author: eguzki

pkg/3scale/amp/operator/system_reconciler.go

@@ -5,6 +5,7 @@ import (
 
 	appsv1alpha1 "github.com/3scale/3scale-operator/apis/apps/v1alpha1"
 	"github.com/3scale/3scale-operator/pkg/3scale/amp/component"
+	"github.com/3scale/3scale-operator/pkg/3scale/amp/upgrade"
 	"github.com/3scale/3scale-operator/pkg/common"
 	"github.com/3scale/3scale-operator/pkg/helper"
 	"github.com/3scale/3scale-operator/pkg/reconcilers"
@@ -118,6 +119,7 @@ func (r *SystemReconciler) Reconcile() (reconcile.Result, error) {
 		reconcilers.DeploymentConfigAffinityMutator,
 		reconcilers.DeploymentConfigTolerationsMutator,
 		reconcilers.DeploymentConfigPodTemplateLabelsMutator,
+		upgrade.SphinxSecretKeyEnvVarMutator,
 	)
 	err = r.ReconcileDeploymentConfig(system.SphinxDeploymentConfig(), sphinxDCmutator)
 	if err != nil {

pkg/3scale/amp/upgrade/sphinx-deployment-secret-key-base.go

@@ -0,0 +1,18 @@
+package upgrade
+
+import (
+	"github.com/3scale/3scale-operator/pkg/reconcilers"
+	appsv1 "github.com/openshift/api/apps/v1"
+)
+
+func SphinxSecretKeyEnvVarMutator(desired, existing *appsv1.DeploymentConfig) (bool, error) {
+	//  SECRET_KEY_BASE added
+	updated := reconcilers.DeploymentConfigEnvVarReconciler(desired, existing, "SECRET_KEY_BASE")
+	// DELTA_INDEX_INTERVAL removed
+	tmp := reconcilers.DeploymentConfigEnvVarReconciler(desired, existing, "DELTA_INDEX_INTERVAL")
+	updated = updated || tmp
+	// FULL_REINDEX_INTERVAL removed
+	tmp = reconcilers.DeploymentConfigEnvVarReconciler(desired, existing, "FULL_REINDEX_INTERVAL")
+	updated = updated || tmp
+	return updated, nil
+}