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

You can retrieve this result from host.json.

Catalog differences

Summary

Total Resources:	16422
Resources added:	0
Resources removed:	0
Resources modified:	11
Change percentage:	0.07%

Resources modified

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
@@ -81,77 +81,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -161,55 +161,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1889,130 +1889,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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

Content differences:

--- /etc/helmfile-defaults/general-eqiad.yaml.orig
+++ /etc/helmfile-defaults/general-eqiad.yaml
@@ -80,77 +80,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -160,55 +160,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1888,130 +1888,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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
@@ -80,77 +80,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -160,55 +160,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1888,130 +1888,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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
@@ -80,77 +80,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -160,55 +160,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1888,130 +1888,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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
@@ -80,77 +80,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -160,55 +160,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1888,130 +1888,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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

Content differences:

--- /etc/helmfile-defaults/general-codfw.yaml.orig
+++ /etc/helmfile-defaults/general-codfw.yaml
@@ -80,77 +80,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -160,55 +160,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1888,130 +1888,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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
@@ -80,77 +80,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -160,55 +160,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1888,130 +1888,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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
@@ -82,77 +82,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -162,55 +162,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1890,130 +1890,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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
@@ -75,77 +75,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -155,55 +155,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1883,130 +1883,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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
@@ -81,77 +81,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -161,55 +161,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1889,130 +1889,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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
@@ -80,77 +80,77 @@
     instances:
       main-eqiad:
       - 10.64.0.101/32
+      - 10.64.152.5/32
+      - 10.64.16.30/32
+      - 10.64.32.45/32
+      - 10.64.48.37/32
       - 2620:0:861:101:10:64:0:101/128
-      - 10.64.16.30/32
       - 2620:0:861:102:10:64:16:30/128
-      - 10.64.32.45/32
       - 2620:0:861:103:10:64:32:45/128
-      - 10.64.48.37/32
       - 2620:0:861:107:10:64:48:37/128
-      - 10.64.152.5/32
       - 2620:0:861:120:10:64:152:5/128
       main-codfw:
+      - 10.192.22.6/32
+      - 10.192.32.4/32
+      - 10.192.48.33/32
+      - 10.192.48.35/32
       - 10.192.5.9/32
+      - 2620:0:860:103:10:192:32:4/128
+      - 2620:0:860:104:10:192:48:33/128
+      - 2620:0:860:104:10:192:48:35/128
       - 2620:0:860:106:10:192:5:9/128
-      - 10.192.22.6/32
       - 2620:0:860:112:10:192:22:6/128
-      - 10.192.32.4/32
-      - 2620:0:860:103:10:192:32:4/128
-      - 10.192.48.33/32
-      - 2620:0:860:104:10:192:48:33/128
-      - 10.192.48.35/32
-      - 2620:0:860:104:10:192:48:35/128
       jumbo-eqiad:
+      - 10.64.0.126/32
       - 10.64.130.10/32
+      - 10.64.131.16/32
+      - 10.64.132.21/32
+      - 10.64.134.9/32
+      - 10.64.135.16/32
+      - 10.64.136.11/32
+      - 10.64.154.15/32
+      - 10.64.160.16/32
+      - 2620:0:861:101:10:64:0:126/128
       - 2620:0:861:109:10:64:130:10/128
-      - 10.64.131.16/32
       - 2620:0:861:10a:10:64:131:16/128
-      - 10.64.132.21/32
       - 2620:0:861:10b:10:64:132:21/128
-      - 10.64.134.9/32
       - 2620:0:861:10d:10:64:134:9/128
-      - 10.64.135.16/32
       - 2620:0:861:10e:10:64:135:16/128
-      - 10.64.136.11/32
       - 2620:0:861:10f:10:64:136:11/128
-      - 10.64.154.15/32
       - 2620:0:861:122:10:64:154:15/128
-      - 10.64.160.16/32
       - 2620:0:861:128:10:64:160:16/128
-      - 10.64.0.126/32
-      - 2620:0:861:101:10:64:0:126/128
       logging-eqiad:
