{"host": "deploy1003.eqiad.wmnet", "state": "core_diff", "description": "Differences to core resources", "diff": {"full": {"total": 16422, "only_in_self": [], "only_in_other": [], "resource_diffs": [{"resource": "File[/etc/helmfile-defaults/general-staging-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-staging-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-staging-codfw.yaml\n@@ -81,77 +81,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -161,55 +161,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1889,130 +1889,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-ml-serve-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-ml-serve-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-ml-serve-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-dse-k8s-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-dse-k8s-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-dse-k8s-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-ml-serve-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-ml-serve-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-ml-serve-codfw.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-codfw.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-aux-k8s-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-aux-k8s-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-aux-k8s-codfw.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-ml-staging-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-ml-staging-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-ml-staging-codfw.yaml\n@@ -82,77 +82,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -162,55 +162,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1890,130 +1890,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-dse-k8s-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-dse-k8s-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-dse-k8s-codfw.yaml\n@@ -75,77 +75,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -155,55 +155,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1883,130 +1883,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-staging-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-staging-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-staging-eqiad.yaml\n@@ -81,77 +81,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -161,55 +161,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1889,130 +1889,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-aux-k8s-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-aux-k8s-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-aux-k8s-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}], "perc_changed": "0.07%"}, "core": {"total": 16422, "only_in_self": [], "only_in_other": [], "resource_diffs": [{"resource": "File[/etc/helmfile-defaults/general-staging-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-staging-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-staging-codfw.yaml\n@@ -81,77 +81,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -161,55 +161,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1889,130 +1889,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-ml-serve-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-ml-serve-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-ml-serve-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-codfw.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-aux-k8s-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-aux-k8s-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-aux-k8s-codfw.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-dse-k8s-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-dse-k8s-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-dse-k8s-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-ml-staging-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-ml-staging-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-ml-staging-codfw.yaml\n@@ -82,77 +82,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -162,55 +162,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1890,130 +1890,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-dse-k8s-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-dse-k8s-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-dse-k8s-codfw.yaml\n@@ -75,77 +75,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -155,55 +155,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1883,130 +1883,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-staging-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-staging-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-staging-eqiad.yaml\n@@ -81,77 +81,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -161,55 +161,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1889,130 +1889,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-aux-k8s-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-aux-k8s-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-aux-k8s-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-ml-serve-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-ml-serve-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-ml-serve-codfw.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}], "perc_changed": "0.07%"}, "main": {"total": 16422, "only_in_self": [], "only_in_other": [], "resource_diffs": [{"resource": "File[/etc/helmfile-defaults/general-staging-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-staging-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-staging-codfw.yaml\n@@ -81,77 +81,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -161,55 +161,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1889,130 +1889,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-ml-serve-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-ml-serve-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-ml-serve-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-codfw.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-aux-k8s-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-aux-k8s-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-aux-k8s-codfw.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-dse-k8s-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-dse-k8s-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-dse-k8s-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-ml-staging-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-ml-staging-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-ml-staging-codfw.yaml\n@@ -82,77 +82,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -162,55 +162,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1890,130 +1890,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-dse-k8s-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-dse-k8s-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-dse-k8s-codfw.yaml\n@@ -75,77 +75,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -155,55 +155,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1883,130 +1883,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-staging-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-staging-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-staging-eqiad.yaml\n@@ -81,77 +81,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -161,55 +161,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1889,130 +1889,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-aux-k8s-eqiad.yaml]", "content": "--- /etc/helmfile-defaults/general-aux-k8s-eqiad.yaml.orig\n+++ /etc/helmfile-defaults/general-aux-k8s-eqiad.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}, {"resource": "File[/etc/helmfile-defaults/general-ml-serve-codfw.yaml]", "content": "--- /etc/helmfile-defaults/general-ml-serve-codfw.yaml.orig\n+++ /etc/helmfile-defaults/general-ml-serve-codfw.yaml\n@@ -80,77 +80,77 @@\n instances:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper:\n _meta:\n@@ -160,55 +160,55 @@\n instances:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32\n@@ -1888,130 +1888,130 @@\n kafka_brokers:\n main-eqiad:\n - 10.64.0.101/32\n+ - 10.64.152.5/32\n+ - 10.64.16.30/32\n+ - 10.64.32.45/32\n+ - 10.64.48.37/32\n - 2620:0:861:101:10:64:0:101/128\n- - 10.64.16.30/32\n - 2620:0:861:102:10:64:16:30/128\n- - 10.64.32.45/32\n - 2620:0:861:103:10:64:32:45/128\n- - 10.64.48.37/32\n - 2620:0:861:107:10:64:48:37/128\n- - 10.64.152.5/32\n - 2620:0:861:120:10:64:152:5/128\n main-codfw:\n+ - 10.192.22.6/32\n+ - 10.192.32.4/32\n+ - 10.192.48.33/32\n+ - 10.192.48.35/32\n - 10.192.5.9/32\n+ - 2620:0:860:103:10:192:32:4/128\n+ - 2620:0:860:104:10:192:48:33/128\n+ - 2620:0:860:104:10:192:48:35/128\n - 2620:0:860:106:10:192:5:9/128\n- - 10.192.22.6/32\n - 2620:0:860:112:10:192:22:6/128\n- - 10.192.32.4/32\n- - 2620:0:860:103:10:192:32:4/128\n- - 10.192.48.33/32\n- - 2620:0:860:104:10:192:48:33/128\n- - 10.192.48.35/32\n- - 2620:0:860:104:10:192:48:35/128\n jumbo-eqiad:\n+ - 10.64.0.126/32\n - 10.64.130.10/32\n+ - 10.64.131.16/32\n+ - 10.64.132.21/32\n+ - 10.64.134.9/32\n+ - 10.64.135.16/32\n+ - 10.64.136.11/32\n+ - 10.64.154.15/32\n+ - 10.64.160.16/32\n+ - 2620:0:861:101:10:64:0:126/128\n - 2620:0:861:109:10:64:130:10/128\n- - 10.64.131.16/32\n - 2620:0:861:10a:10:64:131:16/128\n- - 10.64.132.21/32\n - 2620:0:861:10b:10:64:132:21/128\n- - 10.64.134.9/32\n - 2620:0:861:10d:10:64:134:9/128\n- - 10.64.135.16/32\n - 2620:0:861:10e:10:64:135:16/128\n- - 10.64.136.11/32\n - 2620:0:861:10f:10:64:136:11/128\n- - 10.64.154.15/32\n - 2620:0:861:122:10:64:154:15/128\n- - 10.64.160.16/32\n - 2620:0:861:128:10:64:160:16/128\n- - 10.64.0.126/32\n- - 2620:0:861:101:10:64:0:126/128\n logging-eqiad:\n+ - 10.64.131.13/32\n+ - 10.64.135.13/32\n - 10.64.16.205/32\n+ - 10.64.32.142/32\n+ - 10.64.48.66/32\n - 2620:0:861:102:10:64:16:205/128\n- - 10.64.32.142/32\n - 2620:0:861:103:10:64:32:142/128\n- - 10.64.48.66/32\n - 2620:0:861:107:10:64:48:66/128\n- - 10.64.131.13/32\n - 2620:0:861:10a:10:64:131:13/128\n- - 10.64.135.13/32\n - 2620:0:861:10e:10:64:135:13/128\n logging-codfw:\n - 10.192.0.94/32\n+ - 10.192.16.38/32\n+ - 10.192.16.50/32\n+ - 10.192.32.24/32\n+ - 10.192.48.85/32\n - 2620:0:860:101:10:192:0:94/128\n- - 10.192.16.50/32\n+ - 2620:0:860:102:10:192:16:38/128\n - 2620:0:860:102:10:192:16:50/128\n- - 10.192.32.24/32\n - 2620:0:860:103:10:192:32:24/128\n- - 10.192.16.38/32\n- - 2620:0:860:102:10:192:16:38/128\n- - 10.192.48.85/32\n - 2620:0:860:104:10:192:48:85/128\n test-eqiad:\n - 10.64.16.146/32\n+ - 10.64.16.158/32\n+ - 10.64.16.163/32\n+ - 10.64.16.164/32\n+ - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:146/128\n- - 10.64.16.158/32\n - 2620:0:861:102:10:64:16:158/128\n- - 10.64.16.163/32\n - 2620:0:861:102:10:64:16:163/128\n- - 10.64.16.164/32\n - 2620:0:861:102:10:64:16:164/128\n- - 10.64.16.165/32\n - 2620:0:861:102:10:64:16:165/128\n zookeeper_clusters:\n main-eqiad:\n - 10.64.0.207/32\n+ - 10.64.16.110/32\n+ - 10.64.48.154/32\n - 2620:0:861:101:10:64:0:207/128\n- - 10.64.16.110/32\n - 2620:0:861:102:10:64:16:110/128\n- - 10.64.48.154/32\n - 2620:0:861:107:10:64:48:154/128\n main-codfw:\n - 10.192.16.45/32\n+ - 10.192.32.52/32\n+ - 10.192.48.59/32\n - 2620:0:860:102:10:192:16:45/128\n- - 10.192.32.52/32\n - 2620:0:860:103:10:192:32:52/128\n- - 10.192.48.59/32\n - 2620:0:860:104:10:192:48:59/128\n flink-eqiad:\n+ - 10.64.0.8/32\n - 10.64.16.9/32\n+ - 10.64.32.41/32\n+ - 2620:0:861:101:10:64:0:8/128\n - 2620:0:861:102:10:64:16:9/128\n- - 10.64.0.8/32\n- - 2620:0:861:101:10:64:0:8/128\n- - 10.64.32.41/32\n - 2620:0:861:103:10:64:32:41/128\n flink-codfw:\n - 10.192.16.227/32\n+ - 10.192.32.179/32\n+ - 10.192.48.219/32\n - 2620:0:860:102:10:192:16:227/128\n- - 10.192.32.179/32\n - 2620:0:860:103:10:192:32:179/128\n- - 10.192.48.219/32\n - 2620:0:860:104:10:192:48:219/128\n druid-analytics-eqiad:\n+ - 10.64.21.11/32\n - 10.64.5.17/32\n+ - 10.64.53.13/32\n - 2620:0:861:104:10:64:5:17/128\n- - 10.64.21.11/32\n - 2620:0:861:105:10:64:21:11/128\n- - 10.64.53.13/32\n - 2620:0:861:108:10:64:53:13/128\n druid-public-eqiad:\n - 10.64.131.9/32\n+ - 10.64.132.12/32\n+ - 10.64.135.9/32\n - 2620:0:861:10a:10:64:131:9/128\n- - 10.64.132.12/32\n - 2620:0:861:10b:10:64:132:12/128\n- - 10.64.135.9/32\n - 2620:0:861:10e:10:64:135:9/128\n druid-analytics-test-eqiad:\n - 10.64.53.6/32\n - 2620:0:861:108:10:64:53:6/128\n analytics-eqiad:\n+ - 10.64.21.20/32\n+ - 10.64.36.6/32\n - 10.64.5.6/32\n - 2620:0:861:104:10:64:5:6/128\n- - 10.64.21.20/32\n - 2620:0:861:105:10:64:21:20/128\n- - 10.64.36.6/32\n - 2620:0:861:106:10:64:36:6/128\n test-eqiad:\n - 10.64.16.145/32"}], "perc_changed": "0.07%"}}}