luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

FIPS gossip changes (#17507) 

* separate fips gossip

* clean up
This commit is contained in:
skpratt 2023-05-30 17:40:31 -05:00 committed by GitHub
parent 6e66bc7a7c
commit 36b1534b7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/consul/merge_oss.go
View File

@ -13,6 +13,10 @@ import (
) )
func (md *lanMergeDelegate) enterpriseNotifyMergeMember(m *serf.Member) error { func (md *lanMergeDelegate) enterpriseNotifyMergeMember(m *serf.Member) error {
if memberFIPS := m.Tags["fips"]; memberFIPS != "" {
return fmt.Errorf("Member '%s' is FIPS Consul; FIPS Consul is only available in Consul Enterprise",
m.Name)
}
if memberPartition := m.Tags["ap"]; memberPartition != "" { if memberPartition := m.Tags["ap"]; memberPartition != "" {
return fmt.Errorf("Member '%s' part of partition '%s'; Partitions are a Consul Enterprise feature", return fmt.Errorf("Member '%s' part of partition '%s'; Partitions are a Consul Enterprise feature",
m.Name, memberPartition) m.Name, memberPartition)

4
version/fips.go
View File

@ -2,6 +2,10 @@
package version package version
func IsFIPS() bool {
return false
}
func GetFIPSInfo() string { func GetFIPSInfo() string {
return "" return ""
} }