Switch default cluster to ES7

README.md

@@ -48,10 +48,8 @@ This part describes the Docker image that this repo is designed to build. People
 - `MW_ELASTICSEARCH_PORT`: DEPRECATED: elasticsearch port
 - `MW_DEFAULT_ELASTICSEARCH_HOST`: default (i.e. where data is served to users from) elasticsearch hostname
 - `MW_DEFAULT_ELASTICSEARCH_PORT`: default elasticsearch port
-- `MW_DEFAULT_ELASTICSEARCH_ES6`: use ES6 compatibility layer with default cluster. Set to "true" or leave unset
 - `MW_WRITE_ONLY_ELASTICSEARCH_HOST`: secondary elasticsearch hostname (optional)
 - `MW_WRITE_ONLY_ELASTICSEARCH_PORT`: secondary elasticsearch port (optional)
-- `MW_WRITE_ONLY_ELASTICSEARCH_ES6`: use ES6 compatibility layer with secondary cluster. Set to "true" or leave unset (optional)
 - `MW_LOG_TO_STDERR`: set to "yes" to redirect all mediawiki logging to stderr (so it ends up in the kubernetes pod logs)
 - `MW_ALLOWED_PROXY_CIDR`: CIDR block where any IP address in the range is considered a proxy server
 

dist-persist/wbstack/src/Settings/LocalSettings.php

@@ -735,24 +735,13 @@ function getElasticClusterConfig( string $prefix ) {
             'host' => getenv( $prefix . 'HOST' ),
             'port' => getenv( $prefix . 'PORT' )
         ];
-
-        if ( getEnv( $prefix . 'ES6' ) === "true" ) {
-            $config[ 'transport' ] = [
-                'type' => \CirrusSearch\Elastica\ES6CompatTransportWrapper::class,
-                'wrapped_transport' => 'Http'
-            ];
-        }
         return [ $config ];
     }
 
     if ( getenv( 'MW_ELASTICSEARCH_HOST' ) ) {
         $wgCirrusSearchClusters = [
             'default' => [
                 [
-                    'transport' => [
-                        'type' => \CirrusSearch\Elastica\ES6CompatTransportWrapper::class,
-                        'wrapped_transport' => 'Http'
-                    ],
                     'host' => getenv('MW_ELASTICSEARCH_HOST'),
                     'port' => getenv('MW_ELASTICSEARCH_PORT')
                 ],

dist/wbstack/src/Settings/LocalSettings.php

@@ -735,24 +735,13 @@ function getElasticClusterConfig( string $prefix ) {
             'host' => getenv( $prefix . 'HOST' ),
             'port' => getenv( $prefix . 'PORT' )
         ];
-
-        if ( getEnv( $prefix . 'ES6' ) === "true" ) {
-            $config[ 'transport' ] = [
-                'type' => \CirrusSearch\Elastica\ES6CompatTransportWrapper::class,
-                'wrapped_transport' => 'Http'
-            ];
-        }
         return [ $config ];
     }
 
     if ( getenv( 'MW_ELASTICSEARCH_HOST' ) ) {
         $wgCirrusSearchClusters = [
             'default' => [
                 [
-                    'transport' => [
-                        'type' => \CirrusSearch\Elastica\ES6CompatTransportWrapper::class,
-                        'wrapped_transport' => 'Http'
-                    ],
                     'host' => getenv('MW_ELASTICSEARCH_HOST'),
                     'port' => getenv('MW_ELASTICSEARCH_PORT')
                 ],

docker-compose.yml

@@ -25,13 +25,9 @@ services:
       - MW_DB_SERVER_MASTER=mysql.svc:3306
       - MW_DB_SERVER_REPLICA=mysql-replica.svc:3306
 
-      - MW_DEFAULT_ELASTICSEARCH_HOST=elasticsearch-6.svc
+      - MW_DEFAULT_ELASTICSEARCH_HOST=elasticsearch.svc
       - MW_DEFAULT_ELASTICSEARCH_PORT=9200
-      - MW_DEFAULT_ELASTICSEARCH_ES6=true
-
-      - MW_WRITE_ONLY_ELASTICSEARCH_HOST=elasticsearch-7.svc
-      - MW_WRITE_ONLY_ELASTICSEARCH_PORT=9200
-      - MW_WRITE_ONLY_ELASTICSEARCH_ES6=false
+      - MW_DEFAULT_ELASTICSEARCH_ES6=false
 
       - MW_REDIS_SERVER_READ=redis.svc
       - MW_REDIS_SERVER_WRITE=redis.svc
@@ -146,28 +142,15 @@ services:
         aliases:
           - redis.svc
 
-  elasticsearch-6:
-    image: wikibase/elasticsearch:6.8.23-wmde.6
-    restart: unless-stopped
-    ports:
-      - 9200:9200
-    networks:
-      default:
-        aliases:
-          - elasticsearch-6.svc
-    environment:
-      discovery.type: single-node
-      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
-
   elasticsearch-7:
     image: wikibase/elasticsearch:7.10.2-wmde.11
     restart: unless-stopped
     ports:
-      - 9201:9200
+      - 9200:9200
     networks:
       default:
         aliases:
-          - elasticsearch-7.svc
+          - elasticsearch.svc
     environment:
       discovery.type: single-node
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"