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

use tags.zrokServiceName instead of name by convention (#99)

Browse Source
This commit is contained in:
Michael Quigley 2022-11-22 14:12:35 -05:00
parent 3f35888ad3
commit ff3f623a74
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
controller/edge.go
View File

@ -15,7 +15,7 @@ import (
) )
func deleteServiceEdgeRouterPolicy(envZId, svcName string, edge *rest_management_api_client.ZitiEdgeManagement) error { func deleteServiceEdgeRouterPolicy(envZId, svcName string, edge *rest_management_api_client.ZitiEdgeManagement) error {
filter := fmt.Sprintf("name=\"%v\"", svcName) filter := fmt.Sprintf("tags.zrokServiceName=\"%v\"", svcName)
limit := int64(1) limit := int64(1)
offset := int64(0) offset := int64(0)
listReq := &service_edge_router_policy.ListServiceEdgeRouterPoliciesParams{ listReq := &service_edge_router_policy.ListServiceEdgeRouterPoliciesParams{
@ -48,11 +48,13 @@ func deleteServiceEdgeRouterPolicy(envZId, svcName string, edge *rest_management
} }
func deleteServicePolicyBind(envZId, svcName string, edge *rest_management_api_client.ZitiEdgeManagement) error { func deleteServicePolicyBind(envZId, svcName string, edge *rest_management_api_client.ZitiEdgeManagement) error {
return deleteServicePolicy(envZId, fmt.Sprintf("name=\"%v-backend\"", svcName), edge) // type=2 == "Bind"
return deleteServicePolicy(envZId, fmt.Sprintf("tags.zrokServiceName=\"%v\" and type=2", svcName), edge)
} }
func deleteServicePolicyDial(envZId, svcName string, edge *rest_management_api_client.ZitiEdgeManagement) error { func deleteServicePolicyDial(envZId, svcName string, edge *rest_management_api_client.ZitiEdgeManagement) error {
return deleteServicePolicy(envZId, fmt.Sprintf("name=\"%v-dial\"", svcName), edge) // type=1 == "Dial"
return deleteServicePolicy(envZId, fmt.Sprintf("tags.zrokServiceName=\"%v\" and type=1", svcName), edge)
} }
func deleteServicePolicy(envZId, filter string, edge *rest_management_api_client.ZitiEdgeManagement) error { func deleteServicePolicy(envZId, filter string, edge *rest_management_api_client.ZitiEdgeManagement) error {
@ -88,7 +90,7 @@ func deleteServicePolicy(envZId, filter string, edge *rest_management_api_client
} }
func deleteConfig(envZId, svcName string, edge *rest_management_api_client.ZitiEdgeManagement) error { func deleteConfig(envZId, svcName string, edge *rest_management_api_client.ZitiEdgeManagement) error {
filter := fmt.Sprintf("name=\"%v\"", svcName) filter := fmt.Sprintf("tags.zrokServiceName=\"%v\"", svcName)
limit := int64(0) limit := int64(0)
offset := int64(0) offset := int64(0)
listReq := &config.ListConfigsParams{ listReq := &config.ListConfigsParams{

4
controller/share_public.go
View File

@ -194,8 +194,8 @@ func (a *publicResourceAllocator) proxyUrl(svcName string) string {
func (a *publicResourceAllocator) zrokTags(svcName string) *rest_model.Tags { func (a *publicResourceAllocator) zrokTags(svcName string) *rest_model.Tags {
return &rest_model.Tags{ return &rest_model.Tags{
SubTags: map[string]interface{}{ SubTags: map[string]interface{}{
"zrok": build.String(), "zrok": build.String(),
"zrok-service-name": svcName, "zrokServiceName": svcName,
}, },
} }
} }