+      - 10.64.131.13/32
+      - 10.64.135.13/32
       - 10.64.16.205/32
+      - 10.64.32.142/32
+      - 10.64.48.66/32
       - 2620:0:861:102:10:64:16:205/128
-      - 10.64.32.142/32
       - 2620:0:861:103:10:64:32:142/128
-      - 10.64.48.66/32
       - 2620:0:861:107:10:64:48:66/128
-      - 10.64.131.13/32
       - 2620:0:861:10a:10:64:131:13/128
-      - 10.64.135.13/32
       - 2620:0:861:10e:10:64:135:13/128
       logging-codfw:
       - 10.192.0.94/32
+      - 10.192.16.38/32
+      - 10.192.16.50/32
+      - 10.192.32.24/32
+      - 10.192.48.85/32
       - 2620:0:860:101:10:192:0:94/128
-      - 10.192.16.50/32
+      - 2620:0:860:102:10:192:16:38/128
       - 2620:0:860:102:10:192:16:50/128
-      - 10.192.32.24/32
       - 2620:0:860:103:10:192:32:24/128
-      - 10.192.16.38/32
-      - 2620:0:860:102:10:192:16:38/128
-      - 10.192.48.85/32
       - 2620:0:860:104:10:192:48:85/128
       test-eqiad:
       - 10.64.16.146/32
+      - 10.64.16.158/32
+      - 10.64.16.163/32
+      - 10.64.16.164/32
+      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:146/128
-      - 10.64.16.158/32
       - 2620:0:861:102:10:64:16:158/128
-      - 10.64.16.163/32
       - 2620:0:861:102:10:64:16:163/128
-      - 10.64.16.164/32
       - 2620:0:861:102:10:64:16:164/128
-      - 10.64.16.165/32
       - 2620:0:861:102:10:64:16:165/128
   zookeeper:
     _meta:
@@ -160,55 +160,55 @@
     instances:
       main-eqiad:
       - 10.64.0.207/32
+      - 10.64.16.110/32
+      - 10.64.48.154/32
       - 2620:0:861:101:10:64:0:207/128
-      - 10.64.16.110/32
       - 2620:0:861:102:10:64:16:110/128
-      - 10.64.48.154/32
       - 2620:0:861:107:10:64:48:154/128
       main-codfw:
       - 10.192.16.45/32
+      - 10.192.32.52/32
+      - 10.192.48.59/32
       - 2620:0:860:102:10:192:16:45/128
-      - 10.192.32.52/32
       - 2620:0:860:103:10:192:32:52/128
-      - 10.192.48.59/32
       - 2620:0:860:104:10:192:48:59/128
       flink-eqiad:
+      - 10.64.0.8/32
       - 10.64.16.9/32
+      - 10.64.32.41/32
+      - 2620:0:861:101:10:64:0:8/128
       - 2620:0:861:102:10:64:16:9/128
-      - 10.64.0.8/32
-      - 2620:0:861:101:10:64:0:8/128
-      - 10.64.32.41/32
       - 2620:0:861:103:10:64:32:41/128
       flink-codfw:
       - 10.192.16.227/32
+      - 10.192.32.179/32
+      - 10.192.48.219/32
       - 2620:0:860:102:10:192:16:227/128
-      - 10.192.32.179/32
       - 2620:0:860:103:10:192:32:179/128
-      - 10.192.48.219/32
       - 2620:0:860:104:10:192:48:219/128
       druid-analytics-eqiad:
+      - 10.64.21.11/32
       - 10.64.5.17/32
+      - 10.64.53.13/32
       - 2620:0:861:104:10:64:5:17/128
-      - 10.64.21.11/32
       - 2620:0:861:105:10:64:21:11/128
-      - 10.64.53.13/32
       - 2620:0:861:108:10:64:53:13/128
       druid-public-eqiad:
       - 10.64.131.9/32
+      - 10.64.132.12/32
+      - 10.64.135.9/32
       - 2620:0:861:10a:10:64:131:9/128
-      - 10.64.132.12/32
       - 2620:0:861:10b:10:64:132:12/128
