extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-20 17:58:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

more garbage collection of orphans (#75)

Browse Source
This commit is contained in:
Michael Quigley 2022-10-07 13:46:40 -04:00
parent 69c71c0974
commit b393c7f294
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
controller/gc.go
View File

@ -2,12 +2,15 @@ package controller
import ( import (
"context" "context"
"fmt"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/edge/rest_management_api_client/service" "github.com/openziti/edge/rest_management_api_client/service"
"github.com/openziti/edge/rest_management_api_client/service_edge_router_policy" "github.com/openziti/edge/rest_management_api_client/service_edge_router_policy"
"github.com/openziti/edge/rest_management_api_client/service_policy"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"strings"
"time" "time"
) )
@ -45,13 +48,13 @@ func GC(cfg *Config) error {
if err := gcServiceEdgeRouterPolicies(edge, liveMap); err != nil { if err := gcServiceEdgeRouterPolicies(edge, liveMap); err != nil {
return errors.Wrap(err, "error garbage collecting service edge router policies") return errors.Wrap(err, "error garbage collecting service edge router policies")
} }
if err := gcServicePolicies(edge, liveMap); err != nil {
return errors.Wrap(err, "error garbage collecting service policies")
}
return nil return nil
} }
func gcServices(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map[string]struct{}) error { func gcServices(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map[string]struct{}) error {
filter := "tags.zrok != null"
limit := int64(0)
offset := int64(0)
listReq := &service.ListServicesParams{ listReq := &service.ListServicesParams{
Filter: &filter, Filter: &filter,
Limit: &limit, Limit: &limit,
@ -89,9 +92,6 @@ func gcServices(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map
} }
func gcServiceEdgeRouterPolicies(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map[string]struct{}) error { func gcServiceEdgeRouterPolicies(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map[string]struct{}) error {
filter := "tags.zrok != null"
limit := int64(0)
offset := int64(0)
listReq := &service_edge_router_policy.ListServiceEdgeRouterPoliciesParams{ listReq := &service_edge_router_policy.ListServiceEdgeRouterPoliciesParams{
Filter: &filter, Filter: &filter,
Limit: &limit, Limit: &limit,
@ -115,3 +115,31 @@ func gcServiceEdgeRouterPolicies(edge *rest_management_api_client.ZitiEdgeManage
} }
return nil return nil
} }
func gcServicePolicies(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map[string]struct{}) error {
listReq := &service_policy.ListServicePoliciesParams{
Filter: &filter,
Limit: &limit,
Offset: &offset,
Context: context.Background(),
}
listReq.SetTimeout(30 * time.Second)
if listResp, err := edge.ServicePolicy.ListServicePolicies(listReq, nil); err == nil {
for _, sp := range listResp.Payload.Data {
spName := strings.Split(*sp.Name, "-")[0]
if _, found := liveMap[spName]; !found {
logrus.Infof("garbage collecting, svcId='%v'", spName)
deleteFilter := fmt.Sprintf("id=\"%v\"", *sp.ID)
if err := deleteServicePolicy(deleteFilter, edge); err != nil {
logrus.Errorf("error garbage collecting service policy: %v", err)
}
} else {
logrus.Infof("remaining live, svcId='%v'", spName)
}
}
}
}
var filter = "tags.zrok != null"
var limit = int64(0)
var offset = int64(0)