Compilation results for deploy1003.eqiad.wmnet: System changes detected

You can retrieve this result from host.json.

Catalog differences

Summary

Total Resources:	16481
Resources added:	0
Resources removed:	6
Resources modified:	24
Change percentage:	0.18%

Resources only in the old catalog

Envoyproxy::Cluster[image-suggestion_cluster]
File[/etc/envoy/listeners.d/50-image_suggestion.yaml]
Envoyproxy::Listener[image-suggestion]
Envoyproxy::Conf[image-suggestion_cluster]
File[/etc/envoy/clusters.d/50-image_suggestion_cluster.yaml]
Envoyproxy::Conf[image-suggestion]

Resources modified

Envoyproxy::Listener[image-suggestion]

Parameters differences:

--- Envoyproxy::Listener[image-suggestion].orig
+++ Envoyproxy::Listener[image-suggestion]

-    priority => 50

File[/etc/helmfile-defaults/general-ml-serve-codfw.yaml]

Content differences:

--- /etc/helmfile-defaults/general-ml-serve-codfw.yaml.orig
+++ /etc/helmfile-defaults/general-ml-serve-codfw.yaml
@@ -1264,18 +1264,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

File[/etc/helmfile-defaults/general-codfw.yaml]

Content differences:

--- /etc/helmfile-defaults/general-codfw.yaml.orig
+++ /etc/helmfile-defaults/general-codfw.yaml
@@ -1264,18 +1264,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

Class[Profile::Kubernetes::Deployment_server::Global_config]

Parameters differences:

--- Class[Profile::Kubernetes::Deployment_server::Global_config].orig
+++ Class[Profile::Kubernetes::Deployment_server::Global_config]

