From fc1e4fe53e0054fa6028e1c1411dd931aca744d5 Mon Sep 17 00:00:00 2001 From: Ashwin Venkatesh Date: Mon, 13 Jun 2022 17:58:10 -0400 Subject: [PATCH] Address review comment to Peering. --- charts/consul/test/unit/connect-inject-clusterrole.bats | 4 ++-- control-plane/go.mod | 2 -- control-plane/main.go | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/charts/consul/test/unit/connect-inject-clusterrole.bats b/charts/consul/test/unit/connect-inject-clusterrole.bats index 7939755f81..93e83b5957 100644 --- a/charts/consul/test/unit/connect-inject-clusterrole.bats +++ b/charts/consul/test/unit/connect-inject-clusterrole.bats @@ -75,7 +75,7 @@ load _helpers --set 'client.enabled=true' \ --set 'connectInject.enabled=true' \ . | tee /dev/stderr | - yq -r '.rules[1]' | tee /dev/stderr) + yq -r '.rules[2]' | tee /dev/stderr) local actual=$(echo $object | yq -r '.resources[| index("leases")' | tee /dev/stderr) [ "${actual}" != null ] @@ -166,7 +166,7 @@ load _helpers --set 'global.secretsBackend.vault.consulServerRole=bar' \ --set 'global.secretsBackend.vault.consulCARole=test2' \ . | tee /dev/stderr | - yq -r '.rules[2]' | tee /dev/stderr) + yq -r '.rules[3]' | tee /dev/stderr) local actual=$(echo $object | yq -r '.resources[0]' | tee /dev/stderr) [ "${actual}" = "mutatingwebhookconfigurations" ] diff --git a/control-plane/go.mod b/control-plane/go.mod index db7b2d9ec7..6c98826c5d 100644 --- a/control-plane/go.mod +++ b/control-plane/go.mod @@ -131,6 +131,4 @@ require ( replace github.com/hashicorp/consul/sdk v0.9.0 => github.com/hashicorp/consul/sdk v0.4.1-0.20220531155537-364758ef2f50 -//replace github.com/hashicorp/consul/api v1.10.1-0.20220425143126-6d0162a58a94 => /Users/nitya/workspace/hashicorp/consul/api - go 1.17 diff --git a/control-plane/main.go b/control-plane/main.go index f093901baf..7ec1340290 100644 --- a/control-plane/main.go +++ b/control-plane/main.go @@ -4,9 +4,8 @@ import ( "log" "os" - "github.com/mitchellh/cli" - "github.com/hashicorp/consul-k8s/control-plane/version" + "github.com/mitchellh/cli" ) func main() {