meshregistry: update the renamed dep istio.io/libistio

slime-io · Dec 14, 2022 · 21f7eb6 · 21f7eb6
1 parent 995af4d
commit 21f7eb6
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 53 deletions.
diff --git a/staging/src/slime.io/slime/modules/bundle-hango/go.mod b/staging/src/slime.io/slime/modules/bundle-hango/go.mod
@@ -10,15 +10,14 @@ require (
 )
 
 replace (
-
  github.com/go-zookeeper/zk => github.com/slime-io/go-zk v0.0.0-20220815024955-60853abc02f4
  github.com/prometheus/common => github.com/prometheus/common v0.26.0
 
  istio.io/api => istio.io/api v0.0.0-20211206163441-1a632586cbd4
-
- istio.io/istio => github.com/slime-io/istio v0.0.0-20221206095013-731766b8cb10
  istio.io/istio-mcp => github.com/slime-io/istio-mcp v0.0.0-20221025054010-d76433980485
 
+ istio.io/libistio => github.com/slime-io/libistio v0.0.0-20221214030325-22f5add50855
+
  slime.io/slime/framework => ./../../../../../../framework
  slime.io/slime/modules/limiter => ./../limiter
  slime.io/slime/modules/meshregistry => ./../meshregistry

diff --git a/staging/src/slime.io/slime/modules/bundle-hango/go.sum b/staging/src/slime.io/slime/modules/bundle-hango/go.sum
@@ -594,10 +594,10 @@ github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/slime-io/go-zk v0.0.0-20220815024955-60853abc02f4 h1:Q17olTrR1VIB6FGigX4GeN/W7SvMgcgHpMtHl9+Jewk=
 github.com/slime-io/go-zk v0.0.0-20220815024955-60853abc02f4/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
-github.com/slime-io/istio v0.0.0-20221206095013-731766b8cb10 h1:eMKEWHdVNiHGtNO9g9am4q5t76ayxpg9gf0IXMSz5J4=
-github.com/slime-io/istio v0.0.0-20221206095013-731766b8cb10/go.mod h1:Rj8EZSwAxFSMTgboNKFRBhkVW+sV0E002m+AFKdgGlA=
 github.com/slime-io/istio-mcp v0.0.0-20221025054010-d76433980485 h1:VYeubZeol/5ma7TmL0lvSv5/JR5Mx/5Dyg5jdB/vGjI=
 github.com/slime-io/istio-mcp v0.0.0-20221025054010-d76433980485/go.mod h1:vHYwJsTi/0FUGT8emU8ztlr84sc3G391rBm938dKvjM=
+github.com/slime-io/libistio v0.0.0-20221214030325-22f5add50855 h1:dwzP73IM2BVPeTAr5dZmuu9N1FNj/3K2PxYcEEF8BqE=
+github.com/slime-io/libistio v0.0.0-20221214030325-22f5add50855/go.mod h1:BOlt9DqBFlJpVcJUKzk+LO4IvB2HQdrWLdkeMQJE1kg=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=

diff --git a/staging/src/slime.io/slime/modules/meshregistry/go.mod b/staging/src/slime.io/slime/modules/meshregistry/go.mod
@@ -13,8 +13,8 @@ require (
  google.golang.org/grpc v1.48.0
  gopkg.in/yaml.v2 v2.4.0
  istio.io/api v0.0.0-20210322145030-ec7ef4cd6eaf
- istio.io/istio v0.0.0-00010101000000-000000000000
  istio.io/istio-mcp v0.0.0
+ istio.io/libistio v0.0.0-00010101000000-000000000000
  istio.io/pkg v0.0.0-20200807181912-d97bc429be20
  k8s.io/api v0.22.2
  k8s.io/apimachinery v0.22.2
@@ -35,8 +35,8 @@ replace (
  github.com/go-zookeeper/zk => github.com/slime-io/go-zk v0.0.0-20220815024955-60853abc02f4
 
  istio.io/api => istio.io/api v0.0.0-20211206163441-1a632586cbd4
- istio.io/istio => github.com/slime-io/istio v0.0.0-20221206095013-731766b8cb10
  istio.io/istio-mcp => github.com/slime-io/istio-mcp v0.0.0-20221025054010-d76433980485
+ istio.io/libistio => github.com/slime-io/libistio v0.0.0-20221214030325-22f5add50855
 
  slime.io/slime/framework => ../../../../../../framework
 )
diff --git a/staging/src/slime.io/slime/modules/meshregistry/go.sum b/staging/src/slime.io/slime/modules/meshregistry/go.sum
@@ -611,10 +611,10 @@ github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/slime-io/go-zk v0.0.0-20220815024955-60853abc02f4 h1:Q17olTrR1VIB6FGigX4GeN/W7SvMgcgHpMtHl9+Jewk=
 github.com/slime-io/go-zk v0.0.0-20220815024955-60853abc02f4/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw=
-github.com/slime-io/istio v0.0.0-20221206095013-731766b8cb10 h1:eMKEWHdVNiHGtNO9g9am4q5t76ayxpg9gf0IXMSz5J4=
-github.com/slime-io/istio v0.0.0-20221206095013-731766b8cb10/go.mod h1:Rj8EZSwAxFSMTgboNKFRBhkVW+sV0E002m+AFKdgGlA=
 github.com/slime-io/istio-mcp v0.0.0-20221025054010-d76433980485 h1:VYeubZeol/5ma7TmL0lvSv5/JR5Mx/5Dyg5jdB/vGjI=
 github.com/slime-io/istio-mcp v0.0.0-20221025054010-d76433980485/go.mod h1:vHYwJsTi/0FUGT8emU8ztlr84sc3G391rBm938dKvjM=
+github.com/slime-io/libistio v0.0.0-20221214030325-22f5add50855 h1:dwzP73IM2BVPeTAr5dZmuu9N1FNj/3K2PxYcEEF8BqE=
+github.com/slime-io/libistio v0.0.0-20221214030325-22f5add50855/go.mod h1:BOlt9DqBFlJpVcJUKzk+LO4IvB2HQdrWLdkeMQJE1kg=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/bootstrap/args.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/bootstrap/args.go
@@ -6,8 +6,8 @@
 package bootstrap
 
 import (
- "istio.io/istio/galley/pkg/config/util/kuberesource"
- "istio.io/istio/pkg/config/schema/snapshots"
+ "istio.io/libistio/galley/pkg/config/util/kuberesource"
+ "istio.io/libistio/pkg/config/schema/snapshots"
  "istio.io/pkg/env"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/client-go/rest"

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/mcpoverxds/mcpcontroller.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/mcpoverxds/mcpcontroller.go
@@ -20,8 +20,8 @@ import (
  mcpsvr "istio.io/istio-mcp/pkg/mcp/server"
  mcpxds "istio.io/istio-mcp/pkg/mcp/xds"
  mcpmodel "istio.io/istio-mcp/pkg/model"
- "istio.io/istio/pkg/config/event"
- resource2 "istio.io/istio/pkg/config/resource"
+ "istio.io/libistio/pkg/config/event"
+ resource2 "istio.io/libistio/pkg/config/resource"
  "istio.io/pkg/log"
  "slime.io/slime/modules/meshregistry/pkg/bootstrap"
  "slime.io/slime/modules/meshregistry/pkg/source"

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/multicluster/multicluster.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/multicluster/multicluster.go
@@ -21,8 +21,8 @@ import (
  "k8s.io/client-go/tools/clientcmd"
  "k8s.io/client-go/util/workqueue"
 
- "istio.io/istio/galley/pkg/config/source/kube"
- "istio.io/istio/galley/pkg/config/source/kube/rt"
+ "istio.io/libistio/galley/pkg/config/source/kube"
+ "istio.io/libistio/galley/pkg/config/source/kube/rt"
  "istio.io/pkg/log"
 )
 

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/server/patchtable.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/server/patchtable.go
@@ -15,10 +15,10 @@
 package server
 
 import (
- "istio.io/istio/galley/pkg/config/mesh"
- "istio.io/istio/galley/pkg/config/source/kube"
- "istio.io/istio/galley/pkg/config/source/kube/fs"
- "istio.io/istio/pkg/config/event"
+ "istio.io/libistio/galley/pkg/config/mesh"
+ "istio.io/libistio/galley/pkg/config/source/kube"
+ "istio.io/libistio/galley/pkg/config/source/kube/fs"
+ "istio.io/libistio/pkg/config/event"
 )
 
 // The patch table for external dependencies for code in components.

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/server/processing.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/server/processing.go
@@ -32,14 +32,14 @@ import (
 
  cmap "github.com/orcaman/concurrent-map"
  "google.golang.org/grpc"
- "istio.io/istio/galley/pkg/config/processor/transforms"
- "istio.io/istio/galley/pkg/config/source/kube"
- "istio.io/istio/galley/pkg/config/source/kube/apiserver"
- "istio.io/istio/galley/pkg/config/util/kuberesource"
- "istio.io/istio/pkg/config/event"
- "istio.io/istio/pkg/config/schema"
- "istio.io/istio/pkg/config/schema/collection"
- "istio.io/istio/pkg/mcp/snapshot"
+ "istio.io/libistio/galley/pkg/config/processor/transforms"
+ "istio.io/libistio/galley/pkg/config/source/kube"
+ "istio.io/libistio/galley/pkg/config/source/kube/apiserver"
+ "istio.io/libistio/galley/pkg/config/util/kuberesource"
+ "istio.io/libistio/pkg/config/event"
+ "istio.io/libistio/pkg/config/schema"
+ "istio.io/libistio/pkg/config/schema/collection"
+ "istio.io/libistio/pkg/mcp/snapshot"
  "istio.io/pkg/log"
  "k8s.io/client-go/tools/clientcmd"
 )

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/eureka/source.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/eureka/source.go
@@ -12,12 +12,12 @@ import (
 
  "slime.io/slime/modules/meshregistry/pkg/util"
 
- "istio.io/istio/pkg/config/schema/collections"
+ "istio.io/libistio/pkg/config/schema/collections"
  "slime.io/slime/modules/meshregistry/pkg/source"
 
  networking "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/event"
- "istio.io/istio/pkg/config/resource"
+ "istio.io/libistio/pkg/config/event"
+ "istio.io/libistio/pkg/config/resource"
  "istio.io/pkg/log"
 )
 

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/nacos/polling.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/nacos/polling.go
@@ -5,7 +5,7 @@ import (
  "time"
 
  networking "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/event"
+ "istio.io/libistio/pkg/config/event"
 )
 
 func (s *Source) Polling() {

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/nacos/source.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/nacos/source.go
@@ -15,9 +15,9 @@ import (
  "slime.io/slime/modules/meshregistry/pkg/util"
 
  networking "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/event"
- "istio.io/istio/pkg/config/resource"
- "istio.io/istio/pkg/config/schema/collections"
+ "istio.io/libistio/pkg/config/event"
+ "istio.io/libistio/pkg/config/resource"
+ "istio.io/libistio/pkg/config/schema/collections"
  "istio.io/pkg/log"
  "slime.io/slime/modules/meshregistry/pkg/source"
 )

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/nacos/watching.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/nacos/watching.go
@@ -14,7 +14,7 @@ import (
  "github.com/nacos-group/nacos-sdk-go/v2/model"
  "github.com/nacos-group/nacos-sdk-go/v2/vo"
  networking "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/event"
+ "istio.io/libistio/pkg/config/event"
 )
 
 func newNamingClient(addresses []string, namespace string, header map[string]string) (iClient naming_client.INamingClient, err error) {

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/source.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/source.go
@@ -6,9 +6,9 @@ import (
  "time"
 
  resource2 "istio.io/istio-mcp/pkg/config/schema/resource"
- "istio.io/istio/pkg/config/resource"
- "istio.io/istio/pkg/config/schema/collection"
- "istio.io/istio/pkg/config/schema/collections"
+ "istio.io/libistio/pkg/config/resource"
+ "istio.io/libistio/pkg/config/schema/collection"
+ "istio.io/libistio/pkg/config/schema/collections"
 )
 
 var (

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/model.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/model.go
@@ -4,7 +4,7 @@ import (
  "reflect"
 
  networking "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/resource"
+ "istio.io/libistio/pkg/config/resource"
 )
 
 const (

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/polling.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/polling.go
@@ -8,8 +8,8 @@ import (
 
  cmap "github.com/orcaman/concurrent-map"
  networking "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/event"
- "istio.io/istio/pkg/config/resource"
+ "istio.io/libistio/pkg/config/event"
+ "istio.io/libistio/pkg/config/resource"
 )
 
 func (s *Source) Polling() {

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/sidecar.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/sidecar.go
@@ -10,8 +10,8 @@ import (
 
  "gopkg.in/yaml.v2"
  networking "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/event"
- "istio.io/istio/pkg/config/resource"
+ "istio.io/libistio/pkg/config/event"
+ "istio.io/libistio/pkg/config/resource"
  "istio.io/pkg/log"
 
  "slime.io/slime/modules/meshregistry/pkg/source"

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/source.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/source.go
@@ -15,14 +15,14 @@ import (
  "slime.io/slime/modules/meshregistry/pkg/source"
 
  "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/resource"
- "istio.io/istio/pkg/config/schema/collections"
+ "istio.io/libistio/pkg/config/resource"
+ "istio.io/libistio/pkg/config/schema/collections"
  "slime.io/slime/modules/meshregistry/pkg/util"
 
  "github.com/go-zookeeper/zk"
  cmap "github.com/orcaman/concurrent-map"
- "istio.io/istio/pkg/config/event"
- "istio.io/istio/pkg/config/schema/collection"
+ "istio.io/libistio/pkg/config/event"
+ "istio.io/libistio/pkg/config/schema/collection"
  "istio.io/pkg/log"
  "slime.io/slime/modules/meshregistry/pkg/bootstrap"
 )

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/watching.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/source/zookeeper/watching.go
@@ -9,7 +9,7 @@ import (
  "github.com/go-zookeeper/zk"
  cmap "github.com/orcaman/concurrent-map"
  "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/event"
+ "istio.io/libistio/pkg/config/event"
 )
 
 func (s *Source) ServiceNodeDelete(path string) {

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/util/cache/nodeCache.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/util/cache/nodeCache.go
@@ -6,8 +6,8 @@ import (
  "slime.io/slime/modules/meshregistry/pkg/multicluster"
 
  cmap "github.com/orcaman/concurrent-map"
- "istio.io/istio/pkg/config/schema/collection"
- "istio.io/istio/pkg/config/schema/resource"
+ "istio.io/libistio/pkg/config/schema/collection"
+ "istio.io/libistio/pkg/config/schema/resource"
  "istio.io/pkg/log"
  v1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/util/cache/podCache.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/util/cache/podCache.go
@@ -6,8 +6,8 @@ import (
  "slime.io/slime/modules/meshregistry/pkg/multicluster"
 
  cmap "github.com/orcaman/concurrent-map"
- "istio.io/istio/pkg/config/schema/collection"
- "istio.io/istio/pkg/config/schema/resource"
+ "istio.io/libistio/pkg/config/schema/collection"
+ "istio.io/libistio/pkg/config/schema/resource"
  "istio.io/pkg/log"
  v1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/staging/src/slime.io/slime/modules/meshregistry/pkg/util/validation.go b/staging/src/slime.io/slime/modules/meshregistry/pkg/util/validation.go
@@ -11,7 +11,7 @@ import (
  "slime.io/slime/modules/meshregistry/pkg/util/cache"
 
  networking "istio.io/api/networking/v1alpha3"
- "istio.io/istio/pkg/config/resource"
+ "istio.io/libistio/pkg/config/resource"
  "istio.io/pkg/log"
 )