@@
-    service_listeners => [{'name': 'mathoid', 'port': 6003, 'timeout': '3s', 'service': 'mathoid'}, {'name': 'eventgate-analytics', 'port': 6004, 'timeout': '10s', 'service': 'eventgate-analytics', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main', 'port': 6005, 'timeout': '61s', 'service': 'eventgate-main', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'sessionstore', 'port': 6006, 'service': 'sessionstore', 'timeout': '2.5s'}, {'name': 'echostore', 'port': 6007, 'service': 'echostore', 'timeout': '2.5s'}, {'name': 'termbox', 'port': 6008, 'service': 'termbox', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2}, 'timeout': '25s'}, {'name': 'restbase', 'port': 6011, 'service': 'restbase-https', 'upstream': 'restbase.discovery.wmnet', 'timeout': '30s', 'keepalive': '4s', 'xfp': 'https'}, {'name': 'push-notifications', 'port': 6012, 'service': 'push-notifications', 'keepalive': '4.5s', 'timeout': '2.5s'}, {'name': 'mobileapps', 'port': 6012, 'service': 'mobileapps', 'timeout': '120s'}, {'name': 'eventgate-analytics-external', 'port': 6013, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'proton', 'port': 6013, 'service': 'proton', 'timeout': '120s'}, {'name': 'citoid', 'port': 6014, 'service': 'citoid', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'cxserver', 'port': 6015, 'service': 'cxserver', 'timeout': '120s'}, {'name': 'recommendation', 'port': 6016, 'service': 'recommendation-api', 'timeout': '120s'}, {'name': 'wikifeeds', 'port': 6017, 'service': 'wikifeeds', 'timeout': '120s'}, {'name': 'zotero', 'port': 6018, 'service': 'zotero', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'apertium', 'port': 6019, 'service': 'apertium', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'thanos-query', 'port': 6021, 'service': 'thanos-query', 'timeout': '120s'}, {'name': 'thanos-swift', 'port': 6022, 'service': 'thanos-swift', 'timeout': '120s', 'sets_sni': True}, {'name': 'schema', 'port': 6023, 'service': 'schema', 'timeout': '120s', 'keepalive': '10s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox', 'port': 6024, 'timeout': '60s', 'service': 'shellbox', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-constraints', 'port': 6025, 'timeout': '10s', 'service': 'shellbox-constraints', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-media', 'port': 6026, 'timeout': '60s', 'service': 'shellbox-media', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-syntaxhighlight', 'port': 6027, 'timeout': '60s', 'service': 'shellbox-syntaxhighlight', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-timeline', 'port': 6028, 'timeout': '60s', 'service': 'shellbox-timeline', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'linkrecommendation', 'port': 6029, 'service': 'linkrecommendation', 'timeout': '10s'}, {'name': 'image-suggestion', 'port': 6030, 'service': 'image-suggestion', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'inference', 'port': 6031, 'service': 'inference', 'timeout': '60s'}, {'name': 'device-analytics', 'port': 6032, 'service': 'device-analytics', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'rest-gateway', 'port': 6033, 'service': 'rest-gateway', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'wikifunctions', 'port': 6034, 'service': 'wikifunctions', 'timeout': '15.5s', 'sets_sni': True}, {'name': 'ipoid', 'port': 6035, 'service': 'ipoid', 'timeout': '5s', 'upstream': 'ipoid.discovery.wmnet', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'shellbox-video', 'port': 6036, 'timeout': '86400s', 'idle_timeout': '86400s', 'service': 'shellbox-video', 'keepalive': '4s', 'tcp_keepalive': {'keepalive_time': 300}}, {'name': 'test-kitchen', 'port': 6037, 'service': 'test-kitchen', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'data-gateway', 'port': 6038, 'service': 'data-gateway', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'chart-renderer', 'port': 6039, 'service': 'chart-renderer', 'timeout': '30s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'tegola-vector-tiles', 'port': 6040, 'service': 'tegola-vector-tiles', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'wdqs-internal-main', 'port': 6041, 'service': 'wdqs-internal-main', 'timeout': '10s'}, {'name': 'wdqs-internal-scholarly', 'port': 6042, 'service': 'wdqs-internal-scholarly', 'timeout': '10s'}, {'name': 'eventgate-logging-external', 'port': 6043, 'timeout': '5s', 'service': 'eventgate-logging-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'swift-eqiad', 'port': 6101, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.eqiad.wmnet'}, {'name': 'swift-codfw', 'port': 6201, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.codfw.wmnet'}, {'name': 'search-chi-eqiad', 'port': 6102, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-chi-codfw', 'port': 6202, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-chi', 'port': 6302, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-omega-eqiad', 'port': 6103, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-omega-codfw', 'port': 6203, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-omega', 'port': 6303, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search-omega.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-psi-eqiad', 'port': 6104, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-psi-codfw', 'port': 6204, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-psi', 'port': 6304, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search-psi.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'cloudelastic-chi-eqiad', 'port': 6105, 'service': 'cloudelastic-chi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-omega-eqiad', 'port': 6106, 'service': 'cloudelastic-omega-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-psi-eqiad', 'port': 6107, 'service': 'cloudelastic-psi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'inference-staging', 'port': 6205, 'service': 'inference-staging', 'timeout': '60s', 'upstream': 'inference-staging.svc.codfw.wmnet'}, {'name': 'analytics-web', 'port': 6206, 'service': 'analytics-web', 'timeout': '60s', 'upstream': 'analytics-web.discovery.wmnet', 'sets_sni': True, 'http_host': 'analytics.wikimedia.org'}, {'name': 'eventgate-analytics-eqiad', 'port': 6108, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-codfw', 'port': 6208, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main-eqiad', 'port': 6109, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-main-codfw', 'port': 6209, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-analytics-external-eqiad', 'port': 6110, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-external-codfw', 'port': 6210, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-eqiad', 'port': 6111, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-codfw', 'port': 6211, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'page-analytics', 'port': 6073, 'service': 'page-analytics', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'mwapi-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mwapi', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mw-api-int', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async-ro', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'restbase-for-services', 'port': 6503, 'service': 'restbase-https', 'timeout': '122s', 'keepalive': '4s', 'upstream': 'restbase.discovery.wmnet', 'xfp': 'https'}, {'name': 'machinetranslation', 'port': 6504, 'service': 'machinetranslation', 'timeout': '120s', 'sets_sni': True}, {'name': 'mw-wikifunctions-ro', 'port': 6501, 'service': 'mw-wikifunctions', 'upstream': 'mw-wikifunctions-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https', 'sets_sni': True, 'sni_rewrites_host_header': False}, {'name': 'mw-jobrunner', 'port': 6506, 'service': 'mw-jobrunner', 'timeout': '30s', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}, 'xfp': 'https'}, {'name': 'mw-misc', 'port': 6508, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'noc', 'port': 6509, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'http_host': 'noc.wikimedia.org', 'keepalive': '4s'}, {'name': 'data-gateway-staging', 'port': 6510, 'service': 'data-gateway-staging', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True, 'upstream': 'data-gateway.k8s-staging.discovery.wmnet'}]
+    service_listeners => [{'name': 'mathoid', 'port': 6003, 'timeout': '3s', 'service': 'mathoid'}, {'name': 'eventgate-analytics', 'port': 6004, 'timeout': '10s', 'service': 'eventgate-analytics', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main', 'port': 6005, 'timeout': '61s', 'service': 'eventgate-main', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'sessionstore', 'port': 6006, 'service': 'sessionstore', 'timeout': '2.5s'}, {'name': 'echostore', 'port': 6007, 'service': 'echostore', 'timeout': '2.5s'}, {'name': 'termbox', 'port': 6008, 'service': 'termbox', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2}, 'timeout': '25s'}, {'name': 'restbase', 'port': 6011, 'service': 'restbase-https', 'upstream': 'restbase.discovery.wmnet', 'timeout': '30s', 'keepalive': '4s', 'xfp': 'https'}, {'name': 'push-notifications', 'port': 6012, 'service': 'push-notifications', 'keepalive': '4.5s', 'timeout': '2.5s'}, {'name': 'mobileapps', 'port': 6012, 'service': 'mobileapps', 'timeout': '120s'}, {'name': 'eventgate-analytics-external', 'port': 6013, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'proton', 'port': 6013, 'service': 'proton', 'timeout': '120s'}, {'name': 'citoid', 'port': 6014, 'service': 'citoid', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'cxserver', 'port': 6015, 'service': 'cxserver', 'timeout': '120s'}, {'name': 'recommendation', 'port': 6016, 'service': 'recommendation-api', 'timeout': '120s'}, {'name': 'wikifeeds', 'port': 6017, 'service': 'wikifeeds', 'timeout': '120s'}, {'name': 'zotero', 'port': 6018, 'service': 'zotero', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'apertium', 'port': 6019, 'service': 'apertium', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'thanos-query', 'port': 6021, 'service': 'thanos-query', 'timeout': '120s'}, {'name': 'thanos-swift', 'port': 6022, 'service': 'thanos-swift', 'timeout': '120s', 'sets_sni': True}, {'name': 'schema', 'port': 6023, 'service': 'schema', 'timeout': '120s', 'keepalive': '10s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox', 'port': 6024, 'timeout': '60s', 'service': 'shellbox', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-constraints', 'port': 6025, 'timeout': '10s', 'service': 'shellbox-constraints', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-media', 'port': 6026, 'timeout': '60s', 'service': 'shellbox-media', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-syntaxhighlight', 'port': 6027, 'timeout': '60s', 'service': 'shellbox-syntaxhighlight', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-timeline', 'port': 6028, 'timeout': '60s', 'service': 'shellbox-timeline', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'linkrecommendation', 'port': 6029, 'service': 'linkrecommendation', 'timeout': '10s'}, {'name': 'inference', 'port': 6031, 'service': 'inference', 'timeout': '60s'}, {'name': 'device-analytics', 'port': 6032, 'service': 'device-analytics', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'rest-gateway', 'port': 6033, 'service': 'rest-gateway', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'wikifunctions', 'port': 6034, 'service': 'wikifunctions', 'timeout': '15.5s', 'sets_sni': True}, {'name': 'ipoid', 'port': 6035, 'service': 'ipoid', 'timeout': '5s', 'upstream': 'ipoid.discovery.wmnet', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'shellbox-video', 'port': 6036, 'timeout': '86400s', 'idle_timeout': '86400s', 'service': 'shellbox-video', 'keepalive': '4s', 'tcp_keepalive': {'keepalive_time': 300}}, {'name': 'test-kitchen', 'port': 6037, 'service': 'test-kitchen', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'data-gateway', 'port': 6038, 'service': 'data-gateway', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'chart-renderer', 'port': 6039, 'service': 'chart-renderer', 'timeout': '30s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'tegola-vector-tiles', 'port': 6040, 'service': 'tegola-vector-tiles', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'wdqs-internal-main', 'port': 6041, 'service': 'wdqs-internal-main', 'timeout': '10s'}, {'name': 'wdqs-internal-scholarly', 'port': 6042, 'service': 'wdqs-internal-scholarly', 'timeout': '10s'}, {'name': 'eventgate-logging-external', 'port': 6043, 'timeout': '5s', 'service': 'eventgate-logging-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'swift-eqiad', 'port': 6101, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.eqiad.wmnet'}, {'name': 'swift-codfw', 'port': 6201, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.codfw.wmnet'}, {'name': 'search-chi-eqiad', 'port': 6102, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-chi-codfw', 'port': 6202, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-chi', 'port': 6302, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-omega-eqiad', 'port': 6103, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-omega-codfw', 'port': 6203, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-omega', 'port': 6303, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search-omega.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-psi-eqiad', 'port': 6104, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-psi-codfw', 'port': 6204, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-psi', 'port': 6304, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search-psi.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'cloudelastic-chi-eqiad', 'port': 6105, 'service': 'cloudelastic-chi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-omega-eqiad', 'port': 6106, 'service': 'cloudelastic-omega-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-psi-eqiad', 'port': 6107, 'service': 'cloudelastic-psi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'inference-staging', 'port': 6205, 'service': 'inference-staging', 'timeout': '60s', 'upstream': 'inference-staging.svc.codfw.wmnet'}, {'name': 'analytics-web', 'port': 6206, 'service': 'analytics-web', 'timeout': '60s', 'upstream': 'analytics-web.discovery.wmnet', 'sets_sni': True, 'http_host': 'analytics.wikimedia.org'}, {'name': 'eventgate-analytics-eqiad', 'port': 6108, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-codfw', 'port': 6208, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main-eqiad', 'port': 6109, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-main-codfw', 'port': 6209, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-analytics-external-eqiad', 'port': 6110, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-external-codfw', 'port': 6210, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-eqiad', 'port': 6111, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-codfw', 'port': 6211, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'page-analytics', 'port': 6073, 'service': 'page-analytics', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'mwapi-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mwapi', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mw-api-int', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async-ro', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'restbase-for-services', 'port': 6503, 'service': 'restbase-https', 'timeout': '122s', 'keepalive': '4s', 'upstream': 'restbase.discovery.wmnet', 'xfp': 'https'}, {'name': 'machinetranslation', 'port': 6504, 'service': 'machinetranslation', 'timeout': '120s', 'sets_sni': True}, {'name': 'mw-wikifunctions-ro', 'port': 6501, 'service': 'mw-wikifunctions', 'upstream': 'mw-wikifunctions-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https', 'sets_sni': True, 'sni_rewrites_host_header': False}, {'name': 'mw-jobrunner', 'port': 6506, 'service': 'mw-jobrunner', 'timeout': '30s', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}, 'xfp': 'https'}, {'name': 'mw-misc', 'port': 6508, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'noc', 'port': 6509, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'http_host': 'noc.wikimedia.org', 'keepalive': '4s'}, {'name': 'data-gateway-staging', 'port': 6510, 'service': 'data-gateway-staging', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True, 'upstream': 'data-gateway.k8s-staging.discovery.wmnet'}]

Envoyproxy::Conf[image-suggestion_cluster]

Parameters differences:

--- Envoyproxy::Conf[image-suggestion_cluster].orig
+++ Envoyproxy::Conf[image-suggestion_cluster]

-    priority  => 50
-    conf_type => cluster

File[/etc/helmfile-defaults/general-eqiad.yaml]

Content differences:

--- /etc/helmfile-defaults/general-eqiad.yaml.orig
+++ /etc/helmfile-defaults/general-eqiad.yaml
@@ -1264,18 +1264,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

Envoyproxy::Cluster[image-suggestion_cluster]

Parameters differences:

--- Envoyproxy::Cluster[image-suggestion_cluster].orig
+++ Envoyproxy::Cluster[image-suggestion_cluster]

-    priority => 50

File[/etc/helmfile-defaults/general-aux-k8s-codfw.yaml]

Content differences:

--- /etc/helmfile-defaults/general-aux-k8s-codfw.yaml.orig
+++ /etc/helmfile-defaults/general-aux-k8s-codfw.yaml
@@ -1264,18 +1264,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

Class[Profile::Kubernetes::Deployment_server::Sophroid_config]

Parameters differences:

--- Class[Profile::Kubernetes::Deployment_server::Sophroid_config].orig
+++ Class[Profile::Kubernetes::Deployment_server::Sophroid_config]

@@
-    enabled_listeners => ['mathoid', 'eventgate-analytics', 'eventgate-analytics-external', 'eventgate-main', 'sessionstore', 'echostore', 'termbox', 'push-notifications', 'restbase', 'rest-gateway', 'cxserver', 'shellbox', 'shellbox-constraints', 'shellbox-media', 'shellbox-syntaxhighlight', 'shellbox-timeline', 'shellbox-video', 'swift-eqiad', 'swift-codfw', 'search-chi-eqiad', 'search-chi-codfw', 'search-chi', 'search-omega-eqiad', 'search-omega-codfw', 'search-omega', 'search-psi-eqiad', 'search-psi-codfw', 'search-psi', 'cloudelastic-chi-eqiad', 'cloudelastic-omega-eqiad', 'cloudelastic-psi-eqiad', 'mw-api-int', 'linkrecommendation', 'image-suggestion', 'device-analytics', 'inference', 'wikifunctions', 'ipoid', 'test-kitchen', 'chart-renderer', 'wdqs-internal-main', 'wdqs-internal-scholarly', 'data-gateway', 'analytics-web', 'page-analytics']
+    enabled_listeners => ['mathoid', 'eventgate-analytics', 'eventgate-analytics-external', 'eventgate-main', 'sessionstore', 'echostore', 'termbox', 'push-notifications', 'restbase', 'rest-gateway', 'cxserver', 'shellbox', 'shellbox-constraints', 'shellbox-media', 'shellbox-syntaxhighlight', 'shellbox-timeline', 'shellbox-video', 'swift-eqiad', 'swift-codfw', 'search-chi-eqiad', 'search-chi-codfw', 'search-chi', 'search-omega-eqiad', 'search-omega-codfw', 'search-omega', 'search-psi-eqiad', 'search-psi-codfw', 'search-psi', 'cloudelastic-chi-eqiad', 'cloudelastic-omega-eqiad', 'cloudelastic-psi-eqiad', 'mw-api-int', 'linkrecommendation', 'device-analytics', 'inference', 'wikifunctions', 'ipoid', 'test-kitchen', 'chart-renderer', 'wdqs-internal-main', 'wdqs-internal-scholarly', 'data-gateway', 'analytics-web', 'page-analytics']
@@
-    listeners         => [{'name': 'mathoid', 'port': 6003, 'timeout': '3s', 'service': 'mathoid'}, {'name': 'eventgate-analytics', 'port': 6004, 'timeout': '10s', 'service': 'eventgate-analytics', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main', 'port': 6005, 'timeout': '61s', 'service': 'eventgate-main', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'sessionstore', 'port': 6006, 'service': 'sessionstore', 'timeout': '2.5s'}, {'name': 'echostore', 'port': 6007, 'service': 'echostore', 'timeout': '2.5s'}, {'name': 'termbox', 'port': 6008, 'service': 'termbox', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2}, 'timeout': '25s'}, {'name': 'restbase', 'port': 6011, 'service': 'restbase-https', 'upstream': 'restbase.discovery.wmnet', 'timeout': '30s', 'keepalive': '4s', 'xfp': 'https'}, {'name': 'push-notifications', 'port': 6012, 'service': 'push-notifications', 'keepalive': '4.5s', 'timeout': '2.5s'}, {'name': 'mobileapps', 'port': 6012, 'service': 'mobileapps', 'timeout': '120s'}, {'name': 'eventgate-analytics-external', 'port': 6013, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'proton', 'port': 6013, 'service': 'proton', 'timeout': '120s'}, {'name': 'citoid', 'port': 6014, 'service': 'citoid', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'cxserver', 'port': 6015, 'service': 'cxserver', 'timeout': '120s'}, {'name': 'recommendation', 'port': 6016, 'service': 'recommendation-api', 'timeout': '120s'}, {'name': 'wikifeeds', 'port': 6017, 'service': 'wikifeeds', 'timeout': '120s'}, {'name': 'zotero', 'port': 6018, 'service': 'zotero', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'apertium', 'port': 6019, 'service': 'apertium', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'thanos-query', 'port': 6021, 'service': 'thanos-query', 'timeout': '120s'}, {'name': 'thanos-swift', 'port': 6022, 'service': 'thanos-swift', 'timeout': '120s', 'sets_sni': True}, {'name': 'schema', 'port': 6023, 'service': 'schema', 'timeout': '120s', 'keepalive': '10s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox', 'port': 6024, 'timeout': '60s', 'service': 'shellbox', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-constraints', 'port': 6025, 'timeout': '10s', 'service': 'shellbox-constraints', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-media', 'port': 6026, 'timeout': '60s', 'service': 'shellbox-media', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-syntaxhighlight', 'port': 6027, 'timeout': '60s', 'service': 'shellbox-syntaxhighlight', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-timeline', 'port': 6028, 'timeout': '60s', 'service': 'shellbox-timeline', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'linkrecommendation', 'port': 6029, 'service': 'linkrecommendation', 'timeout': '10s'}, {'name': 'image-suggestion', 'port': 6030, 'service': 'image-suggestion', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'inference', 'port': 6031, 'service': 'inference', 'timeout': '60s'}, {'name': 'device-analytics', 'port': 6032, 'service': 'device-analytics', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'rest-gateway', 'port': 6033, 'service': 'rest-gateway', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'wikifunctions', 'port': 6034, 'service': 'wikifunctions', 'timeout': '15.5s', 'sets_sni': True}, {'name': 'ipoid', 'port': 6035, 'service': 'ipoid', 'timeout': '5s', 'upstream': 'ipoid.discovery.wmnet', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'shellbox-video', 'port': 6036, 'timeout': '86400s', 'idle_timeout': '86400s', 'service': 'shellbox-video', 'keepalive': '4s', 'tcp_keepalive': {'keepalive_time': 300}}, {'name': 'test-kitchen', 'port': 6037, 'service': 'test-kitchen', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'data-gateway', 'port': 6038, 'service': 'data-gateway', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'chart-renderer', 'port': 6039, 'service': 'chart-renderer', 'timeout': '30s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'tegola-vector-tiles', 'port': 6040, 'service': 'tegola-vector-tiles', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'wdqs-internal-main', 'port': 6041, 'service': 'wdqs-internal-main', 'timeout': '10s'}, {'name': 'wdqs-internal-scholarly', 'port': 6042, 'service': 'wdqs-internal-scholarly', 'timeout': '10s'}, {'name': 'eventgate-logging-external', 'port': 6043, 'timeout': '5s', 'service': 'eventgate-logging-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'swift-eqiad', 'port': 6101, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.eqiad.wmnet'}, {'name': 'swift-codfw', 'port': 6201, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.codfw.wmnet'}, {'name': 'search-chi-eqiad', 'port': 6102, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-chi-codfw', 'port': 6202, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-chi', 'port': 6302, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-omega-eqiad', 'port': 6103, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-omega-codfw', 'port': 6203, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-omega', 'port': 6303, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search-omega.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-psi-eqiad', 'port': 6104, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-psi-codfw', 'port': 6204, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-psi', 'port': 6304, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search-psi.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'cloudelastic-chi-eqiad', 'port': 6105, 'service': 'cloudelastic-chi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-omega-eqiad', 'port': 6106, 'service': 'cloudelastic-omega-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-psi-eqiad', 'port': 6107, 'service': 'cloudelastic-psi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'inference-staging', 'port': 6205, 'service': 'inference-staging', 'timeout': '60s', 'upstream': 'inference-staging.svc.codfw.wmnet'}, {'name': 'analytics-web', 'port': 6206, 'service': 'analytics-web', 'timeout': '60s', 'upstream': 'analytics-web.discovery.wmnet', 'sets_sni': True, 'http_host': 'analytics.wikimedia.org'}, {'name': 'eventgate-analytics-eqiad', 'port': 6108, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-codfw', 'port': 6208, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main-eqiad', 'port': 6109, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-main-codfw', 'port': 6209, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-analytics-external-eqiad', 'port': 6110, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-external-codfw', 'port': 6210, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-eqiad', 'port': 6111, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-codfw', 'port': 6211, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'page-analytics', 'port': 6073, 'service': 'page-analytics', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'mwapi-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mwapi', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mw-api-int', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async-ro', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'restbase-for-services', 'port': 6503, 'service': 'restbase-https', 'timeout': '122s', 'keepalive': '4s', 'upstream': 'restbase.discovery.wmnet', 'xfp': 'https'}, {'name': 'machinetranslation', 'port': 6504, 'service': 'machinetranslation', 'timeout': '120s', 'sets_sni': True}, {'name': 'mw-wikifunctions-ro', 'port': 6501, 'service': 'mw-wikifunctions', 'upstream': 'mw-wikifunctions-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https', 'sets_sni': True, 'sni_rewrites_host_header': False}, {'name': 'mw-jobrunner', 'port': 6506, 'service': 'mw-jobrunner', 'timeout': '30s', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}, 'xfp': 'https'}, {'name': 'mw-misc', 'port': 6508, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'noc', 'port': 6509, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'http_host': 'noc.wikimedia.org', 'keepalive': '4s'}, {'name': 'data-gateway-staging', 'port': 6510, 'service': 'data-gateway-staging', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True, 'upstream': 'data-gateway.k8s-staging.discovery.wmnet'}]
+    listeners         => [{'name': 'mathoid', 'port': 6003, 'timeout': '3s', 'service': 'mathoid'}, {'name': 'eventgate-analytics', 'port': 6004, 'timeout': '10s', 'service': 'eventgate-analytics', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main', 'port': 6005, 'timeout': '61s', 'service': 'eventgate-main', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'sessionstore', 'port': 6006, 'service': 'sessionstore', 'timeout': '2.5s'}, {'name': 'echostore', 'port': 6007, 'service': 'echostore', 'timeout': '2.5s'}, {'name': 'termbox', 'port': 6008, 'service': 'termbox', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2}, 'timeout': '25s'}, {'name': 'restbase', 'port': 6011, 'service': 'restbase-https', 'upstream': 'restbase.discovery.wmnet', 'timeout': '30s', 'keepalive': '4s', 'xfp': 'https'}, {'name': 'push-notifications', 'port': 6012, 'service': 'push-notifications', 'keepalive': '4.5s', 'timeout': '2.5s'}, {'name': 'mobileapps', 'port': 6012, 'service': 'mobileapps', 'timeout': '120s'}, {'name': 'eventgate-analytics-external', 'port': 6013, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'proton', 'port': 6013, 'service': 'proton', 'timeout': '120s'}, {'name': 'citoid', 'port': 6014, 'service': 'citoid', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'cxserver', 'port': 6015, 'service': 'cxserver', 'timeout': '120s'}, {'name': 'recommendation', 'port': 6016, 'service': 'recommendation-api', 'timeout': '120s'}, {'name': 'wikifeeds', 'port': 6017, 'service': 'wikifeeds', 'timeout': '120s'}, {'name': 'zotero', 'port': 6018, 'service': 'zotero', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'apertium', 'port': 6019, 'service': 'apertium', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'thanos-query', 'port': 6021, 'service': 'thanos-query', 'timeout': '120s'}, {'name': 'thanos-swift', 'port': 6022, 'service': 'thanos-swift', 'timeout': '120s', 'sets_sni': True}, {'name': 'schema', 'port': 6023, 'service': 'schema', 'timeout': '120s', 'keepalive': '10s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox', 'port': 6024, 'timeout': '60s', 'service': 'shellbox', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-constraints', 'port': 6025, 'timeout': '10s', 'service': 'shellbox-constraints', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-media', 'port': 6026, 'timeout': '60s', 'service': 'shellbox-media', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-syntaxhighlight', 'port': 6027, 'timeout': '60s', 'service': 'shellbox-syntaxhighlight', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-timeline', 'port': 6028, 'timeout': '60s', 'service': 'shellbox-timeline', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'linkrecommendation', 'port': 6029, 'service': 'linkrecommendation', 'timeout': '10s'}, {'name': 'inference', 'port': 6031, 'service': 'inference', 'timeout': '60s'}, {'name': 'device-analytics', 'port': 6032, 'service': 'device-analytics', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'rest-gateway', 'port': 6033, 'service': 'rest-gateway', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'wikifunctions', 'port': 6034, 'service': 'wikifunctions', 'timeout': '15.5s', 'sets_sni': True}, {'name': 'ipoid', 'port': 6035, 'service': 'ipoid', 'timeout': '5s', 'upstream': 'ipoid.discovery.wmnet', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'shellbox-video', 'port': 6036, 'timeout': '86400s', 'idle_timeout': '86400s', 'service': 'shellbox-video', 'keepalive': '4s', 'tcp_keepalive': {'keepalive_time': 300}}, {'name': 'test-kitchen', 'port': 6037, 'service': 'test-kitchen', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'data-gateway', 'port': 6038, 'service': 'data-gateway', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'chart-renderer', 'port': 6039, 'service': 'chart-renderer', 'timeout': '30s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'tegola-vector-tiles', 'port': 6040, 'service': 'tegola-vector-tiles', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'wdqs-internal-main', 'port': 6041, 'service': 'wdqs-internal-main', 'timeout': '10s'}, {'name': 'wdqs-internal-scholarly', 'port': 6042, 'service': 'wdqs-internal-scholarly', 'timeout': '10s'}, {'name': 'eventgate-logging-external', 'port': 6043, 'timeout': '5s', 'service': 'eventgate-logging-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'swift-eqiad', 'port': 6101, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.eqiad.wmnet'}, {'name': 'swift-codfw', 'port': 6201, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.codfw.wmnet'}, {'name': 'search-chi-eqiad', 'port': 6102, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-chi-codfw', 'port': 6202, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-chi', 'port': 6302, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-omega-eqiad', 'port': 6103, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-omega-codfw', 'port': 6203, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-omega', 'port': 6303, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search-omega.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-psi-eqiad', 'port': 6104, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-psi-codfw', 'port': 6204, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-psi', 'port': 6304, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search-psi.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'cloudelastic-chi-eqiad', 'port': 6105, 'service': 'cloudelastic-chi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-omega-eqiad', 'port': 6106, 'service': 'cloudelastic-omega-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-psi-eqiad', 'port': 6107, 'service': 'cloudelastic-psi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'inference-staging', 'port': 6205, 'service': 'inference-staging', 'timeout': '60s', 'upstream': 'inference-staging.svc.codfw.wmnet'}, {'name': 'analytics-web', 'port': 6206, 'service': 'analytics-web', 'timeout': '60s', 'upstream': 'analytics-web.discovery.wmnet', 'sets_sni': True, 'http_host': 'analytics.wikimedia.org'}, {'name': 'eventgate-analytics-eqiad', 'port': 6108, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-codfw', 'port': 6208, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main-eqiad', 'port': 6109, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-main-codfw', 'port': 6209, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-analytics-external-eqiad', 'port': 6110, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-external-codfw', 'port': 6210, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-eqiad', 'port': 6111, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-codfw', 'port': 6211, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'page-analytics', 'port': 6073, 'service': 'page-analytics', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'mwapi-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mwapi', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mw-api-int', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async-ro', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'restbase-for-services', 'port': 6503, 'service': 'restbase-https', 'timeout': '122s', 'keepalive': '4s', 'upstream': 'restbase.discovery.wmnet', 'xfp': 'https'}, {'name': 'machinetranslation', 'port': 6504, 'service': 'machinetranslation', 'timeout': '120s', 'sets_sni': True}, {'name': 'mw-wikifunctions-ro', 'port': 6501, 'service': 'mw-wikifunctions', 'upstream': 'mw-wikifunctions-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https', 'sets_sni': True, 'sni_rewrites_host_header': False}, {'name': 'mw-jobrunner', 'port': 6506, 'service': 'mw-jobrunner', 'timeout': '30s', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}, 'xfp': 'https'}, {'name': 'mw-misc', 'port': 6508, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'noc', 'port': 6509, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'http_host': 'noc.wikimedia.org', 'keepalive': '4s'}, {'name': 'data-gateway-staging', 'port': 6510, 'service': 'data-gateway-staging', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True, 'upstream': 'data-gateway.k8s-staging.discovery.wmnet'}]

File[/etc/helmfile-defaults/general-staging-codfw.yaml]

Content differences:

--- /etc/helmfile-defaults/general-staging-codfw.yaml.orig
+++ /etc/helmfile-defaults/general-staging-codfw.yaml
@@ -1265,18 +1265,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

File[/etc/helmfile-defaults/mediawiki/tlsproxy.yaml]

Content differences:

--- /etc/helmfile-defaults/mediawiki/tlsproxy.yaml.orig
+++ /etc/helmfile-defaults/mediawiki/tlsproxy.yaml
@@ -34,7 +34,6 @@
   - cloudelastic-psi-eqiad
   - mw-api-int
   - linkrecommendation
-  - image-suggestion
   - device-analytics
   - inference
   - wikifunctions

Class[Profile::Kubernetes::Deployment_server::Mediawiki::Config]

Parameters differences:

--- Class[Profile::Kubernetes::Deployment_server::Mediawiki::Config].orig
+++ Class[Profile::Kubernetes::Deployment_server::Mediawiki::Config]

@@
-    enabled_listeners => ['mathoid', 'eventgate-analytics', 'eventgate-analytics-external', 'eventgate-main', 'sessionstore', 'echostore', 'termbox', 'push-notifications', 'restbase', 'rest-gateway', 'cxserver', 'shellbox', 'shellbox-constraints', 'shellbox-media', 'shellbox-syntaxhighlight', 'shellbox-timeline', 'shellbox-video', 'swift-eqiad', 'swift-codfw', 'search-chi-eqiad', 'search-chi-codfw', 'search-chi', 'search-omega-eqiad', 'search-omega-codfw', 'search-omega', 'search-psi-eqiad', 'search-psi-codfw', 'search-psi', 'cloudelastic-chi-eqiad', 'cloudelastic-omega-eqiad', 'cloudelastic-psi-eqiad', 'mw-api-int', 'linkrecommendation', 'image-suggestion', 'device-analytics', 'inference', 'wikifunctions', 'ipoid', 'test-kitchen', 'chart-renderer', 'wdqs-internal-main', 'wdqs-internal-scholarly', 'data-gateway', 'analytics-web', 'page-analytics']
+    enabled_listeners => ['mathoid', 'eventgate-analytics', 'eventgate-analytics-external', 'eventgate-main', 'sessionstore', 'echostore', 'termbox', 'push-notifications', 'restbase', 'rest-gateway', 'cxserver', 'shellbox', 'shellbox-constraints', 'shellbox-media', 'shellbox-syntaxhighlight', 'shellbox-timeline', 'shellbox-video', 'swift-eqiad', 'swift-codfw', 'search-chi-eqiad', 'search-chi-codfw', 'search-chi', 'search-omega-eqiad', 'search-omega-codfw', 'search-omega', 'search-psi-eqiad', 'search-psi-codfw', 'search-psi', 'cloudelastic-chi-eqiad', 'cloudelastic-omega-eqiad', 'cloudelastic-psi-eqiad', 'mw-api-int', 'linkrecommendation', 'device-analytics', 'inference', 'wikifunctions', 'ipoid', 'test-kitchen', 'chart-renderer', 'wdqs-internal-main', 'wdqs-internal-scholarly', 'data-gateway', 'analytics-web', 'page-analytics']

Envoyproxy::Conf[image-suggestion]

Parameters differences:

--- Envoyproxy::Conf[image-suggestion].orig
+++ Envoyproxy::Conf[image-suggestion]

-    priority  => 50
-    conf_type => listener

File[/etc/helmfile-defaults/general-ml-serve-eqiad.yaml]

Content differences:

--- /etc/helmfile-defaults/general-ml-serve-eqiad.yaml.orig
+++ /etc/helmfile-defaults/general-ml-serve-eqiad.yaml
@@ -1264,18 +1264,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

File[/etc/envoy/listeners.d/50-image_suggestion.yaml]

Parameters differences:

--- File[/etc/envoy/listeners.d/50-image_suggestion.yaml].orig
+++ File[/etc/envoy/listeners.d/50-image_suggestion.yaml]

-    notify => Exec[verify-envoy-config]
-    mode   => 0444
-    owner  => root
-    group  => root
-    ensure => present

Content differences:

--- /etc/envoy/listeners.d/50-image_suggestion.yaml.orig
+++ /etc/envoy/listeners.d/50-image_suggestion.yaml
@@ -1,92 +0,0 @@
-- address:
-    socket_address: {protocol: TCP, address: "::", port_value: 6030}
-  filter_chains:
-  - filters:
-    - name: envoy.filters.network.http_connection_manager
-      typed_config:
-        "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
-        access_log:
-        - filter:
-            status_code_filter:
-              comparison:
-                op: "GE"
-                value:
-                  default_value: 500
-                  runtime_key: image-suggestion_min_log_code
-          typed_config:
-            "@type": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
-            path: "/var/log/envoy/image-suggestion.log"
-        stat_prefix: image-suggestion_egress
-        http_filters:
-        - name: envoy.filters.http.router
-          typed_config:
-            "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
-        route_config:
-          name: image-suggestion_route
-          virtual_hosts:
-          - name: image-suggestion
-            domains: ["*"]
-            routes:
-            - match:
-                prefix: "/"
-              route:
-                auto_host_rewrite: true
-                cluster: image-suggestion
-                timeout: 10s
-                retry_policy:
-                  num_retries: 0
-        internal_address_config:
-          unix_sockets: true
-          cidr_ranges:
-          - address_prefix: 10.0.0.0
-            prefix_len: 8
-          - address_prefix: 127.0.0.1
-            prefix_len: 32
-          - address_prefix: ::1
-            prefix_len: 128
-- address:
-    socket_address: {protocol: TCP, address: 0.0.0.0, port_value: 6030}
-  filter_chains:
-  - filters:
-    - name: envoy.filters.network.http_connection_manager
-      typed_config:
-        "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
-        access_log:
-        - filter:
-            status_code_filter:
-              comparison:
-                op: "GE"
-                value:
-                  default_value: 500
-                  runtime_key: image-suggestion_min_log_code
-          typed_config:
-            "@type": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog
-            path: "/var/log/envoy/image-suggestion.log"
-        stat_prefix: image-suggestion_egress
-        http_filters:
-        - name: envoy.filters.http.router
-          typed_config:
-            "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
-        route_config:
-          name: image-suggestion_route
-          virtual_hosts:
-          - name: image-suggestion
-            domains: ["*"]
-            routes:
-            - match:
-                prefix: "/"
-              route:
-                auto_host_rewrite: true
-                cluster: image-suggestion
-                timeout: 10s
-                retry_policy:
-                  num_retries: 0
-        internal_address_config:
-          unix_sockets: true
-          cidr_ranges:
-          - address_prefix: 10.0.0.0
-            prefix_len: 8
-          - address_prefix: 127.0.0.1
-            prefix_len: 32
-          - address_prefix: ::1
-            prefix_len: 128

File[/etc/helmfile-defaults/general-aux-k8s-eqiad.yaml]

Content differences:

--- /etc/helmfile-defaults/general-aux-k8s-eqiad.yaml.orig
+++ /etc/helmfile-defaults/general-aux-k8s-eqiad.yaml
@@ -1264,18 +1264,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

File[/etc/helmfile-defaults/general-dse-k8s-eqiad.yaml]

Content differences:

--- /etc/helmfile-defaults/general-dse-k8s-eqiad.yaml.orig
+++ /etc/helmfile-defaults/general-dse-k8s-eqiad.yaml
@@ -1264,18 +1264,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

File[/etc/helmfile-defaults/general-staging-eqiad.yaml]

Content differences:

--- /etc/helmfile-defaults/general-staging-eqiad.yaml.orig
+++ /etc/helmfile-defaults/general-staging-eqiad.yaml
@@ -1265,18 +1265,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

File[/etc/helmfile-defaults/sophroid/listeners.yaml]

Content differences:

--- /etc/helmfile-defaults/sophroid/listeners.yaml.orig
+++ /etc/helmfile-defaults/sophroid/listeners.yaml
@@ -154,12 +154,6 @@
   port: 6029
   service: linkrecommendation
   timeout: 10s
-- name: image-suggestion
-  port: 6030
-  service: image-suggestion
-  timeout: 10s
-  keepalive: 4s
-  sets_sni: true
 - name: inference
   port: 6031
   service: inference
@@ -536,7 +530,6 @@
 - cloudelastic-psi-eqiad
 - mw-api-int
 - linkrecommendation
-- image-suggestion
 - device-analytics
 - inference
 - wikifunctions

File[/etc/helmfile-defaults/general-ml-staging-codfw.yaml]

Content differences:

--- /etc/helmfile-defaults/general-ml-staging-codfw.yaml.orig
+++ /etc/helmfile-defaults/general-ml-staging-codfw.yaml
@@ -1266,18 +1266,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

Class[Mediawiki::Tlsproxy::Yaml_defs]

Parameters differences:

--- Class[Mediawiki::Tlsproxy::Yaml_defs].orig
+++ Class[Mediawiki::Tlsproxy::Yaml_defs]

@@
-    listeners => ['mathoid', 'eventgate-analytics', 'eventgate-analytics-external', 'eventgate-main', 'sessionstore', 'echostore', 'termbox', 'push-notifications', 'restbase', 'rest-gateway', 'cxserver', 'shellbox', 'shellbox-constraints', 'shellbox-media', 'shellbox-syntaxhighlight', 'shellbox-timeline', 'shellbox-video', 'swift-eqiad', 'swift-codfw', 'search-chi-eqiad', 'search-chi-codfw', 'search-chi', 'search-omega-eqiad', 'search-omega-codfw', 'search-omega', 'search-psi-eqiad', 'search-psi-codfw', 'search-psi', 'cloudelastic-chi-eqiad', 'cloudelastic-omega-eqiad', 'cloudelastic-psi-eqiad', 'mw-api-int', 'linkrecommendation', 'image-suggestion', 'device-analytics', 'inference', 'wikifunctions', 'ipoid', 'test-kitchen', 'chart-renderer', 'wdqs-internal-main', 'wdqs-internal-scholarly', 'data-gateway', 'analytics-web', 'page-analytics']
+    listeners => ['mathoid', 'eventgate-analytics', 'eventgate-analytics-external', 'eventgate-main', 'sessionstore', 'echostore', 'termbox', 'push-notifications', 'restbase', 'rest-gateway', 'cxserver', 'shellbox', 'shellbox-constraints', 'shellbox-media', 'shellbox-syntaxhighlight', 'shellbox-timeline', 'shellbox-video', 'swift-eqiad', 'swift-codfw', 'search-chi-eqiad', 'search-chi-codfw', 'search-chi', 'search-omega-eqiad', 'search-omega-codfw', 'search-omega', 'search-psi-eqiad', 'search-psi-codfw', 'search-psi', 'cloudelastic-chi-eqiad', 'cloudelastic-omega-eqiad', 'cloudelastic-psi-eqiad', 'mw-api-int', 'linkrecommendation', 'device-analytics', 'inference', 'wikifunctions', 'ipoid', 'test-kitchen', 'chart-renderer', 'wdqs-internal-main', 'wdqs-internal-scholarly', 'data-gateway', 'analytics-web', 'page-analytics']

File[/etc/helmfile-defaults/general-dse-k8s-codfw.yaml]

Content differences:

--- /etc/helmfile-defaults/general-dse-k8s-codfw.yaml.orig
+++ /etc/helmfile-defaults/general-dse-k8s-codfw.yaml
@@ -1259,18 +1259,6 @@
       address: linkrecommendation.discovery.wmnet
       port: 4005
       encryption: true
-  image-suggestion:
-    port: 6030
-    timeout: 10s
-    upstream:
-      ips:
-      - 10.2.1.70/32
-      - 10.2.2.70/32
-      address: image-suggestion.discovery.wmnet
-      port: 30443
-      encryption: true
-      sets_sni: true
-      keepalive: 4s
   inference:
     port: 6031
     timeout: 60s

File[/etc/envoy/clusters.d/50-image_suggestion_cluster.yaml]

Parameters differences:

--- File[/etc/envoy/clusters.d/50-image_suggestion_cluster.yaml].orig
+++ File[/etc/envoy/clusters.d/50-image_suggestion_cluster.yaml]

-    notify => Exec[verify-envoy-config]
-    mode   => 0444
-    owner  => root
-    group  => root
-    ensure => present

Content differences:

--- /etc/envoy/clusters.d/50-image_suggestion_cluster.yaml.orig
+++ /etc/envoy/clusters.d/50-image_suggestion_cluster.yaml
@@ -1,38 +0,0 @@
-name: image-suggestion
-connect_timeout: 0.25s
-typed_extension_protocol_options:
-  envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
-    "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
-    common_http_protocol_options:
-      idle_timeout: 4s
-      # Given we go through a load-balancer, we want to keep the number of requests that go through a single connection pool small
-      max_requests_per_connection: 1000
-    use_downstream_protocol_config: {}
-type: STRICT_DNS
-dns_lookup_family: V4_ONLY
-lb_policy: ROUND_ROBIN
-load_assignment:
-  cluster_name: cluster_image-suggestion
-  endpoints:
-  - lb_endpoints:
-    - endpoint:
-        address:
-          socket_address:
-            address: image-suggestion.discovery.wmnet
-            port_value: 30443
-# Let's not enable circuit-breaking for now. It would look something like
-#circuit_breakers:
-#  thresholds:
-#    - max_pending_requests: 30
-transport_socket:
-  name: envoy.transport_sockets.tls
-  typed_config:
-    "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
-    sni: image-suggestion.discovery.wmnet
-    common_tls_context:
-       tls_params:
-         cipher_suites: ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384
-       validation_context:
-         trusted_ca:
-           filename: /etc/ssl/certs/ca-certificates.crt
-

Class[Profile::Services_proxy::Envoy]

Parameters differences:

--- Class[Profile::Services_proxy::Envoy].orig
+++ Class[Profile::Services_proxy::Envoy]

@@
-    enabled_listeners => ['mathoid', 'eventgate-analytics', 'eventgate-analytics-external', 'eventgate-main', 'sessionstore', 'echostore', 'termbox', 'push-notifications', 'restbase', 'rest-gateway', 'cxserver', 'shellbox', 'shellbox-constraints', 'shellbox-media', 'shellbox-syntaxhighlight', 'shellbox-timeline', 'shellbox-video', 'swift-eqiad', 'swift-codfw', 'search-chi-eqiad', 'search-chi-codfw', 'search-chi', 'search-omega-eqiad', 'search-omega-codfw', 'search-omega', 'search-psi-eqiad', 'search-psi-codfw', 'search-psi', 'cloudelastic-chi-eqiad', 'cloudelastic-omega-eqiad', 'cloudelastic-psi-eqiad', 'mw-api-int', 'linkrecommendation', 'image-suggestion', 'device-analytics', 'inference', 'wikifunctions', 'ipoid', 'test-kitchen', 'chart-renderer', 'wdqs-internal-main', 'wdqs-internal-scholarly', 'data-gateway', 'analytics-web', 'page-analytics']
+    enabled_listeners => ['mathoid', 'eventgate-analytics', 'eventgate-analytics-external', 'eventgate-main', 'sessionstore', 'echostore', 'termbox', 'push-notifications', 'restbase', 'rest-gateway', 'cxserver', 'shellbox', 'shellbox-constraints', 'shellbox-media', 'shellbox-syntaxhighlight', 'shellbox-timeline', 'shellbox-video', 'swift-eqiad', 'swift-codfw', 'search-chi-eqiad', 'search-chi-codfw', 'search-chi', 'search-omega-eqiad', 'search-omega-codfw', 'search-omega', 'search-psi-eqiad', 'search-psi-codfw', 'search-psi', 'cloudelastic-chi-eqiad', 'cloudelastic-omega-eqiad', 'cloudelastic-psi-eqiad', 'mw-api-int', 'linkrecommendation', 'device-analytics', 'inference', 'wikifunctions', 'ipoid', 'test-kitchen', 'chart-renderer', 'wdqs-internal-main', 'wdqs-internal-scholarly', 'data-gateway', 'analytics-web', 'page-analytics']
@@
-    all_listeners     => [{'name': 'mathoid', 'port': 6003, 'timeout': '3s', 'service': 'mathoid'}, {'name': 'eventgate-analytics', 'port': 6004, 'timeout': '10s', 'service': 'eventgate-analytics', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main', 'port': 6005, 'timeout': '61s', 'service': 'eventgate-main', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'sessionstore', 'port': 6006, 'service': 'sessionstore', 'timeout': '2.5s'}, {'name': 'echostore', 'port': 6007, 'service': 'echostore', 'timeout': '2.5s'}, {'name': 'termbox', 'port': 6008, 'service': 'termbox', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2}, 'timeout': '25s'}, {'name': 'restbase', 'port': 6011, 'service': 'restbase-https', 'upstream': 'restbase.discovery.wmnet', 'timeout': '30s', 'keepalive': '4s', 'xfp': 'https'}, {'name': 'push-notifications', 'port': 6012, 'service': 'push-notifications', 'keepalive': '4.5s', 'timeout': '2.5s'}, {'name': 'mobileapps', 'port': 6012, 'service': 'mobileapps', 'timeout': '120s'}, {'name': 'eventgate-analytics-external', 'port': 6013, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'proton', 'port': 6013, 'service': 'proton', 'timeout': '120s'}, {'name': 'citoid', 'port': 6014, 'service': 'citoid', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'cxserver', 'port': 6015, 'service': 'cxserver', 'timeout': '120s'}, {'name': 'recommendation', 'port': 6016, 'service': 'recommendation-api', 'timeout': '120s'}, {'name': 'wikifeeds', 'port': 6017, 'service': 'wikifeeds', 'timeout': '120s'}, {'name': 'zotero', 'port': 6018, 'service': 'zotero', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'apertium', 'port': 6019, 'service': 'apertium', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'thanos-query', 'port': 6021, 'service': 'thanos-query', 'timeout': '120s'}, {'name': 'thanos-swift', 'port': 6022, 'service': 'thanos-swift', 'timeout': '120s', 'sets_sni': True}, {'name': 'schema', 'port': 6023, 'service': 'schema', 'timeout': '120s', 'keepalive': '10s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox', 'port': 6024, 'timeout': '60s', 'service': 'shellbox', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-constraints', 'port': 6025, 'timeout': '10s', 'service': 'shellbox-constraints', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-media', 'port': 6026, 'timeout': '60s', 'service': 'shellbox-media', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-syntaxhighlight', 'port': 6027, 'timeout': '60s', 'service': 'shellbox-syntaxhighlight', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-timeline', 'port': 6028, 'timeout': '60s', 'service': 'shellbox-timeline', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'linkrecommendation', 'port': 6029, 'service': 'linkrecommendation', 'timeout': '10s'}, {'name': 'image-suggestion', 'port': 6030, 'service': 'image-suggestion', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'inference', 'port': 6031, 'service': 'inference', 'timeout': '60s'}, {'name': 'device-analytics', 'port': 6032, 'service': 'device-analytics', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'rest-gateway', 'port': 6033, 'service': 'rest-gateway', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'wikifunctions', 'port': 6034, 'service': 'wikifunctions', 'timeout': '15.5s', 'sets_sni': True}, {'name': 'ipoid', 'port': 6035, 'service': 'ipoid', 'timeout': '5s', 'upstream': 'ipoid.discovery.wmnet', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'shellbox-video', 'port': 6036, 'timeout': '86400s', 'idle_timeout': '86400s', 'service': 'shellbox-video', 'keepalive': '4s', 'tcp_keepalive': {'keepalive_time': 300}}, {'name': 'test-kitchen', 'port': 6037, 'service': 'test-kitchen', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'data-gateway', 'port': 6038, 'service': 'data-gateway', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'chart-renderer', 'port': 6039, 'service': 'chart-renderer', 'timeout': '30s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'tegola-vector-tiles', 'port': 6040, 'service': 'tegola-vector-tiles', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'wdqs-internal-main', 'port': 6041, 'service': 'wdqs-internal-main', 'timeout': '10s'}, {'name': 'wdqs-internal-scholarly', 'port': 6042, 'service': 'wdqs-internal-scholarly', 'timeout': '10s'}, {'name': 'eventgate-logging-external', 'port': 6043, 'timeout': '5s', 'service': 'eventgate-logging-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'swift-eqiad', 'port': 6101, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.eqiad.wmnet'}, {'name': 'swift-codfw', 'port': 6201, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.codfw.wmnet'}, {'name': 'search-chi-eqiad', 'port': 6102, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-chi-codfw', 'port': 6202, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-chi', 'port': 6302, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-omega-eqiad', 'port': 6103, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-omega-codfw', 'port': 6203, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-omega', 'port': 6303, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search-omega.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-psi-eqiad', 'port': 6104, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-psi-codfw', 'port': 6204, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-psi', 'port': 6304, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search-psi.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'cloudelastic-chi-eqiad', 'port': 6105, 'service': 'cloudelastic-chi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-omega-eqiad', 'port': 6106, 'service': 'cloudelastic-omega-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-psi-eqiad', 'port': 6107, 'service': 'cloudelastic-psi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'inference-staging', 'port': 6205, 'service': 'inference-staging', 'timeout': '60s', 'upstream': 'inference-staging.svc.codfw.wmnet'}, {'name': 'analytics-web', 'port': 6206, 'service': 'analytics-web', 'timeout': '60s', 'upstream': 'analytics-web.discovery.wmnet', 'sets_sni': True, 'http_host': 'analytics.wikimedia.org'}, {'name': 'eventgate-analytics-eqiad', 'port': 6108, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-codfw', 'port': 6208, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main-eqiad', 'port': 6109, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-main-codfw', 'port': 6209, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-analytics-external-eqiad', 'port': 6110, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-external-codfw', 'port': 6210, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-eqiad', 'port': 6111, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-codfw', 'port': 6211, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'page-analytics', 'port': 6073, 'service': 'page-analytics', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'mwapi-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mwapi', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mw-api-int', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async-ro', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'restbase-for-services', 'port': 6503, 'service': 'restbase-https', 'timeout': '122s', 'keepalive': '4s', 'upstream': 'restbase.discovery.wmnet', 'xfp': 'https'}, {'name': 'machinetranslation', 'port': 6504, 'service': 'machinetranslation', 'timeout': '120s', 'sets_sni': True}, {'name': 'mw-wikifunctions-ro', 'port': 6501, 'service': 'mw-wikifunctions', 'upstream': 'mw-wikifunctions-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https', 'sets_sni': True, 'sni_rewrites_host_header': False}, {'name': 'mw-jobrunner', 'port': 6506, 'service': 'mw-jobrunner', 'timeout': '30s', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}, 'xfp': 'https'}, {'name': 'mw-misc', 'port': 6508, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'noc', 'port': 6509, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'http_host': 'noc.wikimedia.org', 'keepalive': '4s'}, {'name': 'data-gateway-staging', 'port': 6510, 'service': 'data-gateway-staging', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True, 'upstream': 'data-gateway.k8s-staging.discovery.wmnet'}]
+    all_listeners     => [{'name': 'mathoid', 'port': 6003, 'timeout': '3s', 'service': 'mathoid'}, {'name': 'eventgate-analytics', 'port': 6004, 'timeout': '10s', 'service': 'eventgate-analytics', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main', 'port': 6005, 'timeout': '61s', 'service': 'eventgate-main', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'sessionstore', 'port': 6006, 'service': 'sessionstore', 'timeout': '2.5s'}, {'name': 'echostore', 'port': 6007, 'service': 'echostore', 'timeout': '2.5s'}, {'name': 'termbox', 'port': 6008, 'service': 'termbox', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2}, 'timeout': '25s'}, {'name': 'restbase', 'port': 6011, 'service': 'restbase-https', 'upstream': 'restbase.discovery.wmnet', 'timeout': '30s', 'keepalive': '4s', 'xfp': 'https'}, {'name': 'push-notifications', 'port': 6012, 'service': 'push-notifications', 'keepalive': '4.5s', 'timeout': '2.5s'}, {'name': 'mobileapps', 'port': 6012, 'service': 'mobileapps', 'timeout': '120s'}, {'name': 'eventgate-analytics-external', 'port': 6013, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'proton', 'port': 6013, 'service': 'proton', 'timeout': '120s'}, {'name': 'citoid', 'port': 6014, 'service': 'citoid', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'cxserver', 'port': 6015, 'service': 'cxserver', 'timeout': '120s'}, {'name': 'recommendation', 'port': 6016, 'service': 'recommendation-api', 'timeout': '120s'}, {'name': 'wikifeeds', 'port': 6017, 'service': 'wikifeeds', 'timeout': '120s'}, {'name': 'zotero', 'port': 6018, 'service': 'zotero', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'apertium', 'port': 6019, 'service': 'apertium', 'timeout': '120s', 'keepalive': '4.5s'}, {'name': 'thanos-query', 'port': 6021, 'service': 'thanos-query', 'timeout': '120s'}, {'name': 'thanos-swift', 'port': 6022, 'service': 'thanos-swift', 'timeout': '120s', 'sets_sni': True}, {'name': 'schema', 'port': 6023, 'service': 'schema', 'timeout': '120s', 'keepalive': '10s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox', 'port': 6024, 'timeout': '60s', 'service': 'shellbox', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-constraints', 'port': 6025, 'timeout': '10s', 'service': 'shellbox-constraints', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-media', 'port': 6026, 'timeout': '60s', 'service': 'shellbox-media', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-syntaxhighlight', 'port': 6027, 'timeout': '60s', 'service': 'shellbox-syntaxhighlight', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'shellbox-timeline', 'port': 6028, 'timeout': '60s', 'service': 'shellbox-timeline', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'linkrecommendation', 'port': 6029, 'service': 'linkrecommendation', 'timeout': '10s'}, {'name': 'inference', 'port': 6031, 'service': 'inference', 'timeout': '60s'}, {'name': 'device-analytics', 'port': 6032, 'service': 'device-analytics', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'rest-gateway', 'port': 6033, 'service': 'rest-gateway', 'timeout': '10s', 'keepalive': '4s'}, {'name': 'wikifunctions', 'port': 6034, 'service': 'wikifunctions', 'timeout': '15.5s', 'sets_sni': True}, {'name': 'ipoid', 'port': 6035, 'service': 'ipoid', 'timeout': '5s', 'upstream': 'ipoid.discovery.wmnet', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'shellbox-video', 'port': 6036, 'timeout': '86400s', 'idle_timeout': '86400s', 'service': 'shellbox-video', 'keepalive': '4s', 'tcp_keepalive': {'keepalive_time': 300}}, {'name': 'test-kitchen', 'port': 6037, 'service': 'test-kitchen', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'data-gateway', 'port': 6038, 'service': 'data-gateway', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'chart-renderer', 'port': 6039, 'service': 'chart-renderer', 'timeout': '30s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'tegola-vector-tiles', 'port': 6040, 'service': 'tegola-vector-tiles', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'wdqs-internal-main', 'port': 6041, 'service': 'wdqs-internal-main', 'timeout': '10s'}, {'name': 'wdqs-internal-scholarly', 'port': 6042, 'service': 'wdqs-internal-scholarly', 'timeout': '10s'}, {'name': 'eventgate-logging-external', 'port': 6043, 'timeout': '5s', 'service': 'eventgate-logging-external', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'swift-eqiad', 'port': 6101, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.eqiad.wmnet'}, {'name': 'swift-codfw', 'port': 6201, 'service': 'swift-https', 'timeout': '50s', 'upstream': 'ms-fe.svc.codfw.wmnet'}, {'name': 'search-chi-eqiad', 'port': 6102, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-chi-codfw', 'port': 6202, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-chi', 'port': 6302, 'service': 'search-https', 'timeout': '50s', 'upstream': 'search.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-omega-eqiad', 'port': 6103, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-omega-codfw', 'port': 6203, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-omega', 'port': 6303, 'service': 'search-omega-https', 'timeout': '50s', 'upstream': 'search-omega.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'search-psi-eqiad', 'port': 6104, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.eqiad.wmnet', 'keepalive': '50s'}, {'name': 'search-psi-codfw', 'port': 6204, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search.svc.codfw.wmnet', 'keepalive': '50s'}, {'name': 'search-psi', 'port': 6304, 'service': 'search-psi-https', 'timeout': '50s', 'upstream': 'search-psi.discovery.wmnet', 'keepalive': '50s', 'retry': {'retry_on': 'gateway-error'}}, {'name': 'cloudelastic-chi-eqiad', 'port': 6105, 'service': 'cloudelastic-chi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-omega-eqiad', 'port': 6106, 'service': 'cloudelastic-omega-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'cloudelastic-psi-eqiad', 'port': 6107, 'service': 'cloudelastic-psi-https', 'timeout': '50s', 'upstream': 'cloudelastic.wikimedia.org', 'keepalive': '50s'}, {'name': 'inference-staging', 'port': 6205, 'service': 'inference-staging', 'timeout': '60s', 'upstream': 'inference-staging.svc.codfw.wmnet'}, {'name': 'analytics-web', 'port': 6206, 'service': 'analytics-web', 'timeout': '60s', 'upstream': 'analytics-web.discovery.wmnet', 'sets_sni': True, 'http_host': 'analytics.wikimedia.org'}, {'name': 'eventgate-analytics-eqiad', 'port': 6108, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-codfw', 'port': 6208, 'timeout': '10s', 'service': 'eventgate-analytics', 'upstream': 'eventgate-analytics.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-main-eqiad', 'port': 6109, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-main-codfw', 'port': 6209, 'timeout': '61s', 'service': 'eventgate-main', 'upstream': 'eventgate-main.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 2, 'per_try_timeout': '20s'}}, {'name': 'eventgate-analytics-external-eqiad', 'port': 6110, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-analytics-external-codfw', 'port': 6210, 'timeout': '5s', 'service': 'eventgate-analytics-external', 'upstream': 'eventgate-analytics-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-eqiad', 'port': 6111, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.eqiad.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'eventgate-logging-external-codfw', 'port': 6211, 'timeout': '5s', 'service': 'eventgate-logging-external', 'upstream': 'eventgate-logging-external.svc.codfw.wmnet', 'keepalive': '4.5s', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'page-analytics', 'port': 6073, 'service': 'page-analytics', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True}, {'name': 'mwapi-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mwapi', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https'}, {'name': 'mw-api-int', 'port': 6501, 'service': 'mw-api-int', 'upstream': 'mw-api-int.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https'}, {'name': 'mw-api-int-async-ro', 'port': 6500, 'service': 'mw-api-int', 'upstream': 'mw-api-int-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '120s', 'xfp': 'https', 'retry': {'retry_on': '5xx', 'num_retries': 1}}, {'name': 'restbase-for-services', 'port': 6503, 'service': 'restbase-https', 'timeout': '122s', 'keepalive': '4s', 'upstream': 'restbase.discovery.wmnet', 'xfp': 'https'}, {'name': 'machinetranslation', 'port': 6504, 'service': 'machinetranslation', 'timeout': '120s', 'sets_sni': True}, {'name': 'mw-wikifunctions-ro', 'port': 6501, 'service': 'mw-wikifunctions', 'upstream': 'mw-wikifunctions-ro.discovery.wmnet', 'keepalive': '4s', 'timeout': '60s', 'xfp': 'https', 'sets_sni': True, 'sni_rewrites_host_header': False}, {'name': 'mw-jobrunner', 'port': 6506, 'service': 'mw-jobrunner', 'timeout': '30s', 'keepalive': '4s', 'retry': {'retry_on': '5xx', 'num_retries': 1}, 'xfp': 'https'}, {'name': 'mw-misc', 'port': 6508, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'keepalive': '4s'}, {'name': 'noc', 'port': 6509, 'service': 'mw-misc', 'timeout': '30s', 'sets_sni': True, 'http_host': 'noc.wikimedia.org', 'keepalive': '4s'}, {'name': 'data-gateway-staging', 'port': 6510, 'service': 'data-gateway-staging', 'timeout': '10s', 'keepalive': '4s', 'sets_sni': True, 'upstream': 'data-gateway.k8s-staging.discovery.wmnet'}]

Compilation results for deploy1003.eqiad.wmnet: System changes detected

Catalog differences

Summary

Resources only in the old catalog

Resources modified

Relevant files