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

…1145-to-release-4.8 Bug 1963730: kube-apiserver failed to load SNI cert and key
openshift · Jul 23, 2021 · 755f9a0 · 755f9a0
2 parents d928754 + d7be89f
commit 755f9a0
Show file tree

Hide file tree

Showing 17 changed files with 137 additions and 193 deletions.
diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/openshift/api v0.0.0-20210521075222-e273a339932a
 	github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e
 	github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
-	github.com/openshift/library-go v0.0.0-20210608152959-aa07cb1d7909
+	github.com/openshift/library-go v0.0.0-20210611094144-35c8a075e255
 	github.com/pkg/profile v1.5.0 // indirect
 	github.com/prometheus-operator/prometheus-operator/pkg/client v0.45.0
 	github.com/prometheus/client_golang v1.7.1

diff --git a/go.sum b/go.sum
@@ -421,8 +421,8 @@ github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1
 github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0=
 github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99 h1:KrCYRAJcgZYzMCB1PjJHJMYPu/d+dEkelq5eYyi0fDw=
 github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99/go.mod h1:w2YSn4/WIwYuxG5zJmcqtRdtqgW/J2JRgFAqps3bBpg=
-github.com/openshift/library-go v0.0.0-20210608152959-aa07cb1d7909 h1:jxSIKPkt6RuD8zXWIAJHrmes4bwHNXx7e0Y+P71x8Qc=
-github.com/openshift/library-go v0.0.0-20210608152959-aa07cb1d7909/go.mod h1:D0QEmUeYyWP9ORJ92EprPOMkiFg72yX8GM9KxajnMAI=
+github.com/openshift/library-go v0.0.0-20210611094144-35c8a075e255 h1:4lXXCXSNmAD56T+lL0CRQfm4aImnb1I6Va9QVtN/d+Q=
+github.com/openshift/library-go v0.0.0-20210611094144-35c8a075e255/go.mod h1:C5DDOSPucn3EVA0T05fODKtAweTObMBrTYm/G3uUBI8=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 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/vendor/github.com/openshift/library-go/pkg/operator/apiserver/audit/bindata/bindata.go b/vendor/github.com/openshift/library-go/pkg/operator/apiserver/audit/bindata/bindata.go
diff --git a/vendor/github.com/openshift/library-go/pkg/operator/encryption/controllers.go b/vendor/github.com/openshift/library-go/pkg/operator/encryption/controllers.go
diff --git a/...thub.com/openshift/library-go/pkg/operator/encryption/controllers/condition_controller.go b/...thub.com/openshift/library-go/pkg/operator/encryption/controllers/condition_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/...r/github.com/openshift/library-go/pkg/operator/encryption/controllers/prune_controller.go b/...r/github.com/openshift/library-go/pkg/operator/encryption/controllers/prune_controller.go
diff --git a/...r/github.com/openshift/library-go/pkg/operator/encryption/controllers/state_controller.go b/...r/github.com/openshift/library-go/pkg/operator/encryption/controllers/state_controller.go