Reverting Consul changes for now, it's too flaky in CI

beautifulentropy · beautifulentropy · commit 1d0efc3a5b22 · 2025-06-17T16:39:17.000-04:00
diff --git a/test/config-next/akamai-purger.json b/test/config-next/akamai-purger.json
@@ -26,7 +26,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/ca.json b/test/config-next/ca.json
@@ -26,7 +26,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/crl-storer.json b/test/config-next/crl-storer.json
@@ -15,7 +15,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/email-exporter.json b/test/config-next/email-exporter.json
@@ -12,7 +12,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/nonce-a.json b/test/config-next/nonce-a.json
@@ -22,7 +22,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/nonce-b.json b/test/config-next/nonce-b.json
@@ -22,7 +22,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/publisher.json b/test/config-next/publisher.json
@@ -30,7 +30,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/ra.json b/test/config-next/ra.json
@@ -151,7 +151,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/remoteva-a.json b/test/config-next/remoteva-a.json
@@ -29,7 +29,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/remoteva-b.json b/test/config-next/remoteva-b.json
@@ -29,7 +29,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/remoteva-c.json b/test/config-next/remoteva-c.json
@@ -29,7 +29,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config-next/sa.json b/test/config-next/sa.json
@@ -40,8 +40,8 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
-						"health-checker.boulder"
+						"health-checker.boulder",
+						"consul.boulder"
 					]
 				}
 			}
diff --git a/test/config-next/va.json b/test/config-next/va.json
@@ -31,7 +31,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/akamai-purger.json b/test/config/akamai-purger.json
@@ -24,7 +24,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/ca.json b/test/config/ca.json
@@ -27,7 +27,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/crl-storer.json b/test/config/crl-storer.json
@@ -17,7 +17,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/email-exporter.json b/test/config/email-exporter.json
@@ -12,7 +12,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/nonce-a.json b/test/config/nonce-a.json
@@ -20,7 +20,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/nonce-b.json b/test/config/nonce-b.json
@@ -20,7 +20,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/publisher.json b/test/config/publisher.json
@@ -30,7 +30,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/ra.json b/test/config/ra.json
@@ -150,7 +150,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/remoteva-a.json b/test/config/remoteva-a.json
@@ -33,7 +33,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/remoteva-b.json b/test/config/remoteva-b.json
@@ -33,7 +33,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/remoteva-c.json b/test/config/remoteva-c.json
@@ -33,7 +33,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/config/sa.json b/test/config/sa.json
@@ -42,8 +42,8 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
-						"health-checker.boulder"
+						"health-checker.boulder",
+						"consul.boulder"
 					]
 				}
 			}
diff --git a/test/config/va.json b/test/config/va.json
@@ -32,7 +32,6 @@
 				},
 				"grpc.health.v1.Health": {
 					"clientNames": [
-						"consul.boulder",
 						"health-checker.boulder"
 					]
 				}
diff --git a/test/consul/config.hcl b/test/consul/config.hcl
diff --git a/test/integration/testdata/akamai-purger-queue-drain-config.json b/test/integration/testdata/akamai-purger-queue-drain-config.json
diff --git a/test/startservers.py b/test/startservers.py

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`},`
`27`	`27`	`"grpc.health.v1.Health": {`
`28`	`28`	`"clientNames": [`
`29`		`- "consul.boulder",`
`30`	`29`	`"health-checker.boulder"`
`31`	`30`	`]`
`32`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`},`
`16`	`16`	`"grpc.health.v1.Health": {`
`17`	`17`	`"clientNames": [`
`18`		`- "consul.boulder",`
`19`	`18`	`"health-checker.boulder"`
`20`	`19`	`]`
`21`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`	`},`
`13`	`13`	`"grpc.health.v1.Health": {`
`14`	`14`	`"clientNames": [`
`15`		`- "consul.boulder",`
`16`	`15`	`"health-checker.boulder"`
`17`	`16`	`]`
`18`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`},`
`23`	`23`	`"grpc.health.v1.Health": {`
`24`	`24`	`"clientNames": [`
`25`		`- "consul.boulder",`
`26`	`25`	`"health-checker.boulder"`
`27`	`26`	`]`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@`
`30`	`30`	`},`
`31`	`31`	`"grpc.health.v1.Health": {`
`32`	`32`	`"clientNames": [`
`33`		`- "consul.boulder",`
`34`	`33`	`"health-checker.boulder"`
`35`	`34`	`]`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,6 @@`
`151`	`151`	`},`
`152`	`152`	`"grpc.health.v1.Health": {`
`153`	`153`	`"clientNames": [`
`154`		`- "consul.boulder",`
`155`	`154`	`"health-checker.boulder"`
`156`	`155`	`]`
`157`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@`
`29`	`29`	`},`
`30`	`30`	`"grpc.health.v1.Health": {`
`31`	`31`	`"clientNames": [`
`32`		`- "consul.boulder",`
`33`	`32`	`"health-checker.boulder"`
`34`	`33`	`]`
`35`	`34`	`}`