Actually update correctly from merges

hashicorp · Apr 4, 2024 · 369cc73 · 369cc73
1 parent 646368f
commit 369cc73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/control-plane/go.mod b/control-plane/go.mod
@@ -1,6 +1,6 @@
 module github.com/hashicorp/consul-k8s/control-plane
 
-replace github.com/hashicorp/consul/api => github.com/hashicorp/consul/api v1.10.1-0.20240312203720-262f4358003f
+replace github.com/hashicorp/consul/api => github.com/hashicorp/consul/api v1.10.1-0.20240404192841-1360041d3855
 
 require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
@@ -13,7 +13,7 @@ require (
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/hashicorp/consul-k8s/control-plane/cni v0.0.0-20240226161840-f3842c41cb2b
 	github.com/hashicorp/consul-server-connection-manager v0.1.6
-	github.com/hashicorp/consul/api v1.28.2
+	github.com/hashicorp/consul/api v1.10.1-0.20240404192841-1360041d3855
 	github.com/hashicorp/consul/proto-public v0.6.0
 	github.com/hashicorp/consul/sdk v0.16.0
 	github.com/hashicorp/go-bexpr v0.1.11

diff --git a/control-plane/go.sum b/control-plane/go.sum
@@ -275,8 +275,8 @@ github.com/hashicorp/consul-k8s/control-plane/cni v0.0.0-20240226161840-f3842c41
 github.com/hashicorp/consul-k8s/control-plane/cni v0.0.0-20240226161840-f3842c41cb2b/go.mod h1:9NKJHOcgmz/6P2y6MegNIOXhIKE/0ils/mHWd5sZgoU=
 github.com/hashicorp/consul-server-connection-manager v0.1.6 h1:ktj8Fi+dRXn9hhM+FXsfEJayhzzgTqfH08Ne5M6Fmug=
 github.com/hashicorp/consul-server-connection-manager v0.1.6/go.mod h1:HngMIv57MT+pqCVeRQMa1eTB5dqnyMm8uxjyv+Hn8cs=
-github.com/hashicorp/consul/api v1.10.1-0.20240312203720-262f4358003f h1:8clIrMnJtO5ab5Kd1qF19s9s581cyGYhQxfPLVRaFZs=
-github.com/hashicorp/consul/api v1.10.1-0.20240312203720-262f4358003f/go.mod h1:JnWx0qZd1Ffeoa42yVAxzv7/v7eaZyptkw0dG9F/gF4=
+github.com/hashicorp/consul/api v1.10.1-0.20240404192841-1360041d3855 h1:8nKfjatW6616uwWBUl7jF8cOEd9+Zh1Dd5XN/tjrgbI=
+github.com/hashicorp/consul/api v1.10.1-0.20240404192841-1360041d3855/go.mod h1:JnWx0qZd1Ffeoa42yVAxzv7/v7eaZyptkw0dG9F/gF4=
 github.com/hashicorp/consul/proto-public v0.6.0 h1:9qrBujmoTB5gQQ84kQO+YWvhjgYoYBNrOoHdo4cpHHM=
 github.com/hashicorp/consul/proto-public v0.6.0/go.mod h1:JF6983XNCzvw4wDNOLEwLqOq2IPw7iyT+pkswHSz08U=
 github.com/hashicorp/consul/sdk v0.16.0 h1:SE9m0W6DEfgIVCJX7xU+iv/hUl4m/nxqMTnCdMxDpJ8=