Use split wildcard partition name
This way OSS avoids passing a non-empty label, which will be rejected in OSS consul.
This commit is contained in:
parent
a468cbcce9
commit
b4e48f0a70
|
@ -4,7 +4,8 @@
|
|||
package acl
|
||||
|
||||
const (
|
||||
DefaultPartitionName = ""
|
||||
WildcardPartitionName = ""
|
||||
DefaultPartitionName = ""
|
||||
)
|
||||
|
||||
// Reviewer Note: This is a little bit strange; one might want it to be "" like partition name
|
||||
|
|
|
@ -9,6 +9,7 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/hashicorp/consul/acl"
|
||||
"github.com/hashicorp/go-hclog"
|
||||
|
||||
cachetype "github.com/hashicorp/consul/agent/cache-types"
|
||||
|
@ -564,7 +565,7 @@ func (s *handlerMeshGateway) handleUpdate(ctx context.Context, u UpdateEvent, sn
|
|||
peeringListCtx, cancel := context.WithCancel(ctx)
|
||||
err := s.dataSources.PeeringList.Notify(peeringListCtx, &cachetype.PeeringListRequest{
|
||||
Request: &pbpeering.PeeringListRequest{
|
||||
Partition: structs.WildcardSpecifier,
|
||||
Partition: acl.WildcardPartitionName,
|
||||
},
|
||||
}, peerServersWatchID, s.ch)
|
||||
if err != nil {
|
||||
|
|
Loading…
Reference in New Issue