-
Notifications
You must be signed in to change notification settings - Fork 333
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(kuma-cp): fix Zone{In|E}gress sync when no mesh (#8129)
- Add ZoneEgresses to AggregatetMeshContexts when there is no mesh. - Sync ZoneIngresses and ZoneEgresses only when the hash changes. - Return an error with the correct resource type (ZoneEgress) when a ZoneEgress cannot be found. Signed-off-by: Bart Smykla <bartek@smykla.com>
- Loading branch information
1 parent
3851164
commit 7cc5b0e
Showing
4 changed files
with
115 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
package context | ||
|
||
import ( | ||
"context" | ||
|
||
core_mesh "github.com/kumahq/kuma/pkg/core/resources/apis/mesh" | ||
"github.com/kumahq/kuma/pkg/core/resources/manager" | ||
core_store "github.com/kumahq/kuma/pkg/core/resources/store" | ||
"github.com/kumahq/kuma/pkg/xds/cache/sha256" | ||
) | ||
|
||
type meshContextFetcher = func(ctx context.Context, meshName string) (MeshContext, error) | ||
|
||
func AggregateMeshContexts( | ||
ctx context.Context, | ||
resManager manager.ReadOnlyResourceManager, | ||
fetcher meshContextFetcher, | ||
) (AggregatedMeshContexts, error) { | ||
var meshList core_mesh.MeshResourceList | ||
if err := resManager.List(ctx, &meshList, core_store.ListOrdered()); err != nil { | ||
return AggregatedMeshContexts{}, err | ||
} | ||
|
||
var meshContexts []MeshContext | ||
meshContextsByName := map[string]MeshContext{} | ||
for _, mesh := range meshList.Items { | ||
meshCtx, err := fetcher(ctx, mesh.GetMeta().GetName()) | ||
if err != nil { | ||
return AggregatedMeshContexts{}, err | ||
} | ||
meshContexts = append(meshContexts, meshCtx) | ||
meshContextsByName[mesh.Meta.GetName()] = meshCtx | ||
} | ||
|
||
hash := aggregatedHash(meshContexts) | ||
|
||
egressByName := map[string]*core_mesh.ZoneEgressResource{} | ||
if len(meshContexts) > 0 { | ||
for _, egress := range meshContexts[0].Resources.ZoneEgresses().Items { | ||
egressByName[egress.Meta.GetName()] = egress | ||
} | ||
} else { | ||
var egressList core_mesh.ZoneEgressResourceList | ||
if err := resManager.List(ctx, &egressList, core_store.ListOrdered()); err != nil { | ||
return AggregatedMeshContexts{}, err | ||
} | ||
|
||
for _, egress := range egressList.GetItems() { | ||
egressByName[egress.GetMeta().GetName()] = egress.(*core_mesh.ZoneEgressResource) | ||
} | ||
|
||
hash = sha256.Hash(hashResources(egressList.GetItems()...)) | ||
} | ||
|
||
result := AggregatedMeshContexts{ | ||
Hash: hash, | ||
Meshes: meshList.Items, | ||
MeshContextsByName: meshContextsByName, | ||
ZoneEgressByName: egressByName, | ||
} | ||
return result, nil | ||
} | ||
|
||
func aggregatedHash(meshContexts []MeshContext) string { | ||
var hash string | ||
for _, meshCtx := range meshContexts { | ||
hash += meshCtx.Hash | ||
} | ||
return sha256.Hash(hash) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters