Merge pull request #61 from toolforge/multiinstance-mysql

crookedstorm · web-flow · commit 485a36e11d99 · 2021-04-02T14:49:33.000-07:00
database testing: remove failed experiments
diff --git a/paws/production.yaml b/paws/production.yaml
@@ -1,7 +1,3 @@
-beta:
-  mysql:
-    enabled: true
-    domain: analytics.db.svc.wikimedia.cloud
 mysql:
   domain: analytics.db.svc.eqiad.wmflabs
   # TODO: remove this when the multiinstance replica proxy is removed
diff --git a/paws/templates/beta-db-proxy.yaml b/paws/templates/beta-db-proxy.yaml
diff --git a/paws/templates/db-proxy.yaml b/paws/templates/db-proxy.yaml
@@ -25,14 +25,6 @@ spec:
           - {{ printf "--proxy-backend-addresses=%s-mariadb.%s:3306" .Release.Name .Release.Namespace | quote }}
           {{- else }}
           - {{ printf "--proxy-backend-addresses=%s:3306" .Values.mysql.host | quote }}
-          # TODO: enable this part when the 8 IP addresses are actually different
-          # {{- with .Values.mysql }}
-          # {{- $sections := untilStep 1 9 1 | toStrings }}
-          # {{- $domain := .domain }}
-          # {{- range $sections }}
-          # - {{ printf "--proxy-backend-addresses=s%s.%s:3306" . $domain | quote }}
-          # {{- end }}
-          # {{- end }}
           {{- end }}
           - --proxy-address=0.0.0.0:3306
           - --proxy-skip-profiling
diff --git a/paws/values.yaml b/paws/values.yaml
@@ -183,7 +183,6 @@ jupyterhub:
                   ]
           
                   spawner.environment['MYSQL_HOST'] = os.environ['MYSQL_SERVICE_HOST']
-                  spawner.environment['BETA_MYSQL_HOST'] = os.environ['BETA_MYSQL_SERVICE_HOST']
                   mysql_password = hmac.new(
                       os.environ['MYSQL_HMAC_KEY'].encode('utf-8'),
                       identity['username'].encode('utf-8'),
@@ -250,17 +249,6 @@ mysql:
   domain: "svc.cluster.local"
   username: s52771
   password: "iAmNotSecret0"
-# beta is for live testing features not ready for production use
-beta:
-  mysql:
-    enabled: false
-    domain: "svc.cluster.local"
-  dbProxy:
-    image: 
-      name: quay.io/wikimedia-paws-prod/db-proxy
-      tag: multiinstance
-      # dbProxy.image.template safely defines image:tag name in yaml
-      template: "{{ .Values.dbProxy.image.name}}:{{.Values.dbProxy.image.tag }}"
 # If not deployed for prod use, we use the Bitnami mediawiki chart for testing
 mediawikiHacks:
   image:
