From e0ea61bcf7f7d409f61c54473fb0df6bbd2ada9c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 09:57:29 -0500 Subject: [PATCH] deps: bump github.com/openshift-kni/eco-goinfra (#395) Co-authored-by: klaskosk <162511147+klaskosk@users.noreply.github.com> --- go.mod | 4 ++-- go.sum | 8 ++++---- vendor/modules.txt | 4 ++-- vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.go | 5 ++++- .../pkg/internal/controller/controller.go | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 556442479..7e962b164 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/nmstate/kubernetes-nmstate/api v0.0.0-20250114063637-129b149f6ce9 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 - github.com/openshift-kni/eco-goinfra v0.0.0-20250129204500-1fb7f3c38dc7 // latest + github.com/openshift-kni/eco-goinfra v0.0.0-20250130220349-f088d0044ca1 // latest github.com/openshift-kni/k8sreporter v1.0.6 github.com/openshift-kni/lifecycle-agent v0.0.0-20250120220331-9547280df193 // release-4.18 github.com/openshift-kni/numaresources-operator v0.4.18-0.2024100201.0.20250114093602-01c00730991d // release-4.18 @@ -52,7 +52,7 @@ require ( open-cluster-management.io/config-policy-controller v0.15.0 open-cluster-management.io/governance-policy-propagator v0.15.0 open-cluster-management.io/multicloud-operators-subscription v0.15.0 - sigs.k8s.io/controller-runtime v0.19.4 + sigs.k8s.io/controller-runtime v0.19.5 ) require ( diff --git a/go.sum b/go.sum index ca00f7f1f..ef51ea9eb 100644 --- a/go.sum +++ b/go.sum @@ -632,8 +632,8 @@ github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/openshift-kni/cluster-group-upgrades-operator v0.0.0-20241213003211-a57a58a5c4f2 h1:Ts3yv2vE8LtfFmXvhUcyLsZ7YBHT84/vEWR9SHbFj2M= github.com/openshift-kni/cluster-group-upgrades-operator v0.0.0-20241213003211-a57a58a5c4f2/go.mod h1:TYB+3zGmMhqOmyZ6FCbtNZSndvRDcfh16U7wgYGpe/8= -github.com/openshift-kni/eco-goinfra v0.0.0-20250129204500-1fb7f3c38dc7 h1:kr36AexX86BZ/oOO1IOdtFWa/+k/YsPeq0cF7y5pSDI= -github.com/openshift-kni/eco-goinfra v0.0.0-20250129204500-1fb7f3c38dc7/go.mod h1:1jORX9uYlpcQWcFyTKKPhkDi6JFvvMvnrbDPpSt7908= +github.com/openshift-kni/eco-goinfra v0.0.0-20250130220349-f088d0044ca1 h1:nfuZjgKvQ+4btdXM0RsXcaVZ2OZLMZtsIEG4tLBq4Wo= +github.com/openshift-kni/eco-goinfra v0.0.0-20250130220349-f088d0044ca1/go.mod h1:1RY7mn93Ce/U/LdD9mnzGTAXgGLuetTOlhzhY4UZtm8= github.com/openshift-kni/k8sreporter v1.0.6 h1:aaxDzZx3s9bo1I3nopR63RGVZxcJgR94j5X87aDihYo= github.com/openshift-kni/k8sreporter v1.0.6/go.mod h1:tX6LOg0m0oXje7WNLFo8LKHC9Ix8VV0a7vUc6eyeFBQ= github.com/openshift-kni/lifecycle-agent v0.0.0-20250120220331-9547280df193 h1:pdJAfmQwUvqAKcjaMGNqICbuZ7a20sGxm4JFymc1mmw= @@ -1360,8 +1360,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/container-object-storage-interface-api v0.1.0 h1:8tB6JFQhbQIC1hwGQ+q4+tmSSNfjKemb7bFI6C0CK/4= sigs.k8s.io/container-object-storage-interface-api v0.1.0/go.mod h1:YiB+i/UGkzqgODDhRG3u7jkbWkQcoUeLEJ7hwOT/2Qk= -sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo= -sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= +sigs.k8s.io/controller-runtime v0.19.5 h1:rsE2cRYe0hK/rAAwiS1bwqgEcgCxTz9lavs3FMgLW0c= +sigs.k8s.io/controller-runtime v0.19.5/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= diff --git a/vendor/modules.txt b/vendor/modules.txt index c2ad951f7..2ceaff25e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -578,7 +578,7 @@ github.com/opencontainers/runtime-spec/specs-go ## explicit; go 1.22.0 github.com/openshift-kni/cluster-group-upgrades-operator/pkg/api/clustergroupupgrades github.com/openshift-kni/cluster-group-upgrades-operator/pkg/api/clustergroupupgrades/v1alpha1 -# github.com/openshift-kni/eco-goinfra v0.0.0-20250129204500-1fb7f3c38dc7 +# github.com/openshift-kni/eco-goinfra v0.0.0-20250130220349-f088d0044ca1 ## explicit; go 1.23.5 github.com/openshift-kni/eco-goinfra/pkg/apiservers github.com/openshift-kni/eco-goinfra/pkg/argocd @@ -1848,7 +1848,7 @@ open-cluster-management.io/multicloud-operators-subscription/pkg/apis/apps/place sigs.k8s.io/container-object-storage-interface-api/apis sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage/v1alpha1 -# sigs.k8s.io/controller-runtime v0.19.4 +# sigs.k8s.io/controller-runtime v0.19.5 ## explicit; go 1.22.0 sigs.k8s.io/controller-runtime sigs.k8s.io/controller-runtime/pkg/builder diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.go b/vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.go index 406380d32..9c7bf2325 100644 --- a/vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.go +++ b/vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.go @@ -467,6 +467,8 @@ func defaultOpts(config *rest.Config, opts Options) (Options, error) { } } + opts.ByObject = maps.Clone(opts.ByObject) + opts.DefaultNamespaces = maps.Clone(opts.DefaultNamespaces) for obj, byObject := range opts.ByObject { isNamespaced, err := apiutil.IsObjectNamespaced(obj, opts.Scheme, opts.Mapper) if err != nil { @@ -478,6 +480,8 @@ func defaultOpts(config *rest.Config, opts Options) (Options, error) { if isNamespaced && byObject.Namespaces == nil { byObject.Namespaces = maps.Clone(opts.DefaultNamespaces) + } else { + byObject.Namespaces = maps.Clone(byObject.Namespaces) } // Default the namespace-level configs first, because they need to use the undefaulted type-level config @@ -485,7 +489,6 @@ func defaultOpts(config *rest.Config, opts Options) (Options, error) { for namespace, config := range byObject.Namespaces { // 1. Default from the undefaulted type-level config config = defaultConfig(config, byObjectToConfig(byObject)) - // 2. Default from the namespace-level config. This was defaulted from the global default config earlier, but // might not have an entry for the current namespace. if defaultNamespaceSettings, hasDefaultNamespace := opts.DefaultNamespaces[namespace]; hasDefaultNamespace { diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go b/vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go index dfe407f3b..1f7752ba6 100644 --- a/vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go +++ b/vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go @@ -183,7 +183,7 @@ func (c *Controller[request]) Start(ctx context.Context) error { c.LogConstructor(nil).Info("Starting Controller") for _, watch := range c.startWatches { - syncingSource, ok := watch.(source.SyncingSource) + syncingSource, ok := watch.(source.TypedSyncingSource[request]) if !ok { continue }