-      - 10.64.135.9/32
       - 2620:0:861:10e:10:64:135:9/128
       druid-analytics-test-eqiad:
       - 10.64.53.6/32
       - 2620:0:861:108:10:64:53:6/128
       analytics-eqiad:
+      - 10.64.21.20/32
+      - 10.64.36.6/32
       - 10.64.5.6/32
       - 2620:0:861:104:10:64:5:6/128
-      - 10.64.21.20/32
       - 2620:0:861:105:10:64:21:20/128
-      - 10.64.36.6/32
       - 2620:0:861:106:10:64:36:6/128
       test-eqiad:
       - 10.64.16.145/32
@@ -1888,130 +1888,130 @@
 kafka_brokers:
   main-eqiad:
   - 10.64.0.101/32
+  - 10.64.152.5/32
+  - 10.64.16.30/32
+  - 10.64.32.45/32
+  - 10.64.48.37/32
   - 2620:0:861:101:10:64:0:101/128
-  - 10.64.16.30/32
   - 2620:0:861:102:10:64:16:30/128
-  - 10.64.32.45/32
   - 2620:0:861:103:10:64:32:45/128
-  - 10.64.48.37/32
   - 2620:0:861:107:10:64:48:37/128
-  - 10.64.152.5/32
   - 2620:0:861:120:10:64:152:5/128
   main-codfw:
+  - 10.192.22.6/32
+  - 10.192.32.4/32
+  - 10.192.48.33/32
+  - 10.192.48.35/32
   - 10.192.5.9/32
+  - 2620:0:860:103:10:192:32:4/128
+  - 2620:0:860:104:10:192:48:33/128
+  - 2620:0:860:104:10:192:48:35/128
   - 2620:0:860:106:10:192:5:9/128
-  - 10.192.22.6/32
   - 2620:0:860:112:10:192:22:6/128
-  - 10.192.32.4/32
-  - 2620:0:860:103:10:192:32:4/128
-  - 10.192.48.33/32
-  - 2620:0:860:104:10:192:48:33/128
-  - 10.192.48.35/32
-  - 2620:0:860:104:10:192:48:35/128
   jumbo-eqiad:
+  - 10.64.0.126/32
   - 10.64.130.10/32
+  - 10.64.131.16/32
+  - 10.64.132.21/32
+  - 10.64.134.9/32
+  - 10.64.135.16/32
+  - 10.64.136.11/32
+  - 10.64.154.15/32
+  - 10.64.160.16/32
+  - 2620:0:861:101:10:64:0:126/128
   - 2620:0:861:109:10:64:130:10/128
-  - 10.64.131.16/32
   - 2620:0:861:10a:10:64:131:16/128
-  - 10.64.132.21/32
   - 2620:0:861:10b:10:64:132:21/128
-  - 10.64.134.9/32
   - 2620:0:861:10d:10:64:134:9/128
-  - 10.64.135.16/32
   - 2620:0:861:10e:10:64:135:16/128
-  - 10.64.136.11/32
   - 2620:0:861:10f:10:64:136:11/128
-  - 10.64.154.15/32
   - 2620:0:861:122:10:64:154:15/128
-  - 10.64.160.16/32
   - 2620:0:861:128:10:64:160:16/128
-  - 10.64.0.126/32
-  - 2620:0:861:101:10:64:0:126/128
   logging-eqiad:
+  - 10.64.131.13/32
+  - 10.64.135.13/32
   - 10.64.16.205/32
+  - 10.64.32.142/32
+  - 10.64.48.66/32
   - 2620:0:861:102:10:64:16:205/128
-  - 10.64.32.142/32
   - 2620:0:861:103:10:64:32:142/128
-  - 10.64.48.66/32
   - 2620:0:861:107:10:64:48:66/128
-  - 10.64.131.13/32
   - 2620:0:861:10a:10:64:131:13/128
-  - 10.64.135.13/32
   - 2620:0:861:10e:10:64:135:13/128
   logging-codfw:
   - 10.192.0.94/32
