Skip to content

Commit 2efd6c0

Browse files
committed
apply suggestion
1 parent 5b6b097 commit 2efd6c0

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

internal/controlplane/translator/gateway.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55

66
v1 "github.com/api7/api7-ingress-controller/api/dashboard/v1"
7+
"github.com/api7/api7-ingress-controller/internal/controlplane/label"
78
"github.com/api7/api7-ingress-controller/pkg/id"
89
"github.com/pkg/errors"
910
corev1 "k8s.io/api/core/v1"
@@ -15,7 +16,7 @@ func (t *Translator) TranslateGateway(tctx *TranslateContext, obj *gatewayv1.Gat
1516
result := &TranslateResult{}
1617
for _, listener := range obj.Spec.Listeners {
1718
tctx.GatewayTLSConfig = append(tctx.GatewayTLSConfig, *listener.TLS)
18-
ssl, err := t.translateSecret(tctx, listener, obj.Name, obj.Namespace)
19+
ssl, err := t.translateSecret(tctx, listener, obj)
1920
if err != nil {
2021
return nil, fmt.Errorf("failed to translate secret: %w", err)
2122
}
@@ -24,12 +25,14 @@ func (t *Translator) TranslateGateway(tctx *TranslateContext, obj *gatewayv1.Gat
2425
return result, nil
2526
}
2627

27-
func (t *Translator) translateSecret(tctx *TranslateContext, listener gatewayv1.Listener, name, ns string) (*v1.Ssl, error) {
28+
func (t *Translator) translateSecret(tctx *TranslateContext, listener gatewayv1.Listener, obj *gatewayv1.Gateway) (*v1.Ssl, error) {
2829
if tctx.Secrets == nil {
2930
return nil, nil
3031
}
3132
sslObj := &v1.Ssl{}
32-
sslObj.ID = id.GenID(fmt.Sprintf("%s_%s", ns, name))
33+
ns := obj.GetNamespace()
34+
name := obj.GetName()
35+
sslObj.ID = id.GenID(fmt.Sprintf("%s_%s_%s", ns, name, listener.Name))
3336
if listener.Hostname != nil && *listener.Hostname != "" {
3437
sslObj.Snis = []string{string(*listener.Hostname)}
3538
}
@@ -40,9 +43,7 @@ func (t *Translator) translateSecret(tctx *TranslateContext, listener gatewayv1.
4043
}
4144
sslObj.Cert = string(cert)
4245
sslObj.Key = string(key)
43-
sslObj.Labels = map[string]string{
44-
"managed-by": "api7-ingress-controller",
45-
}
46+
sslObj.Labels = label.GenLabel(obj)
4647
return sslObj, nil
4748
}
4849

0 commit comments

Comments
 (0)