Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-52365: [release-4.17] Upgrade dependencies and k8s versions to match with OCP release version #597

Closed
wants to merge 2 commits into from
Closed

OCPBUGS-52365: [release-4.17] Upgrade dependencies and k8s versions to match with OCP release version #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a110e22
Upgrade controller-runtime from v0.17.2 to v0.18.7 and k8s versions f…
camilamacedo86 Mar 5, 2025
e258a25
upgraded github.com/operator-framework/api v0.23.0 => v0.26.0
camilamacedo86 Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
43 changes: 22 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
module github.com/operator-framework/operator-marketplace

go 1.22
go 1.22.9

require (
github.com/fsnotify/fsnotify v1.7.0
github.com/google/go-cmp v0.6.0
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
github.com/onsi/ginkgo/v2 v2.14.0
github.com/onsi/gomega v1.30.0
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.32.0
github.com/openshift/api v0.0.0-20240429104249-ac9356ba1784
github.com/openshift/client-go v0.0.0-20240422164335-6c851f4919dd
github.com/openshift/library-go v0.0.0-20240426153406-52527b886e57
github.com/operator-framework/api v0.23.0
github.com/operator-framework/api v0.26.0
github.com/prometheus/client_golang v1.18.0
github.com/sirupsen/logrus v1.9.2
github.com/stretchr/testify v1.8.4
k8s.io/api v0.29.4
k8s.io/apimachinery v0.29.4
k8s.io/client-go v0.29.2
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1
sigs.k8s.io/controller-runtime v0.17.2
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
k8s.io/api v0.30.1
k8s.io/apimachinery v0.30.1
k8s.io/client-go v0.30.1
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
sigs.k8s.io/controller-runtime v0.18.7
)

require (
Expand All @@ -28,9 +28,9 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
Expand Down Expand Up @@ -65,14 +65,15 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/mod v0.23.0 // indirect
golang.org/x/net v0.35.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/sync v0.11.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/tools v0.30.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
Expand All @@ -81,8 +82,8 @@ require (
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.29.2 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/apiextensions-apiserver v0.30.1 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
94 changes: 42 additions & 52 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 6 additions & 14 deletions pkg/controller/catalogsource/catalogsource_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ import (
"github.com/operator-framework/operator-marketplace/pkg/defaults"
"github.com/operator-framework/operator-marketplace/pkg/operatorhub"

"sigs.k8s.io/controller-runtime/pkg/builder"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
)

// Add creates a new CatalogSource Controller and adds it to the Manager. The Manager will set fields on the Controller
Expand All @@ -33,11 +31,6 @@ func newReconciler(mgr manager.Manager) reconcile.Reconciler {
}

func add(mgr manager.Manager, r reconcile.Reconciler) error {
c, err := controller.New("catalogsource-controller", mgr, controller.Options{Reconciler: r})
if err != nil {
return err
}

defaultCatalogsources := defaults.GetGlobalCatalogSourceDefinitions()
pred := predicate.Funcs{
CreateFunc: func(e event.CreateEvent) bool {
Expand Down Expand Up @@ -68,12 +61,11 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
},
}

err = c.Watch(source.Kind(mgr.GetCache(), &olmv1alpha1.CatalogSource{}), &handler.EnqueueRequestForObject{}, pred)
if err != nil {
return err
}

return nil
return builder.ControllerManagedBy(mgr).
Named("catalogsource-controller").
For(&olmv1alpha1.CatalogSource{}).
WithEventFilter(pred).
Complete(r)
}

// blank assignment to verify that ReconcileOperatorHub implements reconcile.Reconciler
Expand Down
22 changes: 6 additions & 16 deletions pkg/controller/configmap/configmap_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package configmap
import (
"context"
"os"
"sigs.k8s.io/controller-runtime/pkg/builder"

mktconfig "github.com/operator-framework/operator-marketplace/pkg/apis/config/v1"
"github.com/operator-framework/operator-marketplace/pkg/apis/operators/shared"
Expand All @@ -11,13 +12,10 @@ import (
log "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
)

// Add creates a new ConfigMap Controller and adds it to the Manager. The Manager will set fields on the Controller
Expand All @@ -42,19 +40,11 @@ func add(mgr manager.Manager, r *ReconcileConfigMap) error {
return nil
}

// Create a new controller
c, err := controller.New("configmap-controller", mgr, controller.Options{Reconciler: r})
if err != nil {
return err
}

// Watch for changes to primary resource ConfigMap.
err = c.Watch(source.Kind(mgr.GetCache(), &corev1.ConfigMap{}), &handler.EnqueueRequestForObject{}, getPredicateFunctions())
if err != nil {
return err
}

return nil
return builder.ControllerManagedBy(mgr).
Named("configmap-controller").
For(&corev1.ConfigMap{}).
WithEventFilter(getPredicateFunctions()).
Complete(r)
}

// getPredicateFunctions returns the predicate functions used to identify the configmap
Expand Down
21 changes: 6 additions & 15 deletions pkg/controller/operatorhub/operatorhub_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@ package operatorhub

import (
"context"
"sigs.k8s.io/controller-runtime/pkg/builder"

configv1 "github.com/openshift/api/config/v1"
mktconfig "github.com/operator-framework/operator-marketplace/pkg/apis/config/v1"
"github.com/operator-framework/operator-marketplace/pkg/controller/options"
"github.com/operator-framework/operator-marketplace/pkg/operatorhub"
log "github.com/sirupsen/logrus"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/event"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
)

// Add creates a new OperatorHub Controller and adds it to the Manager. The Manager will set fields on the Controller
Expand All @@ -39,12 +37,6 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
return nil
}

// Create a new controller
c, err := controller.New("operatorhub-controller", mgr, controller.Options{Reconciler: r})
if err != nil {
return err
}

// We only care if the event came from the cluster config.
pred := predicate.Funcs{
CreateFunc: func(e event.CreateEvent) bool {
Expand Down Expand Up @@ -78,13 +70,12 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
},
}

// Watch for changes to primary resource OperatorHub
err = c.Watch(source.Kind(mgr.GetCache(), &configv1.OperatorHub{}), &handler.EnqueueRequestForObject{}, pred)
if err != nil {
return err
}
return builder.ControllerManagedBy(mgr).
Named("operatorhub-controller").
For(&configv1.OperatorHub{}).
WithEventFilter(pred).
Complete(r)

return nil
}

// blank assignment to verify that ReconcileOperatorHub implements reconcile.Reconciler
Expand Down
13 changes: 13 additions & 0 deletions vendor/github.com/evanphx/json-patch/v5/internal/json/encode.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 2 additions & 22 deletions vendor/github.com/evanphx/json-patch/v5/internal/json/stream.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading