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

…02-to-release-4.6 [release-4.6] Bug 1887718: need to be able to disable kube-apiserver connectivity checks
openshift · Dec 11, 2020 · 163e5e7 · 163e5e7
2 parents cc98264 + 908bd23
commit 163e5e7
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/openshift/api v0.0.0-20200929125329-c3027fc03b92
 	github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
 	github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
-	github.com/openshift/library-go v0.0.0-20200930152912-7219e4f70a45
+	github.com/openshift/library-go v0.0.0-20201012194941-89c1c3827d6f
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0

diff --git a/go.sum b/go.sum
@@ -394,8 +394,8 @@ github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7 h1:mO
 github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5 h1:E6WhVL5p3rfjtc+o+jVG/29Aclnf3XIF7akxXvadwR0=
 github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5/go.mod h1:5rGmrkQ8DJEUXA+AR3rEjfH+HFyg4/apY9iCQFgvPfE=
-github.com/openshift/library-go v0.0.0-20200930152912-7219e4f70a45 h1:8PqY3OfWd6VdpNZEza8AWefMJJFdoVmkgM/7kSHag1g=
-github.com/openshift/library-go v0.0.0-20200930152912-7219e4f70a45/go.mod h1:NI6xOQGuTnLXeHW8Z2glKSFhF7X+YxlAlqlBMaK0zEM=
+github.com/openshift/library-go v0.0.0-20201012194941-89c1c3827d6f h1:1NLDzISHwTNqBdrcFz3DwfXjoAB3mul4eoMQmMXwL/Q=
+github.com/openshift/library-go v0.0.0-20201012194941-89c1c3827d6f/go.mod h1:NI6xOQGuTnLXeHW8Z2glKSFhF7X+YxlAlqlBMaK0zEM=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

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/...thub.com/openshift/library-go/pkg/operator/encryption/controllers/migration_controller.go b/...thub.com/openshift/library-go/pkg/operator/encryption/controllers/migration_controller.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/admissions.go b/vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/admissions.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/modules.txt b/vendor/modules.txt
@@ -214,7 +214,7 @@ github.com/openshift/client-go/operator/listers/operator/v1alpha1
 github.com/openshift/client-go/operatorcontrolplane/clientset/versioned
 github.com/openshift/client-go/operatorcontrolplane/clientset/versioned/scheme
 github.com/openshift/client-go/operatorcontrolplane/clientset/versioned/typed/operatorcontrolplane/v1alpha1
-# github.com/openshift/library-go v0.0.0-20200930152912-7219e4f70a45
+# github.com/openshift/library-go v0.0.0-20201012194941-89c1c3827d6f
 github.com/openshift/library-go/pkg/apps/deployment
 github.com/openshift/library-go/pkg/assets
 github.com/openshift/library-go/pkg/config/client