From 002fff3dab0d5a0fccc764aa585a1385387dd018 Mon Sep 17 00:00:00 2001
From: wmdebot <121924840+wmdebot@users.noreply.github.com>
Date: Mon, 13 Nov 2023 13:31:36 +0100
Subject: [PATCH] Production: Deploy new Platform API image 8x.26.0 (#1256)

* Production: Deploy new Platform API image 8x.26.0

* chore: update charts for queryservice-updater and api

---------

Co-authored-by: Frederik Ring <frederik.ring@wikimedia.de>
---
 k8s/helmfile/env/production/api.values.yaml.gotmpl            | 4 +++-
 .../env/production/queryservice-updater.values.yaml.gotmpl    | 3 +++
 k8s/helmfile/env/staging/api.values.yaml.gotmpl               | 2 --
 .../env/staging/queryservice-updater.values.yaml.gotmpl       | 2 --
 k8s/helmfile/helmfile.yaml                                    | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/k8s/helmfile/env/production/api.values.yaml.gotmpl b/k8s/helmfile/env/production/api.values.yaml.gotmpl
index 85aa9226b..6b491a979 100644
--- a/k8s/helmfile/env/production/api.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/api.values.yaml.gotmpl
@@ -1,5 +1,5 @@
 image:
-  tag: 8x.25.7
+  tag: 8x.26.0
 
 replicaCount:
   web: 1
@@ -44,6 +44,8 @@ ingress:
   {{- end }}
 
 wbstack:
+  qsBatchMarkFailedAfter: 3
+  qsBatchPendingTimeout: 'PT300S'
   signupThrottlingRange: 'PT24H'
   signupThrottlingLimit: 20
   summaryCreationRateRanges:
diff --git a/k8s/helmfile/env/production/queryservice-updater.values.yaml.gotmpl b/k8s/helmfile/env/production/queryservice-updater.values.yaml.gotmpl
index 03f96c73f..bfb1b8388 100644
--- a/k8s/helmfile/env/production/queryservice-updater.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/queryservice-updater.values.yaml.gotmpl
@@ -3,11 +3,14 @@ replicaCount: 1
 image:
   repository: ghcr.io/wbstack/queryservice-updater
   pullPolicy: Always
+  tag: 0.3.84_3.10
 
 app:
   sleepTime: 5
   loopLimit: 100
   getBatchesEndpoint: http://api-app-backend.default.svc.cluster.local/backend/qs/getBatches
+  markDoneEndpoint: http://api-app-backend.default.svc.cluster.local/backend/qs/markDone
+  markNotDoneEndpoint: http://api-app-backend.default.svc.cluster.local/backend/qs/markNotDone
   wikibaseScheme: http
   extraJvmOpts: "-XshowSettings:vm -XX:+UseContainerSupport -XX:+ExitOnOutOfMemoryError -Xms64m -Xmx128m -XX:MetaspaceSize=20m -XX:MaxMetaspaceSize=30m"
 
diff --git a/k8s/helmfile/env/staging/api.values.yaml.gotmpl b/k8s/helmfile/env/staging/api.values.yaml.gotmpl
index e1c89bd1a..9f9a5dd23 100644
--- a/k8s/helmfile/env/staging/api.values.yaml.gotmpl
+++ b/k8s/helmfile/env/staging/api.values.yaml.gotmpl
@@ -11,8 +11,6 @@ platform:
   backendMwHost: mediawiki-139-app-backend.default.svc.cluster.local
 
 wbstack:
-  qsBatchMarkFailedAfter: 3
-  qsBatchPendingTimeout: 'PT300S'
   wikiDbProvisionVersion: mw1.39-wbs1
   wikiDbUseVersion: mw1.39-wbs1
   monitoringEmail: "wb-cloud-monitoring+staging@wikimedia.de"
diff --git a/k8s/helmfile/env/staging/queryservice-updater.values.yaml.gotmpl b/k8s/helmfile/env/staging/queryservice-updater.values.yaml.gotmpl
index 65dd7a366..dfc654128 100644
--- a/k8s/helmfile/env/staging/queryservice-updater.values.yaml.gotmpl
+++ b/k8s/helmfile/env/staging/queryservice-updater.values.yaml.gotmpl
@@ -3,5 +3,3 @@ image:
 
 app:
   extraJvmOpts: "-XshowSettings:vm -XX:+UseContainerSupport -XX:+ExitOnOutOfMemoryError -Xms15m -Xmx30m -XX:MetaspaceSize=20m -XX:MaxMetaspaceSize=30m"
-  markDoneEndpoint: http://api-app-backend.default.svc.cluster.local/backend/qs/markDone
-  markNotDoneEndpoint: http://api-app-backend.default.svc.cluster.local/backend/qs/markNotDone
diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml
index 12c1397b3..ec967591f 100644
--- a/k8s/helmfile/helmfile.yaml
+++ b/k8s/helmfile/helmfile.yaml
@@ -150,7 +150,7 @@ releases:
 
   - name: api
     chart: wbstack/api
-    version: {{ ternary "0.27.0" "0.26.1" (ne .Environment.Name "production") }}
+    version: "0.27.0"
     namespace: default
     <<: *default_release
 
@@ -187,7 +187,7 @@ releases:
   - name: queryservice-updater
     namespace: default
     chart: wbstack/queryservice-updater
-    version: {{ ternary "0.3.0" "0.2.0" (ne .Environment.Name "production") }}
+    version: "0.3.0"
     <<: *default_release
 
   - name: tool-cradle