Merge pull request #444 from openshift-cherrypick-robot/cherry-pick-4…

…30-to-release-4.7 [release-4.7] Bug 1927321: competing connectivitycheckcontrollers cause pod restarts during upgrades
openshift · Apr 15, 2021 · e9dac4b · e9dac4b
2 parents 3e7d4b4 + 0878ae0
commit e9dac4b
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/openshift/api v0.0.0-20201214114959-164a2fb63b5f
 	github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
 	github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
-	github.com/openshift/library-go v0.0.0-20210105160312-42fe32ec6e0f
+	github.com/openshift/library-go v0.0.0-20210205203934-9eb0d970f2f4
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.6.1

diff --git a/go.sum b/go.sum
@@ -465,8 +465,8 @@ github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab h1:lB
 github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49 h1:7NmjUkJtGHpMTE/n8ia6itbCdZ7eYuTCXKc/zsA7OSM=
 github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49/go.mod h1:9/jG4I6sh+5QublJpZZ4Zs/P4/QCXMsQQ/K/058bSB8=
-github.com/openshift/library-go v0.0.0-20210105160312-42fe32ec6e0f h1:7zon2U1mpFDEY0QBB0m+lrTox86z+1HVXbpHMUJmMHE=
-github.com/openshift/library-go v0.0.0-20210105160312-42fe32ec6e0f/go.mod h1:udseDnqxn5ON8i+NBjDp00fBTK0JRu1/6Y6tf6EivDE=
+github.com/openshift/library-go v0.0.0-20210205203934-9eb0d970f2f4 h1:B3OtzVVHaoKGon69vGK0tPBHcb8LlNNkqHkHhcFHT9g=
+github.com/openshift/library-go v0.0.0-20210205203934-9eb0d970f2f4/go.mod h1:udseDnqxn5ON8i+NBjDp00fBTK0JRu1/6Y6tf6EivDE=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=

diff --git a/pkg/operator/connectivitycheckcontroller/connectivity_check_controller.go b/pkg/operator/connectivitycheckcontroller/connectivity_check_controller.go
@@ -50,6 +50,7 @@ func NewOpenshiftAPIServerConnectivityCheckController(
 			operatorcontrolplaneClient,
 			apiextensionsClient,
 			apiextensionsInformers,
+			configInformers,
 			[]factory.Informer{
 				operatorClient.Informer(),
 				kubeInformersForNamespaces.InformersFor("openshift-apiserver").Core().V1().Pods().Informer(),

diff --git a/vendor/github.com/openshift/library-go/pkg/config/serving/server.go b/vendor/github.com/openshift/library-go/pkg/config/serving/server.go
diff --git a/...hift/library-go/pkg/operator/connectivitycheckcontroller/connectivity_check_controller.go b/...hift/library-go/pkg/operator/connectivitycheckcontroller/connectivity_check_controller.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/generic.go b/vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/generic.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/admission.go b/vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/admission.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/helpers.go b/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/helpers.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/test_helpers.go b/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/test_helpers.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -215,7 +215,7 @@ github.com/openshift/client-go/operatorcontrolplane/clientset/versioned/scheme
 github.com/openshift/client-go/operatorcontrolplane/clientset/versioned/typed/operatorcontrolplane/v1alpha1
 github.com/openshift/client-go/route/clientset/versioned/scheme
 github.com/openshift/client-go/route/clientset/versioned/typed/route/v1
-# github.com/openshift/library-go v0.0.0-20210105160312-42fe32ec6e0f
+# github.com/openshift/library-go v0.0.0-20210205203934-9eb0d970f2f4
 github.com/openshift/library-go/pkg/apps/deployment
 github.com/openshift/library-go/pkg/assets
 github.com/openshift/library-go/pkg/config/client