OSSM-2006 Alternative fix for informer.HasSynced()

maistra · Oct 7, 2022 · 0a4f4ce · 0a4f4ce
1 parent 84c4184
commit 0a4f4ce
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-20221007103507-5488f0815e0f
+
 require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/gogo/protobuf v1.3.2

diff --git a/go.sum b/go.sum
@@ -331,14 +331,14 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
+github.com/luksa/xns-informer v0.0.0-20221007103507-5488f0815e0f h1:GB/Jedxbj3kBWN+V4FxkQvMZd2ghwkMlfzG4LPRqQUw=
+github.com/luksa/xns-informer v0.0.0-20221007103507-5488f0815e0f/go.mod h1:0ZUF4kjow/MlN7Gp6OY7w2qBsWSG4MDBNxUp1VSSs/A=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 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/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/maistra/xns-informer v0.0.0-20220920101259-8467c347491a h1:0eb/ZjoJgg7QjUMKy9nPbjztSiiYgH68ZblO2zqimw0=
-github.com/maistra/xns-informer v0.0.0-20220920101259-8467c347491a/go.mod h1:0ZUF4kjow/MlN7Gp6OY7w2qBsWSG4MDBNxUp1VSSs/A=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=

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
@@ -41,7 +41,7 @@ github.com/imdario/mergo
 github.com/inconshreveable/mousetrap
 # github.com/json-iterator/go v1.1.11
 github.com/json-iterator/go
-# github.com/maistra/xns-informer v0.0.0-20220920101259-8467c347491a
+# github.com/maistra/xns-informer v0.0.0-20220920101259-8467c347491a => github.com/luksa/xns-informer v0.0.0-20221007103507-5488f0815e0f
 ## explicit
 github.com/maistra/xns-informer/cmd/xns-informer-gen
 github.com/maistra/xns-informer/cmd/xns-informer-gen/args
@@ -588,4 +588,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit
 sigs.k8s.io/yaml
+# github.com/maistra/xns-informer => github.com/luksa/xns-informer v0.0.0-20221007103507-5488f0815e0f
 # github.com/go-logr/zapr => github.com/go-logr/zapr v0.2.0