OSSM-2006 Alternative fix for informer.HasSynced()

maistra · Oct 7, 2022 · 7ee36ee · 7ee36ee
1 parent 3dbebeb
commit 7ee36ee
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 34 deletions.
diff --git a/client/xnsinformer/factory.go b/client/xnsinformer/factory.go
diff --git a/go.mod b/go.mod
@@ -2,6 +2,8 @@ module maistra.io/api
 
 go 1.15
 
+replace github.com/maistra/xns-informer => github.com/luksa/xns-informer v0.0.0-20221007113855-42ea70af8076
+
 require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/gogo/protobuf v1.3.1

diff --git a/go.sum b/go.sum
@@ -316,6 +316,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/luksa/xns-informer v0.0.0-20221007113855-42ea70af8076 h1:prVeSFqnQj56i9MQJGUW0SNycFgE71yZ05o9nLZTyug=
+github.com/luksa/xns-informer v0.0.0-20221007113855-42ea70af8076/go.mod h1:Bwe3VRiuXlSXu8MktDkmbrFcmSDysxuoOra542o0Ljk=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -324,8 +326,6 @@ github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/maistra/xns-informer v0.0.0-20220920133259-f0b868f688e0 h1:RncQuyq1CZPFwnf8O/kAuQJFj1A4M1jwptfr0WHmuCw=
-github.com/maistra/xns-informer v0.0.0-20220920133259-f0b868f688e0/go.mod h1:Bwe3VRiuXlSXu8MktDkmbrFcmSDysxuoOra542o0Ljk=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=

diff --git a/vendor/github.com/maistra/xns-informer/cmd/xns-informer-gen/generators/factory.go b/vendor/github.com/maistra/xns-informer/cmd/xns-informer-gen/generators/factory.go
diff --git a/vendor/github.com/maistra/xns-informer/pkg/informers/dynamic.go b/vendor/github.com/maistra/xns-informer/pkg/informers/dynamic.go
diff --git a/vendor/github.com/maistra/xns-informer/pkg/informers/metadata.go b/vendor/github.com/maistra/xns-informer/pkg/informers/metadata.go
diff --git a/vendor/github.com/maistra/xns-informer/pkg/informers/namespace_set.go b/vendor/github.com/maistra/xns-informer/pkg/informers/namespace_set.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -45,7 +45,7 @@ github.com/imdario/mergo
 github.com/inconshreveable/mousetrap
 # github.com/json-iterator/go v1.1.10
 github.com/json-iterator/go
-# github.com/maistra/xns-informer v0.0.0-20220920133259-f0b868f688e0
+# github.com/maistra/xns-informer v0.0.0-20220920133259-f0b868f688e0 => github.com/luksa/xns-informer v0.0.0-20221007113855-42ea70af8076
 ## explicit
 github.com/maistra/xns-informer/cmd/xns-informer-gen
 github.com/maistra/xns-informer/cmd/xns-informer-gen/args
@@ -548,4 +548,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 ## explicit
 sigs.k8s.io/yaml
+# github.com/maistra/xns-informer => github.com/luksa/xns-informer v0.0.0-20221007113855-42ea70af8076
 # github.com/go-logr/zapr => github.com/go-logr/zapr v0.2.0