This is an automated email from the ASF dual-hosted git repository. ronething pushed a commit to branch fix/ssl_id in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
commit 23904b36bb27a8beb1118cc0d674dd629dea6164 Merge: 8eedc472 0f29ac7b Author: Ashing Zheng <[email protected]> AuthorDate: Thu Oct 9 16:55:40 2025 +0800 Merge remote-tracking branch 'origin/master' into fix/ssl_id Signed-off-by: Ashing Zheng <[email protected]> cmd/root/root.go | 11 --- docs/en/latest/upgrade-guide.md | 2 +- internal/adc/cache/store.go | 27 ++++---- internal/adc/client/client.go | 88 ++++++++++++------------ internal/adc/client/executor.go | 93 ++++++++++++-------------- internal/adc/translator/apisixroute.go | 4 +- internal/adc/translator/apisixupstream.go | 6 +- internal/adc/translator/gateway.go | 23 +++---- internal/adc/translator/gatewayproxy.go | 6 +- internal/adc/translator/globalrule.go | 10 +-- internal/adc/translator/httproute.go | 10 ++- internal/adc/translator/ingressclass.go | 4 +- internal/adc/translator/translator.go | 2 +- internal/controller/apisixroute_controller.go | 6 +- internal/controller/gatewayproxy_controller.go | 2 +- internal/controller/grpcroute_controller.go | 2 +- internal/controller/httproute_controller.go | 6 +- internal/controller/ingress_controller.go | 6 +- internal/controller/ingressclass_controller.go | 2 +- internal/controller/tcproute_controller.go | 2 +- internal/controller/udproute_controller.go | 2 +- internal/controller/utils.go | 32 ++++----- internal/manager/readiness/manager.go | 10 +-- internal/manager/run.go | 7 +- internal/provider/apisix/provider.go | 21 +++--- internal/provider/apisix/status.go | 23 +++---- internal/provider/init/init.go | 16 +++-- internal/provider/options.go | 4 +- internal/provider/register.go | 13 +++- 29 files changed, 208 insertions(+), 232 deletions(-) diff --cc internal/adc/translator/gateway.go index bc3f6142,db284845..c44d6378 --- a/internal/adc/translator/gateway.go +++ b/internal/adc/translator/gateway.go @@@ -22,10 -22,9 +22,8 @@@ import "encoding/json" "encoding/pem" "fmt" - "slices" - "github.com/api7/gopkg/pkg/log" "github.com/pkg/errors" - "go.uber.org/zap" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" @@@ -121,8 -122,9 +120,8 @@@ func (t *Translator) translateSecret(tc } sslObj.Snis = append(sslObj.Snis, hosts...) } - // Note: use cert as id to avoid duplicate certificate across ssl objects - sslObj.ID = id.GenID(string(cert)) + sslObj.ID = id.GenID(fmt.Sprintf("Gateway_%s_%s_%s_%d", obj.Namespace, obj.Name, listener.Name, refIndex)) - log.Debugw("generated ssl id", zap.String("ssl id", sslObj.ID), zap.String("secret", secret.Namespace+"/"+secret.Name)) + t.Log.V(1).Info("generated ssl id", "ssl id", sslObj.ID, "secret", secretNN.String()) sslObj.Labels = label.GenLabel(obj) sslObjs = append(sslObjs, sslObj) }
