Revert "feat(mediawiki): deploy 1.39 release to local and staging and…

… use for newly created wikis (#820)" This reverts commit 58eab52.
wmde · Mar 30, 2023 · 8d61de0 · 8d61de0
1 parent 6dec041
commit 8d61de0
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 325 deletions.
diff --git a/k8s/helmfile/env/local/api.values.yaml.gotmpl b/k8s/helmfile/env/local/api.values.yaml.gotmpl
@@ -1,15 +1,10 @@
 image:
-  tag: "8x.11.0"
+  tag: "8x.10.1"
 
 ingress:
   tls: null
 
-platform:
-  backendMwHost: mediawiki-139-app-backend.default.svc.cluster.local
-
 wbstack:
-  wikiDbProvisionVersion: mw1.39-wbs1
-  wikiDbUseVersion: mw1.39-wbs1
   maxWikisPerUser: null
   elasticSearch:
     enabledByDefault: true

diff --git a/k8s/helmfile/env/local/mediawiki-139.values.yaml.gotmpl b/k8s/helmfile/env/local/mediawiki-139.values.yaml.gotmpl
diff --git a/k8s/helmfile/env/local/platform-nginx.nginx.conf b/k8s/helmfile/env/local/platform-nginx.nginx.conf
diff --git a/k8s/helmfile/env/local/platform-nginx.values.yaml.gotmpl b/k8s/helmfile/env/local/platform-nginx.values.yaml.gotmpl
@@ -1,4 +1 @@
 replicaCount: 1
-
-serverBlock: |-
-{{ readFile "platform-nginx.nginx.conf" | indent 2 }}
diff --git a/k8s/helmfile/env/local/tool-quickstatements.values.yaml.gotmpl b/k8s/helmfile/env/local/tool-quickstatements.values.yaml.gotmpl
@@ -1,2 +1 @@
-platform:
-  mediawikiBackendHost: mediawiki-139-app-backend.default.svc.cluster.local
+# the staging service matches production, so this file is empty
diff --git a/k8s/helmfile/env/local/tool-widar.values.yaml.gotmpl b/k8s/helmfile/env/local/tool-widar.values.yaml.gotmpl
@@ -1,2 +1 @@
-platform:
-  mediawikiBackendHost: mediawiki-139-app-backend.default.svc.cluster.local
+# the local service matches production, so this file is empty
diff --git a/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl b/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl
diff --git a/k8s/helmfile/env/staging/api.values.yaml.gotmpl b/k8s/helmfile/env/staging/api.values.yaml.gotmpl
@@ -1,5 +1,5 @@
 image:
-  tag: "8x.11.0"
+  tag: "8x.10.1"
 
 ingress:
   tls:
@@ -8,11 +8,11 @@ ingress:
     secretName: wikibase-dev-tls
 
 platform:
-  backendMwHost: mediawiki-139-app-backend.default.svc.cluster.local
+  backendMwHost: mediawiki-138-app-backend.default.svc.cluster.local
 
 wbstack:
-  wikiDbProvisionVersion: mw1.39-wbs1
-  wikiDbUseVersion: mw1.39-wbs1
+  wikiDbProvisionVersion: mw1.38-wbs1
+  wikiDbUseVersion: mw1.38-wbs1
   monitoringEmail: "wb-cloud-monitoring+staging@wikimedia.de"
   elasticSearch:
     enabledByDefault: true

diff --git a/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl b/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl
diff --git a/k8s/helmfile/env/staging/platform-nginx.nginx.conf b/k8s/helmfile/env/staging/platform-nginx.nginx.conf
@@ -7,47 +7,7 @@ map_hash_bucket_size 128;
 #WHERE deleted_at IS NULL
 #LIMIT 900
 map $host $mwversion {
-        default "139-app";
-        "goathub.wikibase.dev" "138-app";
-        "deerbase.wikibase.dev" "138-app";
-        "coffeebase.wikibase.dev" "138-app";
-        "somethingwitty.wikibase.dev" "138-app";
-        "goat-136.wikibase.dev" "138-app";
-        "candy-collection.wikibase.dev" "138-app";
-        "potatobase.wikibase.dev" "138-app";
-        "potato.wikibase.dev" "138-app";
-        "asjhfkjsahdkjahs.wikibase.dev" "138-app";
-        "feddypropswiki.wikibase.dev" "138-app";
-        "addshore-alpha.wikibase.dev" "138-app";
-        "faketestdomain.hopto.org" "138-app";
-        "wikibasehost.ddns.net" "138-app";
-        "addshore-fake-cusstom-domain-wikibase.duckdns.org" "138-app";
-        "deerstack.wikibase.dev" "138-app";
-        "cacti.wikibase.dev" "138-app";
-        "rose-collection.wikibase.dev" "138-app";
-        "migratetestbase.ddns.net" "138-app";
-        "biodiversity.wikibase.dev" "138-app";
-        "toms-test-wikibase.duckdns.org" "138-app";
-        "potatowiki3.wikibase.dev" "138-app";
-        "charlie-test-1.wikibase.dev" "138-app";
-        "deerdeerdeer.wikibase.dev" "138-app";
-        "blob-wiki.wikibase.dev" "138-app";
-        "test-lm-02.wikibase.dev" "138-app";
-        "testwikibase-jan.wikibase.dev" "138-app";
-        "aflex.wikibase.dev" "138-app";
-        "bh20subset1.wikibase.dev" "138-app";
-        "biomarker.wikibase.dev" "138-app";
-        "testa.wikibase.dev" "138-app";
-        "carrotwiki.wikibase.dev" "138-app";
-        "sweetcornbase.wikibase.dev" "138-app";
-        "mywayordatway.wikibase.dev" "138-app";
-        "redbull.wikibase.dev" "138-app";
-        "asdfg.wikibase.dev" "138-app";
-        "asfasfasfasfasf.wikibase.dev" "138-app";
-        "wbdev.ledeniz.de" "138-app";
-        "dev-test-wbaas-custom-deer.duckdns.org" "138-app";
-        "andrew.wikibase.dev" "138-app";
-        "mw138test.wikibase.dev" "138-app";
+        default "138-app";
 }
 # Figure out which group of backends we might want to send the request to based on uri
 # TODO add Special:EntityData???

diff --git a/k8s/helmfile/env/staging/tool-quickstatements.values.yaml.gotmpl b/k8s/helmfile/env/staging/tool-quickstatements.values.yaml.gotmpl
@@ -1,2 +1,2 @@
 platform:
-  mediawikiBackendHost: mediawiki-139-app-backend.default.svc.cluster.local
+  mediawikiBackendHost: mediawiki-138-app-backend.default.svc.cluster.local
diff --git a/k8s/helmfile/env/staging/tool-widar.values.yaml.gotmpl b/k8s/helmfile/env/staging/tool-widar.values.yaml.gotmpl
@@ -1,2 +1,2 @@
 platform:
-  mediawikiBackendHost: mediawiki-139-app-backend.default.svc.cluster.local
+  mediawikiBackendHost: mediawiki-138-app-backend.default.svc.cluster.local
diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml
@@ -155,13 +155,6 @@ releases:
     version: 0.10.6
     <<: *default_release
 
-  - name: mediawiki-139
-    namespace: default
-    chart: wbstack/mediawiki
-    version: 0.10.6
-    installed: {{ ne .Environment.Name "production" | toYaml }}
-    <<: *default_release
-
   - name: queryservice-ui
     namespace: default
     chart: wbstack/queryservice-ui