Skip to content

Commit

Permalink
Address review comment to Peering.
Browse files Browse the repository at this point in the history
  • Loading branch information
thisisnotashwin committed Jun 13, 2022
1 parent 9ecfff4 commit fc1e4fe
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions charts/consul/test/unit/connect-inject-clusterrole.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down Expand Up @@ -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" ]
Expand Down
2 changes: 0 additions & 2 deletions control-plane/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions control-plane/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit fc1e4fe

Please sign in to comment.