diff --git a/go.mod b/go.mod index fcae130bb..a87024936 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/vmware-tanzu/velero/pkg/apis v0.0.0-20260713215154-c825e3c136bc k8s.io/api v0.36.0 k8s.io/apiextensions-apiserver v0.36.0 - sigs.k8s.io/controller-runtime v0.24.0 + sigs.k8s.io/controller-runtime v0.24.1 ) require ( diff --git a/go.sum b/go.sum index 77d5c38b8..ea1a31453 100644 --- a/go.sum +++ b/go.sum @@ -317,8 +317,8 @@ k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31 h1:V+sn9a/1fEYDGwnllCmqXB k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0= k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 h1:kBawHLSnx/mYHmRnNUf9d4CpjREbeZuxoSGOX/J+aYM= k8s.io/utils v0.0.0-20260319190234-28399d86e0b5/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk= -sigs.k8s.io/controller-runtime v0.24.0 h1:Ck6N2LdS8Lovy1o25BB4r1xjvLEKUl1s2o9kU+KWDE4= -sigs.k8s.io/controller-runtime v0.24.0/go.mod h1:vFkfY5fGt5xAC/sKb8IBFKgWPNKG9OUG29dR8Y2wImw= +sigs.k8s.io/controller-runtime v0.24.1 h1:miPEwrmirImAvgME1L9qebGHrOnGJoVmVdtOU9fRfo4= +sigs.k8s.io/controller-runtime v0.24.1/go.mod h1:vFkfY5fGt5xAC/sKb8IBFKgWPNKG9OUG29dR8Y2wImw= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= diff --git a/vendor/modules.txt b/vendor/modules.txt index 3539b22aa..e42c6f541 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1032,7 +1032,7 @@ k8s.io/utils/net k8s.io/utils/ptr k8s.io/utils/third_party/forked/golang/btree k8s.io/utils/trace -# sigs.k8s.io/controller-runtime v0.24.0 +# sigs.k8s.io/controller-runtime v0.24.1 ## explicit; go 1.26.0 sigs.k8s.io/controller-runtime sigs.k8s.io/controller-runtime/pkg/builder diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/client/typed_client.go b/vendor/sigs.k8s.io/controller-runtime/pkg/client/typed_client.go index b870f41b8..5a8594172 100644 --- a/vendor/sigs.k8s.io/controller-runtime/pkg/client/typed_client.go +++ b/vendor/sigs.k8s.io/controller-runtime/pkg/client/typed_client.go @@ -147,13 +147,18 @@ func (c *typedClient) Apply(ctx context.Context, obj runtime.ApplyConfiguration, applyOpts := &ApplyOptions{} applyOpts.ApplyOptions(opts) - var contentType string - body, err := req. + resp := req. NamespaceIfScoped(o.namespace, o.isNamespaced()). Resource(o.resource()). Name(o.name). VersionedParams(applyOpts.AsPatchOptions(), c.paramCodec). - Do(ctx). + Do(ctx) + if err := resp.Error(); err != nil { + return err + } + + var contentType string + body, err := resp. ContentType(&contentType). Raw() if err != nil { @@ -332,14 +337,19 @@ func (c *typedClient) ApplySubResource(ctx context.Context, obj runtime.ApplyCon return fmt.Errorf("failed to create apply request: %w", err) } - var contentType string - respBody, err := req. + resp := req. NamespaceIfScoped(o.namespace, o.isNamespaced()). Resource(o.resource()). Name(o.name). SubResource(subResource). VersionedParams(applyOpts.AsPatchOptions(), c.paramCodec). - Do(ctx). + Do(ctx) + if err := resp.Error(); err != nil { + return err + } + + var contentType string + respBody, err := resp. ContentType(&contentType). Raw() if err != nil {