luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

serviceregistration: add external-source meta value (#12163) 

* serviceregistration: add external-source meta value

* add changelog file
This commit is contained in:
Calvin Leung Huang 2021-08-03 09:31:01 -07:00 committed by GitHub
parent 034f09c373
commit c35044010e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/12163.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
serviceregistration: add `external-source: "vault"` metadata value for Consul registration.
```

7
serviceregistration/consul/consul_service_registration.go
View File

@ -49,6 +49,10 @@ const (
// reconcileTimeout is how often Vault should query Consul to detect // reconcileTimeout is how often Vault should query Consul to detect
// and fix any state drift. // and fix any state drift.
reconcileTimeout = 60 * time.Second reconcileTimeout = 60 * time.Second
// metaExternalSource is a metadata value for external-source that can be
// used by the Consul UI.
metaExternalSource = "vault"
) )
var hostnameRegex = regexp.MustCompile(`^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$`) var hostnameRegex = regexp.MustCompile(`^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$`)
@ -503,6 +507,9 @@ func (c *serviceRegistration) reconcileConsul(registeredServiceID string) (servi
Port: int(c.redirectPort), Port: int(c.redirectPort),
Address: serviceAddress, Address: serviceAddress,
EnableTagOverride: false, EnableTagOverride: false,
Meta: map[string]string{
"external-source": metaExternalSource,
},
} }
checkStatus := api.HealthCritical checkStatus := api.HealthCritical