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

Fix subscribing/fetching objects not in the default partition (#17581) 

* Fix subscribing/fetching objects not in the default namespace

* add changelog
This commit is contained in:
Andrew Stucki 2023-06-06 09:09:33 -04:00 committed by GitHub
parent abed1cbda5
commit e90f251e40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/17581.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
gateways: **(Enterprise only)** Fixed a bug in API gateways where gateway configuration objects in non-default partitions did not reconcile properly.
```

16
agent/consul/gateways/controller_gateways.go
View File

@ -93,7 +93,7 @@ func (r *apiGatewayReconciler) enqueueCertificateReferencedGateways(store *state
logger.Trace("certificate changed, enqueueing dependent gateways") logger.Trace("certificate changed, enqueueing dependent gateways")
defer logger.Trace("finished enqueuing gateways") defer logger.Trace("finished enqueuing gateways")
_, entries, err := store.ConfigEntriesByKind(nil, structs.APIGateway, acl.WildcardEnterpriseMeta()) _, entries, err := store.ConfigEntriesByKind(nil, structs.APIGateway, wildcardMeta())
if err != nil { if err != nil {
logger.Warn("error retrieving api gateways", "error", err) logger.Warn("error retrieving api gateways", "error", err)
return err return err
@ -564,11 +564,11 @@ type gatewayMeta struct {
// tuples based on the state coming from the store. Any gateway that does not have // tuples based on the state coming from the store. Any gateway that does not have
// a corresponding bound-api-gateway config entry will be filtered out. // a corresponding bound-api-gateway config entry will be filtered out.
func getAllGatewayMeta(store *state.Store) ([]*gatewayMeta, error) { func getAllGatewayMeta(store *state.Store) ([]*gatewayMeta, error) {
_, gateways, err := store.ConfigEntriesByKind(nil, structs.APIGateway, acl.WildcardEnterpriseMeta()) _, gateways, err := store.ConfigEntriesByKind(nil, structs.APIGateway, wildcardMeta())
if err != nil { if err != nil {
return nil, err return nil, err
} }
_, boundGateways, err := store.ConfigEntriesByKind(nil, structs.BoundAPIGateway, acl.WildcardEnterpriseMeta()) _, boundGateways, err := store.ConfigEntriesByKind(nil, structs.BoundAPIGateway, wildcardMeta())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1074,12 +1074,12 @@ func requestToResourceRef(req controller.Request) structs.ResourceReference {
// retrieveAllRoutesFromStore retrieves all HTTP and TCP routes from the given store // retrieveAllRoutesFromStore retrieves all HTTP and TCP routes from the given store
func retrieveAllRoutesFromStore(store *state.Store) ([]structs.BoundRoute, error) { func retrieveAllRoutesFromStore(store *state.Store) ([]structs.BoundRoute, error) {
_, httpRoutes, err := store.ConfigEntriesByKind(nil, structs.HTTPRoute, acl.WildcardEnterpriseMeta()) _, httpRoutes, err := store.ConfigEntriesByKind(nil, structs.HTTPRoute, wildcardMeta())
if err != nil { if err != nil {
return nil, err return nil, err
} }
_, tcpRoutes, err := store.ConfigEntriesByKind(nil, structs.TCPRoute, acl.WildcardEnterpriseMeta()) _, tcpRoutes, err := store.ConfigEntriesByKind(nil, structs.TCPRoute, wildcardMeta())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1141,3 +1141,9 @@ func routeLogger(logger hclog.Logger, route structs.ConfigEntry) hclog.Logger {
meta := route.GetEnterpriseMeta() meta := route.GetEnterpriseMeta()
return logger.With("route.kind", route.GetKind(), "route.name", route.GetName(), "route.namespace", meta.NamespaceOrDefault(), "route.partition", meta.PartitionOrDefault()) return logger.With("route.kind", route.GetKind(), "route.name", route.GetName(), "route.namespace", meta.NamespaceOrDefault(), "route.partition", meta.PartitionOrDefault())
} }
func wildcardMeta() *acl.EnterpriseMeta {
meta := acl.WildcardEnterpriseMeta()
meta.OverridePartition(acl.WildcardPartitionName)
return meta
}