Merge pull request #59 from qameta/widget_caching_parameters

Adds optional cache for Report
qameta · Jul 31, 2023 · 9ba14a3 · 9ba14a3
2 parents ec316b4 + 27ad291
commit 9ba14a3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,4 +26,4 @@ jobs:
           password: ${{ secrets.ARTIFACTORY_PASS }}
           repoName: allure-testops
           chart: charts/allure-testops
-          version: 2023.5.16
+          version: 2023.7.31
diff --git a/charts/allure-testops/Chart.yaml b/charts/allure-testops/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: allure-testops
-version: 2023.5.16
-appVersion: 4.16.4
+version: 2023.7.31
+appVersion: 4.19.0
 
 description: Allure TestOps
 

diff --git a/charts/allure-testops/templates/allure/report-statefulset.yaml b/charts/allure-testops/templates/allure/report-statefulset.yaml
@@ -181,7 +181,7 @@ spec:
               value: {{ .Values.report.uploads.storeConsumers | quote }}
             - name: ALLURE_TASKEXECUTOR_COREPOOLSIZE
               value: {{ .Values.report.taskExecutorCorePoolSize | quote }}
-{{- if .Values.report.cache }}
+{{- if .Values.report.cache.enabled }}
             - name: SPRING_REDIS_HOST
               value: "{{ template "allure-testops.redis.fullname" . }}"
             - name: SPRING_REDIS_PORT
@@ -192,25 +192,23 @@ spec:
                   name: {{ $secret_name }}
                   key: "redisPass"
             - name: ALLURE_CACHE-TTL_ENABLED
-              value: "true"
+              value: {{ .Values.report.cache.enabled | quote }}
             - name: ALLURE_CACHE-TTL_BY-DEFAULT
-              value: 1m
+              value: {{ .Values.report.cache.ttlByDefault }}
             - name: ALLURE_CACHE-TTL_WIDGETS_AUTOMATION-TREND
-              value: 1h
+              value: {{ .Values.report.cache.ttlWidgetsAutomationTrend }}
             - name: ALLURE_CACHE-TTL_WIDGETS_PROJECT-METRIC-TREND
-              value: 1h
+              value: {{ .Values.report.cache.ttlWidgetsProjectMetricTrend }}
             - name: ALLURE_CACHE-TTL_WIDGETS_LAUNCH-DURATION-HISTOGRAM
-              value: 1h
-            - name: ALLURE_CACHE-TTL_WIDGETS_LAUNCH-DURATION-HISTOGRAM
-              value: 1h
+              value: {{ .Values.report.cache.ttlWidgetsLaunchDurationHistogram }}
             - name: ALLURE_CACHE-TTL_WIDGETS_ANALYTIC-PIE-CHART
-              value: 1h
+              value: {{ .Values.report.cache.ttlWidgetsAnalyticPieChart }}
             - name: ALLURE_CACHE-TTL_WIDGETS_TR-COMPLEX-TREND
-              value: 1h
+              value: {{ .Values.report.cache.ttlWidgetsTrComplexTrend }}
             - name: ALLURE_CACHE-TTL_WIDGETS_TR-STATISTIC-TREND
-              value: 1h
+              value: {{ .Values.report.cache.ttlWidgetsTrStatisticTrend }}
             - name: ALLURE_CACHE-TTL_WIDGETS_TC-LAST-RESULT
-              value: 1h
+              value: {{ .Values.report.cache.ttlWidgetsTcLastResult }}
 {{- end}}
 {{- if or (eq .Values.postgresql.external.sslMode "require") (eq .Values.postgresql.external.sslMode "verify-ca") (eq .Values.postgresql.external.sslMode "verify-full") }}
             - name: TLS_DB_ENDPOINTS

diff --git a/charts/allure-testops/values.yaml b/charts/allure-testops/values.yaml
@@ -473,7 +473,16 @@ uaa:
 
 report:
   replicaCount: 1
-  cache: false
+  cache:
+    enabled: false
+    ttlByDefault: 1m
+    ttlWidgetsAutomationTrend: 1h
+    ttlWidgetsProjectMetricTrend: 1h
+    ttlWidgetsLaunchDurationHistogram: 1h
+    ttlWidgetsAnalyticPieChart: 1h
+    ttlWidgetsTrComplexTrend: 1h
+    ttlWidgetsTrStatisticTrend: 1h
+    ttlWidgetsTcLastResult: 1h
   image: allure-report
   maxDBConn: 10
   maxConcurrency: 5