Merge pull request #662 from p0lyn0mial/apiservice-controller-bootstr…

…ap-complete OCPBUGS-24195: the apiservice controller waits until bootstrap complete
openshift · Apr 17, 2024 · 6214f1b · 6214f1b
2 parents 0d8e15c + 65532a1
commit 6214f1b
Show file tree

Hide file tree

Showing 74 changed files with 1,425 additions and 307 deletions.
diff --git a/go.mod b/go.mod
@@ -9,8 +9,8 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/openshift/api v0.0.0-20240408161721-1e963d8dc466
 	github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8
-	github.com/openshift/client-go v0.0.0-20240312121557-60dd5f9fbf8d
-	github.com/openshift/library-go v0.0.0-20240312152318-4109a9e7a437
+	github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8
+	github.com/openshift/library-go v0.0.0-20240412151150-149aa7608754
 	github.com/spf13/cobra v1.7.0
 	github.com/stretchr/testify v1.8.4
 	go.etcd.io/etcd/client/v3 v3.5.10

diff --git a/go.sum b/go.sum
@@ -143,10 +143,10 @@ github.com/openshift/api v0.0.0-20240408161721-1e963d8dc466 h1:njWJghU7ky7h2Me/5
 github.com/openshift/api v0.0.0-20240408161721-1e963d8dc466/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
 github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8 h1:cu3YUMVGsKIyFyJGO3F6BZKGYQZpCKxAv9cBPgQAca8=
 github.com/openshift/build-machinery-go v0.0.0-20231128094528-1e9b1b0595c8/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
-github.com/openshift/client-go v0.0.0-20240312121557-60dd5f9fbf8d h1:vdrC3QYkFcs6a1Cz2/p5RcV7dMQ22tbgIonx+8HIJc0=
-github.com/openshift/client-go v0.0.0-20240312121557-60dd5f9fbf8d/go.mod h1:Y5Hp789dTrF6Fq8cA5YQlpwffmlLy8mc2un/CY0cg7Q=
-github.com/openshift/library-go v0.0.0-20240312152318-4109a9e7a437 h1:xMflL80gT2cXxnmDkR8QLZCbfh/x38jV5XOfLiNlsLE=
-github.com/openshift/library-go v0.0.0-20240312152318-4109a9e7a437/go.mod h1:ePlaOqUiPplRc++6aYdMe+2FmXb2xTNS9Nz5laG2YmI=
+github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8 h1:HGfbllzRcrJBSiwzNjBCs7sExLUxC5/1evnvlNGB0Cg=
+github.com/openshift/client-go v0.0.0-20240405120947-c67c8325cdd8/go.mod h1:+VvvaMSTUhOt+rBq7NwRLSNxq06hTeRCBqm0j0PQEq8=
+github.com/openshift/library-go v0.0.0-20240412151150-149aa7608754 h1:+sf1OfhVX03aY3ytcdESesHxV63ror+ztHK2Fu6r/YI=
+github.com/openshift/library-go v0.0.0-20240412151150-149aa7608754/go.mod h1:m/HsttSi90vSixwoy5mPUBHcZid2YRw/QbsLErLxF9s=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/pkg/controllers/configobservation/oauth/idp_conversions_test.go b/pkg/controllers/configobservation/oauth/idp_conversions_test.go
@@ -29,7 +29,7 @@ func Test_convertProviderConfigToIDPData(t *testing.T) {
 	tmpDir := t.TempDir()
 	ca, err := crypto.MakeSelfSignedCA(path.Join(tmpDir, "cert.crt"), path.Join(tmpDir, "key.key"), "", "testCA", 5)
 	require.NoError(t, err)
-	serverConfig, err := ca.MakeServerCert(sets.NewString("localhost", "127.0.0.1", "::1"), 1)
+	serverConfig, err := ca.MakeServerCert(sets.New("localhost", "127.0.0.1", "::1"), 1)
 	require.NoError(t, err)
 	certPEM, keyPEM, err := serverConfig.GetPEMBytes()
 	require.NoError(t, err)

diff --git a/pkg/controllers/routercerts/controller.go b/pkg/controllers/routercerts/controller.go
@@ -117,7 +117,7 @@ func (c *routerCertsDomainValidationController) sync(ctx context.Context, syncCt
 		syncCtx.Recorder(),
 		"openshift-config-managed", "router-certs",
 		"openshift-authentication", "v4-0-config-system-router-certs",
-		sets.NewString(ingress.Spec.Domain),
+		sets.New(ingress.Spec.Domain),
 		nil,
 	); err != nil {
 		return err

diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go
@@ -638,12 +638,13 @@ func prepareOauthAPIServerOperator(ctx context.Context, controllerContext *contr
 		v1helpers.CachedSecretGetter(operatorCtx.kubeClient.CoreV1(), operatorCtx.kubeInformersForNamespaces),
 	).WithAPIServiceController(
 		"openshift-apiserver",
+		"openshift-oauth-apiserver",
 		func() ([]*apiregistrationv1.APIService, []*apiregistrationv1.APIService, error) {
 			return apiServices(), nil, nil
 		},
 		apiregistrationInformers,
 		apiregistrationv1Client.ApiregistrationV1(),
-		operatorCtx.kubeInformersForNamespaces.InformersFor("openshift-oauth-apiserver"),
+		operatorCtx.kubeInformersForNamespaces,
 		operatorCtx.kubeClient,
 	).WithEncryptionControllers(
 		"openshift-oauth-apiserver",