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

You can retrieve this result from host.json.

Catalog differences

Summary

Total Resources:	17284
Resources added:	24
Resources removed:	0
Resources modified:	13
Change percentage:	0.21%

Resources only in the new catalog

File[/etc/envoy/listeners.d/50-shellbox_constraints_codfw.yaml]
File[/etc/envoy/clusters.d/50-shellbox_timeline_codfw_cluster.yaml]
File[/etc/envoy/listeners.d/50-shellbox_constraints_eqiad.yaml]
File[/etc/envoy/listeners.d/50-shellbox_timeline_eqiad.yaml]
File[/etc/envoy/clusters.d/50-shellbox_syntaxhighlight_codfw_cluster.yaml]
File[/etc/envoy/listeners.d/50-shellbox_eqiad.yaml]
File[/etc/envoy/listeners.d/50-shellbox_video_codfw.yaml]
File[/etc/envoy/clusters.d/50-shellbox_video_codfw_cluster.yaml]
File[/etc/envoy/listeners.d/50-shellbox_media_eqiad.yaml]
File[/etc/envoy/clusters.d/50-shellbox_constraints_eqiad_cluster.yaml]
File[/etc/envoy/clusters.d/50-shellbox_timeline_eqiad_cluster.yaml]
File[/etc/envoy/clusters.d/50-shellbox_codfw_cluster.yaml]
File[/etc/envoy/listeners.d/50-shellbox_syntaxhighlight_codfw.yaml]
File[/etc/envoy/clusters.d/50-shellbox_eqiad_cluster.yaml]
File[/etc/envoy/listeners.d/50-shellbox_video_eqiad.yaml]
File[/etc/envoy/clusters.d/50-shellbox_syntaxhighlight_eqiad_cluster.yaml]
File[/etc/envoy/clusters.d/50-shellbox_media_codfw_cluster.yaml]
File[/etc/envoy/listeners.d/50-shellbox_syntaxhighlight_eqiad.yaml]
File[/etc/envoy/clusters.d/50-shellbox_constraints_codfw_cluster.yaml]
File[/etc/envoy/listeners.d/50-shellbox_media_codfw.yaml]
File[/etc/envoy/listeners.d/50-shellbox_timeline_codfw.yaml]
File[/etc/envoy/clusters.d/50-shellbox_video_eqiad_cluster.yaml]
File[/etc/envoy/listeners.d/50-shellbox_codfw.yaml]
File[/etc/envoy/clusters.d/50-shellbox_media_eqiad_cluster.yaml]

Resources modified

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
@@ -1755,6 +1755,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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
@@ -1755,6 +1755,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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
@@ -1757,6 +1757,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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
@@ -1756,6 +1756,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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
@@ -1755,6 +1755,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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
@@ -1755,6 +1755,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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

Content differences:

--- /etc/helmfile-defaults/sophroid/listeners.yaml.orig
+++ /etc/helmfile-defaults/sophroid/listeners.yaml
@@ -418,6 +418,114 @@
   timeout: 10s
   keepalive: 4s
   sets_sni: true
+- name: shellbox-eqiad
+  port: 6124
+  timeout: 60s
+  service: shellbox
+  upstream: shellbox.svc.eqiad.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-constraints-eqiad
+  port: 6125
+  timeout: 10s
+  service: shellbox-constraints
+  upstream: shellbox-constraints.svc.eqiad.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-media-eqiad
+  port: 6126
+  timeout: 60s
+  service: shellbox-media
+  upstream: shellbox-media.svc.eqiad.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-syntaxhighlight-eqiad
+  port: 6127
+  timeout: 60s
+  service: shellbox-syntaxhighlight
+  upstream: shellbox-syntaxhighlight.svc.eqiad.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-timeline-eqiad
+  port: 6128
+  timeout: 60s
+  service: shellbox-timeline
+  upstream: shellbox-timeline.svc.eqiad.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-video-eqiad
+  port: 6136
+  timeout: 86400s
+  idle_timeout: 86400s
+  service: shellbox-video
+  upstream: shellbox-video.svc.eqiad.wmnet
+  keepalive: 4s
+  tcp_keepalive:
+    keepalive_time: 300
+- name: shellbox-codfw
+  port: 6224
+  timeout: 60s
+  service: shellbox
+  upstream: shellbox.svc.codfw.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-constraints-codfw
+  port: 6225
+  timeout: 10s
+  service: shellbox-constraints
+  upstream: shellbox-constraints.svc.codfw.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-media-codfw
+  port: 6226
+  timeout: 60s
+  service: shellbox-media
+  upstream: shellbox-media.svc.codfw.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-syntaxhighlight-codfw
+  port: 6227
+  timeout: 60s
+  service: shellbox-syntaxhighlight
+  upstream: shellbox-syntaxhighlight.svc.codfw.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-timeline-codfw
+  port: 6228
+  timeout: 60s
+  service: shellbox-timeline
+  upstream: shellbox-timeline.svc.codfw.wmnet
+  keepalive: 4s
+  retry:
+    retry_on: 5xx
+    num_retries: 1
+- name: shellbox-video-codfw
+  port: 6236
+  timeout: 86400s
+  idle_timeout: 86400s
+  service: shellbox-video
+  upstream: shellbox-video.svc.codfw.wmnet
+  keepalive: 4s
+  tcp_keepalive:
+    keepalive_time: 300
 - name: mwapi-async
   port: 6500
   service: mw-api-int