+  - 10.192.16.38/32
+  - 10.192.16.50/32
+  - 10.192.32.24/32
+  - 10.192.48.85/32
   - 2620:0:860:101:10:192:0:94/128
-  - 10.192.16.50/32
+  - 2620:0:860:102:10:192:16:38/128
   - 2620:0:860:102:10:192:16:50/128
-  - 10.192.32.24/32
   - 2620:0:860:103:10:192:32:24/128
-  - 10.192.16.38/32
-  - 2620:0:860:102:10:192:16:38/128
-  - 10.192.48.85/32
   - 2620:0:860:104:10:192:48:85/128
   test-eqiad:
   - 10.64.16.146/32
+  - 10.64.16.158/32
+  - 10.64.16.163/32
+  - 10.64.16.164/32
+  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:146/128
-  - 10.64.16.158/32
   - 2620:0:861:102:10:64:16:158/128
-  - 10.64.16.163/32
   - 2620:0:861:102:10:64:16:163/128
-  - 10.64.16.164/32
   - 2620:0:861:102:10:64:16:164/128
-  - 10.64.16.165/32
   - 2620:0:861:102:10:64:16:165/128
 zookeeper_clusters:
   main-eqiad:
   - 10.64.0.207/32
+  - 10.64.16.110/32
+  - 10.64.48.154/32
   - 2620:0:861:101:10:64:0:207/128
-  - 10.64.16.110/32
   - 2620:0:861:102:10:64:16:110/128
-  - 10.64.48.154/32
   - 2620:0:861:107:10:64:48:154/128
   main-codfw:
   - 10.192.16.45/32
+  - 10.192.32.52/32
+  - 10.192.48.59/32
   - 2620:0:860:102:10:192:16:45/128
-  - 10.192.32.52/32
   - 2620:0:860:103:10:192:32:52/128
-  - 10.192.48.59/32
   - 2620:0:860:104:10:192:48:59/128
   flink-eqiad:
+  - 10.64.0.8/32
   - 10.64.16.9/32
+  - 10.64.32.41/32
+  - 2620:0:861:101:10:64:0:8/128
   - 2620:0:861:102:10:64:16:9/128
-  - 10.64.0.8/32
-  - 2620:0:861:101:10:64:0:8/128
-  - 10.64.32.41/32
   - 2620:0:861:103:10:64:32:41/128
   flink-codfw:
   - 10.192.16.227/32
+  - 10.192.32.179/32
+  - 10.192.48.219/32
   - 2620:0:860:102:10:192:16:227/128
-  - 10.192.32.179/32
   - 2620:0:860:103:10:192:32:179/128
-  - 10.192.48.219/32
   - 2620:0:860:104:10:192:48:219/128
   druid-analytics-eqiad:
+  - 10.64.21.11/32
   - 10.64.5.17/32
+  - 10.64.53.13/32
   - 2620:0:861:104:10:64:5:17/128
-  - 10.64.21.11/32
   - 2620:0:861:105:10:64:21:11/128
-  - 10.64.53.13/32
   - 2620:0:861:108:10:64:53:13/128
   druid-public-eqiad:
   - 10.64.131.9/32
+  - 10.64.132.12/32
+  - 10.64.135.9/32
   - 2620:0:861:10a:10:64:131:9/128
-  - 10.64.132.12/32
   - 2620:0:861:10b:10:64:132:12/128
-  - 10.64.135.9/32
   - 2620:0:861:10e:10:64:135:9/128
   druid-analytics-test-eqiad:
   - 10.64.53.6/32
   - 2620:0:861:108:10:64:53:6/128
   analytics-eqiad:
+  - 10.64.21.20/32
+  - 10.64.36.6/32
   - 10.64.5.6/32
   - 2620:0:861:104:10:64:5:6/128
-  - 10.64.21.20/32
   - 2620:0:861:105:10:64:21:20/128
-  - 10.64.36.6/32
   - 2620:0:861:106:10:64:36:6/128
   test-eqiad:
   - 10.64.16.145/32

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

Catalog differences

Summary

Resources modified

Relevant files