Merge pull request openshift#856 from perdasilva/perdasilva/manual-sync-0906

NO-ISSUE: Manually Synchronize From Upstream Repositories (Sept. 6)

Author: openshift-merge-bot[bot]

staging/operator-lifecycle-manager/go.mod

@@ -178,13 +178,6 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-// pin to v1.18.0 until k8s.io/component-base updates its prometheus dependency
-// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3283
-//replace (
-//	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
-//	github.com/prometheus/common => github.com/prometheus/common v0.47.0
-//)
-
 // v1.64.0 breaks our e2e tests as it affects the grpc connection state transition
 // issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284
 replace google.golang.org/grpc => google.golang.org/grpc v1.63.2

staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go

@@ -45,6 +45,7 @@ import (
 	"k8s.io/client-go/metadata/metadatalister"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/client-go/tools/pager"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/retry"
 	"k8s.io/client-go/util/workqueue"
@@ -2230,15 +2231,15 @@ func validateExistingCRs(dynamicClient dynamic.Interface, gr schema.GroupResourc
 			return fmt.Errorf("error creating validator for schema version %s: %s", version, err)
 		}
 		gvr := schema.GroupVersionResource{Group: gr.Group, Version: version, Resource: gr.Resource}
-		crList, err := dynamicClient.Resource(gvr).List(context.TODO(), metav1.ListOptions{})
-		if err != nil {
-			return fmt.Errorf("error listing resources in GroupVersionResource %#v: %s", gvr, err)
-		}
-
-		// validate each CR against this version schema
-		for _, cr := range crList.Items {
-			err = validation.ValidateCustomResource(field.NewPath(""), cr.UnstructuredContent(), validator).ToAggregate()
+		pager := pager.New(pager.SimplePageFunc(func(opts metav1.ListOptions) (runtime.Object, error) {
+			return dynamicClient.Resource(gvr).List(context.TODO(), opts)
+		}))
+		validationFn := func(obj runtime.Object) error {
+			err = validation.ValidateCustomResource(field.NewPath(""), obj, validator).ToAggregate()
 			if err != nil {
+				// lister will only provide unstructured objects as runtime.Object, so this should never fail to convert
+				// if it does, it's a programming error
+				cr := obj.(*unstructured.Unstructured)
 				var namespacedName string
 				if cr.GetNamespace() == "" {
 					namespacedName = cr.GetName()
@@ -2247,6 +2248,11 @@ func validateExistingCRs(dynamicClient dynamic.Interface, gr schema.GroupResourc
 				}
 				return validationError{fmt.Errorf("error validating %s %q: updated validation is too restrictive: %v", cr.GroupVersionKind(), namespacedName, err)}
 			}
+			return nil
+		}
+		err = pager.EachListItem(context.Background(), metav1.ListOptions{}, validationFn)
+		if err != nil {
+			return err
 		}
 	}
 	return nil

staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go

@@ -1435,7 +1435,7 @@ var _ = Describe("Install Plan", func() {
 		// excluded: new CRD, same version, same schema - won't trigger a CRD update
 
 		tableEntries := []TableEntry{
-			Entry("[FLAKE] upgrade CRD with deprecated version", schemaPayload{
+			Entry("upgrade CRD with deprecated version", schemaPayload{
 				name:          "upgrade CRD with deprecated version",
 				expectedPhase: operatorsv1alpha1.InstallPlanPhaseComplete,
 				oldCRD: func() *apiextensionsv1.CustomResourceDefinition {
@@ -1471,7 +1471,7 @@ var _ = Describe("Install Plan", func() {
 						},
 						{
 							Name:    "v1alpha1",
-							Served:  false,
+							Served:  true,
 							Storage: false,
 							Schema: &apiextensionsv1.CustomResourceValidation{
 								OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
@@ -1631,7 +1631,6 @@ var _ = Describe("Install Plan", func() {
 			fetchedInstallPlan, err = fetchInstallPlan(GinkgoT(), crc, installPlanName, generatedNamespace.GetName(), buildInstallPlanPhaseCheckFunc(operatorsv1alpha1.InstallPlanPhaseComplete, operatorsv1alpha1.InstallPlanPhaseFailed))
 			require.NoError(GinkgoT(), err)
 			GinkgoT().Logf("Install plan %s fetched with status %s", fetchedInstallPlan.GetName(), fetchedInstallPlan.Status.Phase)
-
 			require.Equal(GinkgoT(), tt.expectedPhase, fetchedInstallPlan.Status.Phase)
 
 			By(`Ensure correct in-cluster resource(s)`)
@@ -1688,7 +1687,6 @@ var _ = Describe("Install Plan", func() {
 			validateCRDVersions(GinkgoT(), c, tt.oldCRD.GetName(), expectedVersions)
 			GinkgoT().Logf("All expected resources resolved %s", fetchedCSV.Status.Phase)
 		}, tableEntries)
-
 	})
 
 	Describe("update catalog for subscription", func() {