Merge pull request #550 from soltysh/rebase-1.22.0-beta.2

Bug 1986003: Bump k8s.io to 1.22.0-rc.0

go.mod

@@ -7,27 +7,23 @@ require (
 	github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb
 	github.com/google/go-cmp v0.5.6
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/json-iterator/go v1.1.11 // indirect
-	github.com/openshift/api v0.0.0-20210722142624-acb572771a9c
+	github.com/openshift/api v0.0.0-20210730095913-85e1d547cdee
 	github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3
-	github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
-	github.com/openshift/library-go v0.0.0-20210714123239-9396bd4bf996
-	github.com/prometheus/common v0.10.0
-	github.com/spf13/cobra v1.1.1
+	github.com/openshift/client-go v0.0.0-20210730113412-1811c1b3fc0e
+	github.com/openshift/library-go v0.0.0-20210730114916-d82fae7e3feb
+	github.com/prometheus/common v0.26.0
+	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.6.1
+	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20210716203947-853a461950ff // indirect
-	k8s.io/api v0.21.3
-	k8s.io/apimachinery v0.21.3
-	k8s.io/apiserver v0.21.1
-	k8s.io/client-go v0.21.1
-	k8s.io/component-base v0.21.1
+	k8s.io/api v0.22.0-rc.0
+	k8s.io/apimachinery v0.22.0-rc.0
+	k8s.io/apiserver v0.22.0-rc.0
+	k8s.io/client-go v0.22.0-rc.0
+	k8s.io/component-base v0.22.0-rc.0
 	k8s.io/klog/v2 v2.10.0
 )
 
-// points to temporary-watch-reduction-patch-1.21 to pick up k/k/pull/101102 - please remove it once the pr merges and a new Z release is cut
-replace k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20210419140141-620426e63a99
-
 // Workaround to deal with https://github.com/kubernetes/klog/issues/253
 // Should be deleted when https://github.com/kubernetes/klog/pull/242 is merged
 exclude github.com/go-logr/logr v1.0.0

pkg/operator/certrotationcontroller/certrotationcontroller.go

@@ -81,7 +81,7 @@ func newCertRotationController(
 
 	certRotator := certrotation.NewCertRotationController(
 		"CSRSigningCert",
-		certrotation.SigningRotation{
+		certrotation.RotatedSigningCASecret{
 			Namespace: operatorclient.OperatorNamespace,
 			// this is not a typo, this is the signer of the signer
 			Name:                   "csr-signer-signer",
@@ -93,15 +93,15 @@ func newCertRotationController(
 			Client:                 secretsGetter,
 			EventRecorder:          eventRecorder,
 		},
-		certrotation.CABundleRotation{
+		certrotation.CABundleConfigMap{
 			Namespace:     operatorclient.OperatorNamespace,
 			Name:          "csr-controller-signer-ca",
 			Informer:      kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().ConfigMaps(),
 			Lister:        kubeInformersForNamespaces.InformersFor(operatorclient.OperatorNamespace).Core().V1().ConfigMaps().Lister(),
 			Client:        configMapsGetter,
 			EventRecorder: eventRecorder,
 		},
-		certrotation.TargetRotation{
+		certrotation.RotatedSelfSignedCertKeySecret{
 			Namespace:              operatorclient.OperatorNamespace,
 			Name:                   "csr-signer",
 			Validity:               30 * rotationDay,