@@ -594,6 +702,18 @@
 - shellbox-syntaxhighlight
 - shellbox-timeline
 - shellbox-video
+- shellbox-eqiad
+- shellbox-constraints-eqiad
+- shellbox-media-eqiad
+- shellbox-syntaxhighlight-eqiad
+- shellbox-timeline-eqiad
+- shellbox-video-eqiad
+- shellbox-codfw
+- shellbox-constraints-codfw
+- shellbox-media-codfw
+- shellbox-syntaxhighlight-codfw
+- shellbox-timeline-codfw
+- shellbox-video-codfw
 - swift-eqiad
 - swift-codfw
 - search-chi-eqiad

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
@@ -1756,6 +1756,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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
@@ -1755,6 +1755,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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

Content differences:

--- /etc/helmfile-defaults/general-eqiad.yaml.orig
+++ /etc/helmfile-defaults/general-eqiad.yaml
@@ -1755,6 +1755,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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

Content differences:

--- /etc/helmfile-defaults/mediawiki/tlsproxy.yaml.orig
+++ /etc/helmfile-defaults/mediawiki/tlsproxy.yaml
@@ -18,6 +18,18 @@
   - shellbox-syntaxhighlight
   - shellbox-timeline
   - shellbox-video
+  - shellbox-eqiad
+  - shellbox-constraints-eqiad
+  - shellbox-media-eqiad
+  - shellbox-syntaxhighlight-eqiad
+  - shellbox-timeline-eqiad
+  - shellbox-video-eqiad
+  - shellbox-codfw
+  - shellbox-constraints-codfw
+  - shellbox-media-codfw
+  - shellbox-syntaxhighlight-codfw
+  - shellbox-timeline-codfw
+  - shellbox-video-codfw
   - swift-eqiad
   - swift-codfw
   - search-chi-eqiad

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
@@ -1755,6 +1755,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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

Content differences:

--- /etc/helmfile-defaults/general-codfw.yaml.orig
+++ /etc/helmfile-defaults/general-codfw.yaml
@@ -1755,6 +1755,174 @@
       port: 30443
       encryption: true
       sets_sni: true
+      keepalive: 4s
+  shellbox-eqiad:
+    port: 6124
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.eqiad.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-eqiad:
+    port: 6125
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.eqiad.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-eqiad:
+    port: 6126
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.eqiad.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-eqiad:
+    port: 6127
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.eqiad.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-eqiad:
+    port: 6128
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.eqiad.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-eqiad:
+    port: 6136
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.eqiad.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
+      keepalive: 4s
+  shellbox-codfw:
+    port: 6224
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.51/32
+      - 10.2.2.51/32
+      address: shellbox.svc.codfw.wmnet
+      port: 4008
+      encryption: true
+      keepalive: 4s
+  shellbox-constraints-codfw:
+    port: 6225
+    timeout: 10s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.61/32
+      - 10.2.2.61/32
+      address: shellbox-constraints.svc.codfw.wmnet
+      port: 4010
+      encryption: true
+      keepalive: 4s
+  shellbox-media-codfw:
+    port: 6226
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.64/32
+      - 10.2.2.64/32
+      address: shellbox-media.svc.codfw.wmnet
+      port: 4015
+      encryption: true
+      keepalive: 4s
+  shellbox-syntaxhighlight-codfw:
+    port: 6227
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.65/32
+      - 10.2.2.65/32
+      address: shellbox-syntaxhighlight.svc.codfw.wmnet
+      port: 4014
+      encryption: true
+      keepalive: 4s
+  shellbox-timeline-codfw:
+    port: 6228
+    timeout: 60s
+    retry_policy:
+      retry_on: 5xx
+      num_retries: 1
+    upstream:
+      ips:
+      - 10.2.1.66/32
+      - 10.2.2.66/32
+      address: shellbox-timeline.svc.codfw.wmnet
+      port: 4012
+      encryption: true
+      keepalive: 4s
+  shellbox-video-codfw:
+    port: 6236
+    timeout: 86400s
+    upstream:
+      ips:
+      - 10.2.1.68/32
+      - 10.2.2.68/32
+      address: shellbox-video.svc.codfw.wmnet
+      port: 4080
+      encryption: true
+      tcp_keepalive:
+        keepalive_time: 300
+      idle_timeout: 86400s
       keepalive: 4s
   mwapi-async:
     port: 6500

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

Catalog differences

Summary

Resources only in the new catalog

Resources modified

Relevant files