mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-26 08:10:20 +00:00
rebase: Bump the k8s-dependencies group with 1 update
Bumps the k8s-dependencies group with 1 update: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime). - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.16.1...v0.16.2) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
parent
e1275a2931
commit
ef25ce9dd8
2
go.mod
2
go.mod
@ -44,7 +44,7 @@ require (
|
|||||||
k8s.io/mount-utils v0.28.2
|
k8s.io/mount-utils v0.28.2
|
||||||
k8s.io/pod-security-admission v0.0.0
|
k8s.io/pod-security-admission v0.0.0
|
||||||
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
|
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
|
||||||
sigs.k8s.io/controller-runtime v0.16.1
|
sigs.k8s.io/controller-runtime v0.16.2
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
4
go.sum
4
go.sum
@ -2816,8 +2816,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
|||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA=
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
|
||||||
sigs.k8s.io/controller-runtime v0.2.2/go.mod h1:9dyohw3ZtoXQuV1e766PHUn+cmrRCIcBh6XIMFNMZ+I=
|
sigs.k8s.io/controller-runtime v0.2.2/go.mod h1:9dyohw3ZtoXQuV1e766PHUn+cmrRCIcBh6XIMFNMZ+I=
|
||||||
sigs.k8s.io/controller-runtime v0.16.1 h1:+15lzrmHsE0s2kNl0Dl8cTchI5Cs8qofo5PGcPrV9z0=
|
sigs.k8s.io/controller-runtime v0.16.2 h1:mwXAVuEk3EQf478PQwQ48zGOXvW27UJc8NHktQVuIPU=
|
||||||
sigs.k8s.io/controller-runtime v0.16.1/go.mod h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU=
|
sigs.k8s.io/controller-runtime v0.16.2/go.mod h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU=
|
||||||
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
|
||||||
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
|
||||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
|
||||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -1601,7 +1601,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
|
|||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics
|
||||||
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
|
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
|
||||||
# sigs.k8s.io/controller-runtime v0.16.1
|
# sigs.k8s.io/controller-runtime v0.16.2
|
||||||
## explicit; go 1.20
|
## explicit; go 1.20
|
||||||
sigs.k8s.io/controller-runtime/pkg/cache
|
sigs.k8s.io/controller-runtime/pkg/cache
|
||||||
sigs.k8s.io/controller-runtime/pkg/cache/internal
|
sigs.k8s.io/controller-runtime/pkg/cache/internal
|
||||||
|
2
vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.go
generated
vendored
2
vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.go
generated
vendored
@ -427,7 +427,7 @@ func defaultOpts(config *rest.Config, opts Options) (Options, error) {
|
|||||||
byObject.Transform = defaultedConfig.Transform
|
byObject.Transform = defaultedConfig.Transform
|
||||||
byObject.UnsafeDisableDeepCopy = defaultedConfig.UnsafeDisableDeepCopy
|
byObject.UnsafeDisableDeepCopy = defaultedConfig.UnsafeDisableDeepCopy
|
||||||
|
|
||||||
if byObject.Namespaces == nil {
|
if isNamespaced && byObject.Namespaces == nil {
|
||||||
byObject.Namespaces = opts.DefaultNamespaces
|
byObject.Namespaces = opts.DefaultNamespaces
|
||||||
}
|
}
|
||||||
|
|
||||||
|
54
vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/errors.go
generated
vendored
Normal file
54
vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/errors.go
generated
vendored
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2023 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package apiutil
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
|
"k8s.io/apimachinery/pkg/api/meta"
|
||||||
|
|
||||||
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ErrResourceDiscoveryFailed is returned if the RESTMapper cannot discover supported resources for some GroupVersions.
|
||||||
|
// It wraps the errors encountered, except "NotFound" errors are replaced with meta.NoResourceMatchError, for
|
||||||
|
// backwards compatibility with code that uses meta.IsNoMatchError() to check for unsupported APIs.
|
||||||
|
type ErrResourceDiscoveryFailed map[schema.GroupVersion]error
|
||||||
|
|
||||||
|
// Error implements the error interface.
|
||||||
|
func (e *ErrResourceDiscoveryFailed) Error() string {
|
||||||
|
subErrors := []string{}
|
||||||
|
for k, v := range *e {
|
||||||
|
subErrors = append(subErrors, fmt.Sprintf("%s: %v", k, v))
|
||||||
|
}
|
||||||
|
sort.Strings(subErrors)
|
||||||
|
return fmt.Sprintf("unable to retrieve the complete list of server APIs: %s", strings.Join(subErrors, ", "))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *ErrResourceDiscoveryFailed) Unwrap() []error {
|
||||||
|
subErrors := []error{}
|
||||||
|
for gv, err := range *e {
|
||||||
|
if apierrors.IsNotFound(err) {
|
||||||
|
err = &meta.NoResourceMatchError{PartialResource: gv.WithResource("")}
|
||||||
|
}
|
||||||
|
subErrors = append(subErrors, err)
|
||||||
|
}
|
||||||
|
return subErrors
|
||||||
|
}
|
3
vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/restmapper.go
generated
vendored
3
vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/restmapper.go
generated
vendored
@ -286,7 +286,8 @@ func (m *mapper) fetchGroupVersionResources(groupName string, versions ...string
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(failedGroups) > 0 {
|
if len(failedGroups) > 0 {
|
||||||
return nil, &discovery.ErrGroupDiscoveryFailed{Groups: failedGroups}
|
err := ErrResourceDiscoveryFailed(failedGroups)
|
||||||
|
return nil, &err
|
||||||
}
|
}
|
||||||
|
|
||||||
return groupVersionResources, nil
|
return groupVersionResources, nil
|
||||||
|
1
vendor/sigs.k8s.io/controller-runtime/pkg/client/interfaces.go
generated
vendored
1
vendor/sigs.k8s.io/controller-runtime/pkg/client/interfaces.go
generated
vendored
@ -142,6 +142,7 @@ type SubResourceWriter interface {
|
|||||||
// Create saves the subResource object in the Kubernetes cluster. obj must be a
|
// Create saves the subResource object in the Kubernetes cluster. obj must be a
|
||||||
// struct pointer so that obj can be updated with the content returned by the Server.
|
// struct pointer so that obj can be updated with the content returned by the Server.
|
||||||
Create(ctx context.Context, obj Object, subResource Object, opts ...SubResourceCreateOption) error
|
Create(ctx context.Context, obj Object, subResource Object, opts ...SubResourceCreateOption) error
|
||||||
|
|
||||||
// Update updates the fields corresponding to the status subresource for the
|
// Update updates the fields corresponding to the status subresource for the
|
||||||
// given obj. obj must be a struct pointer so that obj can be updated
|
// given obj. obj must be a struct pointer so that obj can be updated
|
||||||
// with the content returned by the Server.
|
// with the content returned by the Server.
|
||||||
|
18
vendor/sigs.k8s.io/controller-runtime/pkg/manager/manager.go
generated
vendored
18
vendor/sigs.k8s.io/controller-runtime/pkg/manager/manager.go
generated
vendored
@ -26,6 +26,8 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-logr/logr"
|
"github.com/go-logr/logr"
|
||||||
|
coordinationv1 "k8s.io/api/coordination/v1"
|
||||||
|
corev1 "k8s.io/api/core/v1"
|
||||||
"k8s.io/apimachinery/pkg/api/meta"
|
"k8s.io/apimachinery/pkg/api/meta"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/runtime"
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
@ -353,7 +355,20 @@ func New(config *rest.Config, options Options) (Manager, error) {
|
|||||||
leaderRecorderProvider = recorderProvider
|
leaderRecorderProvider = recorderProvider
|
||||||
} else {
|
} else {
|
||||||
leaderConfig = rest.CopyConfig(options.LeaderElectionConfig)
|
leaderConfig = rest.CopyConfig(options.LeaderElectionConfig)
|
||||||
leaderRecorderProvider, err = options.newRecorderProvider(leaderConfig, cluster.GetHTTPClient(), cluster.GetScheme(), options.Logger.WithName("events"), options.makeBroadcaster)
|
scheme := cluster.GetScheme()
|
||||||
|
err := corev1.AddToScheme(scheme)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
err = coordinationv1.AddToScheme(scheme)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
httpClient, err := rest.HTTPClientFor(options.LeaderElectionConfig)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
leaderRecorderProvider, err = options.newRecorderProvider(leaderConfig, httpClient, scheme, options.Logger.WithName("events"), options.makeBroadcaster)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -396,7 +411,6 @@ func New(config *rest.Config, options Options) (Manager, error) {
|
|||||||
|
|
||||||
errChan := make(chan error)
|
errChan := make(chan error)
|
||||||
runnables := newRunnables(options.BaseContext, errChan)
|
runnables := newRunnables(options.BaseContext, errChan)
|
||||||
|
|
||||||
return &controllerManager{
|
return &controllerManager{
|
||||||
stopProcedureEngaged: pointer.Int64(0),
|
stopProcedureEngaged: pointer.Int64(0),
|
||||||
cluster: cluster,
|
cluster: cluster,
|
||||||
|
Loading…
Reference in New Issue
Block a user