Merge pull request #904 from openshift-bot/synchronize-upstream

openshift-merge-bot[bot] · web-flow · commit c8cba43984e1 · 2024-11-29T03:22:17.000Z
NO-ISSUE: Synchronize From Upstream Repositories
diff --git a/staging/operator-lifecycle-manager/go.mod b/staging/operator-lifecycle-manager/go.mod
@@ -184,7 +184,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-// v1.64.0 breaks our e2e tests as it affects the grpc connection state transition
+// v1.64.0 brings in go1.23, which we aren't ready to go to just yet
 // issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284
 replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
 

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ require (`
`184`	`184`	`sigs.k8s.io/yaml v1.4.0 // indirect`
`185`	`185`	`)`
`186`	`186`
`187`		`-// v1.64.0 breaks our e2e tests as it affects the grpc connection state transition`
	`187`	`+// v1.64.0 brings in go1.23, which we aren't ready to go to just yet`
`188`	`188`	`// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284`
`189`	`189`	`replace google.golang.org/grpc => google.golang.org/grpc v1.63.2`
`190`	`190`