Skip to content

Commit

Permalink
use istio/pkg/log
Browse files Browse the repository at this point in the history
  • Loading branch information
johnlanni committed Nov 27, 2024
1 parent bb7d427 commit 35252e2
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pkg/bootstrap/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ import (
"istio.io/istio/pkg/config/schema/kind"
"istio.io/istio/pkg/keepalive"
istiokube "istio.io/istio/pkg/kube"
"istio.io/istio/pkg/log"
"istio.io/istio/pkg/security"
"istio.io/istio/security/pkg/server/ca/authenticate"
"istio.io/istio/security/pkg/server/ca/authenticate/kubeauth"
"istio.io/pkg/ledger"
"istio.io/pkg/log"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache"

Expand Down
2 changes: 1 addition & 1 deletion pkg/cert/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

package cert

import "istio.io/pkg/log"
import "istio.io/istio/pkg/log"

var CertLog = log.RegisterScope("cert", "Higress Cert process.", 0)
2 changes: 1 addition & 1 deletion pkg/cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"istio.io/istio/pkg/config/constants"
"istio.io/istio/pkg/env"
"istio.io/istio/pkg/keepalive"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
)

var (
Expand Down
1 change: 0 additions & 1 deletion pkg/ingress/config/ingress_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,6 @@ func (m *IngressConfig) convertDestinationRule(configs []common.WrapperConfig) [

if m.RegistryReconciler != nil {
drws := m.RegistryReconciler.GetAllDestinationRuleWrapper()
IngressLog.Infof("Found mcp destinationRules: %v", drws)
for _, destinationRuleWrapper := range drws {
serviceName := destinationRuleWrapper.ServiceKey.ServiceFQDN
dr, exist := destinationRules[serviceName]
Expand Down
2 changes: 1 addition & 1 deletion pkg/ingress/log/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

package log

import "istio.io/pkg/log"
import "istio.io/istio/pkg/log"

var IngressLog = log.RegisterScope("ingress", "Higress Ingress process.", 0)

0 comments on commit 35252e2

Please sign in to comment.