Merge pull request #762 from akostadinov/master

add secret_key_base to system sphinx
3scale · Jun 21, 2022 · 15c08ac · 15c08ac
2 parents f5477b9 + 3521548
commit 15c08ac
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 26 deletions.
diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-eval-s3.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-eval-s3.yml
@@ -3207,16 +3207,14 @@ objects:
               secretKeyRef:
                 key: URL
                 name: system-database
+          - name: SECRET_KEY_BASE
+            value: rails/32947
           - name: THINKING_SPHINX_ADDRESS
             value: 0.0.0.0
           - name: THINKING_SPHINX_CONFIGURATION_FILE
             value: db/sphinx/production.conf
           - name: THINKING_SPHINX_PID_FILE
             value: db/sphinx/searchd.pid
-          - name: DELTA_INDEX_INTERVAL
-            value: "5"
-          - name: FULL_REINDEX_INTERVAL
-            value: "60"
           - name: REDIS_URL
             valueFrom:
               secretKeyRef:

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-eval.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-eval.yml
@@ -3025,16 +3025,14 @@ objects:
               secretKeyRef:
                 key: URL
                 name: system-database
+          - name: SECRET_KEY_BASE
+            value: rails/32947
           - name: THINKING_SPHINX_ADDRESS
             value: 0.0.0.0
           - name: THINKING_SPHINX_CONFIGURATION_FILE
             value: db/sphinx/production.conf
           - name: THINKING_SPHINX_PID_FILE
             value: db/sphinx/searchd.pid
-          - name: DELTA_INDEX_INTERVAL
-            value: "5"
-          - name: FULL_REINDEX_INTERVAL
-            value: "60"
           - name: REDIS_URL
             valueFrom:
               secretKeyRef:

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-ha.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-ha.yml
@@ -2566,16 +2566,14 @@ objects:
               secretKeyRef:
                 key: URL
                 name: system-database
+          - name: SECRET_KEY_BASE
+            value: rails/32947
           - name: THINKING_SPHINX_ADDRESS
             value: 0.0.0.0
           - name: THINKING_SPHINX_CONFIGURATION_FILE
             value: db/sphinx/production.conf
           - name: THINKING_SPHINX_PID_FILE
             value: db/sphinx/searchd.pid
-          - name: DELTA_INDEX_INTERVAL
-            value: "5"
-          - name: FULL_REINDEX_INTERVAL
-            value: "60"
           - name: REDIS_URL
             valueFrom:
               secretKeyRef:

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-postgresql.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-postgresql.yml
@@ -3038,16 +3038,14 @@ objects:
               secretKeyRef:
                 key: URL
                 name: system-database
+          - name: SECRET_KEY_BASE
+            value: rails/32947
           - name: THINKING_SPHINX_ADDRESS
             value: 0.0.0.0
           - name: THINKING_SPHINX_CONFIGURATION_FILE
             value: db/sphinx/production.conf
           - name: THINKING_SPHINX_PID_FILE
             value: db/sphinx/searchd.pid
-          - name: DELTA_INDEX_INTERVAL
-            value: "5"
-          - name: FULL_REINDEX_INTERVAL
-            value: "60"
           - name: REDIS_URL
             valueFrom:
               secretKeyRef:

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-s3.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-s3.yml
@@ -3272,16 +3272,14 @@ objects:
               secretKeyRef:
                 key: URL
                 name: system-database
+          - name: SECRET_KEY_BASE
+            value: rails/32947
           - name: THINKING_SPHINX_ADDRESS
             value: 0.0.0.0
           - name: THINKING_SPHINX_CONFIGURATION_FILE
             value: db/sphinx/production.conf
           - name: THINKING_SPHINX_PID_FILE
             value: db/sphinx/searchd.pid
-          - name: DELTA_INDEX_INTERVAL
-            value: "5"
-          - name: FULL_REINDEX_INTERVAL
-            value: "60"
           - name: REDIS_URL
             valueFrom:
               secretKeyRef:

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp.yml
@@ -3090,16 +3090,14 @@ objects:
               secretKeyRef:
                 key: URL
                 name: system-database
+          - name: SECRET_KEY_BASE
+            value: rails/32947
           - name: THINKING_SPHINX_ADDRESS
             value: 0.0.0.0
           - name: THINKING_SPHINX_CONFIGURATION_FILE
             value: db/sphinx/production.conf
           - name: THINKING_SPHINX_PID_FILE
             value: db/sphinx/searchd.pid
-          - name: DELTA_INDEX_INTERVAL
-            value: "5"
-          - name: FULL_REINDEX_INTERVAL
-            value: "60"
           - name: REDIS_URL
             valueFrom:
               secretKeyRef:

diff --git a/pkg/3scale/amp/component/system.go b/pkg/3scale/amp/component/system.go
@@ -162,11 +162,10 @@ func (system *System) buildSystemSphinxEnv() []v1.EnvVar {
 	result = append(result,
 		helper.EnvVarFromConfigMap("RAILS_ENV", "system-environment", "RAILS_ENV"),
 		helper.EnvVarFromSecret("DATABASE_URL", SystemSecretSystemDatabaseSecretName, SystemSecretSystemDatabaseURLFieldName),
+		helper.EnvVarFromValue("SECRET_KEY_BASE", "rails/32947"),
 		helper.EnvVarFromValue("THINKING_SPHINX_ADDRESS", "0.0.0.0"),
 		helper.EnvVarFromValue("THINKING_SPHINX_CONFIGURATION_FILE", "db/sphinx/production.conf"),
 		helper.EnvVarFromValue("THINKING_SPHINX_PID_FILE", "db/sphinx/searchd.pid"),
-		helper.EnvVarFromValue("DELTA_INDEX_INTERVAL", "5"),
-		helper.EnvVarFromValue("FULL_REINDEX_INTERVAL", "60"),
 	)
 	result = append(result, system.SystemRedisEnvVars()...)
 	return result