mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 02:33:34 +00:00
rebase: bump k8s.io/kubernetes from 1.23.5 to 1.23.6
Bumps [k8s.io/kubernetes](https://github.com/kubernetes/kubernetes) from 1.23.5 to 1.23.6. - [Release notes](https://github.com/kubernetes/kubernetes/releases) - [Commits](https://github.com/kubernetes/kubernetes/compare/v1.23.5...v1.23.6) --- updated-dependencies: - dependency-name: k8s.io/kubernetes dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
dependabot[bot]
committed by
mergify[bot]
mergify[bot]
parent
b11951a710
commit
863a9a7882
3
vendor/k8s.io/api/batch/v1/types.go
generated
vendored
3
vendor/k8s.io/api/batch/v1/types.go
generated
vendored
@ -289,10 +289,9 @@ type UncountedTerminatedPods struct {
|
||||
Failed []types.UID `json:"failed,omitempty" protobuf:"bytes,2,rep,name=failed,casttype=k8s.io/apimachinery/pkg/types.UID"`
|
||||
}
|
||||
|
||||
// +enum
|
||||
type JobConditionType string
|
||||
|
||||
// These are valid conditions of a job.
|
||||
// These are built-in conditions of a job.
|
||||
const (
|
||||
// JobSuspended means the job has been suspended.
|
||||
JobSuspended JobConditionType = "Suspended"
|
||||
|
||||
1
vendor/k8s.io/api/certificates/v1/types.go
generated
vendored
1
vendor/k8s.io/api/certificates/v1/types.go
generated
vendored
@ -214,7 +214,6 @@ type CertificateSigningRequestStatus struct {
|
||||
}
|
||||
|
||||
// RequestConditionType is the type of a CertificateSigningRequestCondition
|
||||
// +enum
|
||||
type RequestConditionType string
|
||||
|
||||
// Well-known condition types for certificate requests.
|
||||
|
||||
19
vendor/k8s.io/api/core/v1/types.go
generated
vendored
19
vendor/k8s.io/api/core/v1/types.go
generated
vendored
@ -522,7 +522,6 @@ type PersistentVolumeClaimSpec struct {
|
||||
}
|
||||
|
||||
// PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type
|
||||
// +enum
|
||||
type PersistentVolumeClaimConditionType string
|
||||
|
||||
const (
|
||||
@ -2635,10 +2634,9 @@ const (
|
||||
)
|
||||
|
||||
// PodConditionType is a valid value for PodCondition.Type
|
||||
// +enum
|
||||
type PodConditionType string
|
||||
|
||||
// These are valid conditions of pod.
|
||||
// These are built-in conditions of pod. An application may use a custom condition not listed here.
|
||||
const (
|
||||
// ContainersReady indicates whether all containers in the pod are ready.
|
||||
ContainersReady PodConditionType = "ContainersReady"
|
||||
@ -5055,11 +5053,10 @@ const (
|
||||
NodeTerminated NodePhase = "Terminated"
|
||||
)
|
||||
|
||||
// +enum
|
||||
type NodeConditionType string
|
||||
|
||||
// These are valid conditions of node. Currently, we don't have enough information to decide
|
||||
// node condition. In the future, we will add more. The proposed set of conditions are:
|
||||
// These are valid but not exhaustive conditions of node. A cloud provider may set a condition not listed here.
|
||||
// The built-in set of conditions are:
|
||||
// NodeReachable, NodeLive, NodeReady, NodeSchedulable, NodeRunnable.
|
||||
const (
|
||||
// NodeReady means kubelet is healthy and ready to accept pods.
|
||||
@ -5094,10 +5091,9 @@ type NodeCondition struct {
|
||||
Message string `json:"message,omitempty" protobuf:"bytes,6,opt,name=message"`
|
||||
}
|
||||
|
||||
// +enum
|
||||
type NodeAddressType string
|
||||
|
||||
// These are valid address type of node.
|
||||
// These are built-in addresses type of node. A cloud provider may set a type not listed here.
|
||||
const (
|
||||
// NodeHostName identifies a name of the node. Although every node can be assumed
|
||||
// to have a NodeAddress of this type, its exact syntax and semantics are not
|
||||
@ -5267,10 +5263,9 @@ const (
|
||||
NamespaceTerminatingCause metav1.CauseType = "NamespaceTerminating"
|
||||
)
|
||||
|
||||
// +enum
|
||||
type NamespaceConditionType string
|
||||
|
||||
// These are valid conditions of a namespace.
|
||||
// These are built-in conditions of a namespace.
|
||||
const (
|
||||
// NamespaceDeletionDiscoveryFailure contains information about namespace deleter errors during resource discovery.
|
||||
NamespaceDeletionDiscoveryFailure NamespaceConditionType = "NamespaceDeletionDiscoveryFailure"
|
||||
@ -5758,8 +5753,8 @@ type EventList struct {
|
||||
// List holds a list of objects, which may not be known by the server.
|
||||
type List metav1.List
|
||||
|
||||
// LimitType is a type of object that is limited
|
||||
// +enum
|
||||
// LimitType is a type of object that is limited. It can be Pod, Container, PersistentVolumeClaim or
|
||||
// a fully qualified resource name.
|
||||
type LimitType string
|
||||
|
||||
const (
|
||||
|
||||
4
vendor/k8s.io/client-go/kubernetes/clientset.go
generated
vendored
4
vendor/k8s.io/client-go/kubernetes/clientset.go
generated
vendored
@ -413,6 +413,10 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface {
|
||||
func NewForConfig(c *rest.Config) (*Clientset, error) {
|
||||
configShallowCopy := *c
|
||||
|
||||
if configShallowCopy.UserAgent == "" {
|
||||
configShallowCopy.UserAgent = rest.DefaultKubernetesUserAgent()
|
||||
}
|
||||
|
||||
// share the transport between all clients
|
||||
httpClient, err := rest.HTTPClientFor(&configShallowCopy)
|
||||
if err != nil {
|
||||
|
||||
1
vendor/k8s.io/client-go/pkg/version/.gitattributes
generated
vendored
1
vendor/k8s.io/client-go/pkg/version/.gitattributes
generated
vendored
@ -1 +0,0 @@
|
||||
base.go export-subst
|
||||
13
vendor/k8s.io/client-go/tools/cache/thread_safe_store.go
generated
vendored
13
vendor/k8s.io/client-go/tools/cache/thread_safe_store.go
generated
vendored
@ -284,18 +284,15 @@ func (c *threadSafeMap) updateIndices(oldObj interface{}, newObj interface{}, ke
|
||||
c.indices[name] = index
|
||||
}
|
||||
|
||||
if len(indexValues) == 1 && len(oldIndexValues) == 1 && indexValues[0] == oldIndexValues[0] {
|
||||
// We optimize for the most common case where indexFunc returns a single value which has not been changed
|
||||
continue
|
||||
}
|
||||
|
||||
for _, value := range oldIndexValues {
|
||||
// We optimize for the most common case where index returns a single value.
|
||||
if len(indexValues) == 1 && value == indexValues[0] {
|
||||
continue
|
||||
}
|
||||
c.deleteKeyFromIndex(key, value, index)
|
||||
}
|
||||
for _, value := range indexValues {
|
||||
// We optimize for the most common case where index returns a single value.
|
||||
if len(oldIndexValues) == 1 && value == oldIndexValues[0] {
|
||||
continue
|
||||
}
|
||||
c.addKeyToIndex(key, value, index)
|
||||
}
|
||||
}
|
||||
|
||||
3
vendor/k8s.io/kubernetes/test/e2e/framework/framework.go
generated
vendored
3
vendor/k8s.io/kubernetes/test/e2e/framework/framework.go
generated
vendored
@ -248,6 +248,9 @@ func (f *Framework) BeforeEach() {
|
||||
ginkgo.By("Waiting for a default service account to be provisioned in namespace")
|
||||
err = WaitForDefaultServiceAccountInNamespace(f.ClientSet, namespace.Name)
|
||||
ExpectNoError(err)
|
||||
ginkgo.By("Waiting for kube-root-ca.crt to be provisioned in namespace")
|
||||
err = WaitForKubeRootCAInNamespace(f.ClientSet, namespace.Name)
|
||||
ExpectNoError(err)
|
||||
} else {
|
||||
Logf("Skipping waiting for service account")
|
||||
}
|
||||
|
||||
57
vendor/k8s.io/kubernetes/test/e2e/framework/util.go
generated
vendored
57
vendor/k8s.io/kubernetes/test/e2e/framework/util.go
generated
vendored
@ -282,6 +282,32 @@ func WaitForNamespacesDeleted(c clientset.Interface, namespaces []string, timeou
|
||||
})
|
||||
}
|
||||
|
||||
func waitForConfigMapInNamespace(c clientset.Interface, ns, name string, timeout time.Duration) error {
|
||||
fieldSelector := fields.OneTermEqualSelector("metadata.name", name).String()
|
||||
lw := &cache.ListWatch{
|
||||
ListFunc: func(options metav1.ListOptions) (object runtime.Object, e error) {
|
||||
options.FieldSelector = fieldSelector
|
||||
return c.CoreV1().ConfigMaps(ns).List(context.TODO(), options)
|
||||
},
|
||||
WatchFunc: func(options metav1.ListOptions) (i watch.Interface, e error) {
|
||||
options.FieldSelector = fieldSelector
|
||||
return c.CoreV1().ConfigMaps(ns).Watch(context.TODO(), options)
|
||||
},
|
||||
}
|
||||
ctx, cancel := watchtools.ContextWithOptionalTimeout(context.Background(), timeout)
|
||||
defer cancel()
|
||||
_, err := watchtools.UntilWithSync(ctx, lw, &v1.ConfigMap{}, nil, func(event watch.Event) (bool, error) {
|
||||
switch event.Type {
|
||||
case watch.Deleted:
|
||||
return false, apierrors.NewNotFound(schema.GroupResource{Resource: "configmaps"}, name)
|
||||
case watch.Added, watch.Modified:
|
||||
return true, nil
|
||||
}
|
||||
return false, nil
|
||||
})
|
||||
return err
|
||||
}
|
||||
|
||||
func waitForServiceAccountInNamespace(c clientset.Interface, ns, serviceAccountName string, timeout time.Duration) error {
|
||||
fieldSelector := fields.OneTermEqualSelector("metadata.name", serviceAccountName).String()
|
||||
lw := &cache.ListWatch{
|
||||
@ -296,24 +322,18 @@ func waitForServiceAccountInNamespace(c clientset.Interface, ns, serviceAccountN
|
||||
}
|
||||
ctx, cancel := watchtools.ContextWithOptionalTimeout(context.Background(), timeout)
|
||||
defer cancel()
|
||||
_, err := watchtools.UntilWithSync(ctx, lw, &v1.ServiceAccount{}, nil, serviceAccountHasSecrets)
|
||||
_, err := watchtools.UntilWithSync(ctx, lw, &v1.ServiceAccount{}, nil, func(event watch.Event) (bool, error) {
|
||||
switch event.Type {
|
||||
case watch.Deleted:
|
||||
return false, apierrors.NewNotFound(schema.GroupResource{Resource: "serviceaccounts"}, serviceAccountName)
|
||||
case watch.Added, watch.Modified:
|
||||
return true, nil
|
||||
}
|
||||
return false, nil
|
||||
})
|
||||
return err
|
||||
}
|
||||
|
||||
// serviceAccountHasSecrets returns true if the service account has at least one secret,
|
||||
// false if it does not, or an error.
|
||||
func serviceAccountHasSecrets(event watch.Event) (bool, error) {
|
||||
switch event.Type {
|
||||
case watch.Deleted:
|
||||
return false, apierrors.NewNotFound(schema.GroupResource{Resource: "serviceaccounts"}, "")
|
||||
}
|
||||
switch t := event.Object.(type) {
|
||||
case *v1.ServiceAccount:
|
||||
return len(t.Secrets) > 0, nil
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
|
||||
// WaitForDefaultServiceAccountInNamespace waits for the default service account to be provisioned
|
||||
// the default service account is what is associated with pods when they do not specify a service account
|
||||
// as a result, pods are not able to be provisioned in a namespace until the service account is provisioned
|
||||
@ -321,6 +341,13 @@ func WaitForDefaultServiceAccountInNamespace(c clientset.Interface, namespace st
|
||||
return waitForServiceAccountInNamespace(c, namespace, "default", ServiceAccountProvisionTimeout)
|
||||
}
|
||||
|
||||
// WaitForKubeRootCAInNamespace waits for the configmap kube-root-ca.crt containing the service account
|
||||
// CA trust bundle to be provisioned in the specified namespace so that pods do not have to retry mounting
|
||||
// the config map (which creates noise that hides other issues in the Kubelet).
|
||||
func WaitForKubeRootCAInNamespace(c clientset.Interface, namespace string) error {
|
||||
return waitForConfigMapInNamespace(c, namespace, "kube-root-ca.crt", ServiceAccountProvisionTimeout)
|
||||
}
|
||||
|
||||
// CreateTestingNS should be used by every test, note that we append a common prefix to the provided test name.
|
||||
// Please see NewFramework instead of using this directly.
|
||||
func CreateTestingNS(baseName string, c clientset.Interface, labels map[string]string) (*v1.Namespace, error) {
|
||||
|
||||
72
vendor/modules.txt
vendored
72
vendor/modules.txt
vendored
@ -749,7 +749,7 @@ gopkg.in/yaml.v2
|
||||
# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
|
||||
## explicit
|
||||
gopkg.in/yaml.v3
|
||||
# k8s.io/api v0.23.5 => k8s.io/api v0.23.5
|
||||
# k8s.io/api v0.23.6 => k8s.io/api v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/api/admission/v1
|
||||
k8s.io/api/admission/v1beta1
|
||||
@ -798,7 +798,7 @@ k8s.io/api/scheduling/v1beta1
|
||||
k8s.io/api/storage/v1
|
||||
k8s.io/api/storage/v1alpha1
|
||||
k8s.io/api/storage/v1beta1
|
||||
# k8s.io/apimachinery v0.23.5 => k8s.io/apimachinery v0.23.5
|
||||
# k8s.io/apimachinery v0.23.6 => k8s.io/apimachinery v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/apimachinery/pkg/api/equality
|
||||
k8s.io/apimachinery/pkg/api/errors
|
||||
@ -854,7 +854,7 @@ k8s.io/apimachinery/pkg/watch
|
||||
k8s.io/apimachinery/third_party/forked/golang/json
|
||||
k8s.io/apimachinery/third_party/forked/golang/netutil
|
||||
k8s.io/apimachinery/third_party/forked/golang/reflect
|
||||
# k8s.io/apiserver v0.23.5 => k8s.io/apiserver v0.23.5
|
||||
# k8s.io/apiserver v0.23.6 => k8s.io/apiserver v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/apiserver/pkg/admission
|
||||
k8s.io/apiserver/pkg/admission/configuration
|
||||
@ -895,7 +895,7 @@ k8s.io/apiserver/pkg/util/feature
|
||||
k8s.io/apiserver/pkg/util/webhook
|
||||
k8s.io/apiserver/pkg/util/x509metrics
|
||||
k8s.io/apiserver/pkg/warning
|
||||
# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.23.5
|
||||
# k8s.io/client-go v12.0.0+incompatible => k8s.io/client-go v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/client-go/applyconfigurations/admissionregistration/v1
|
||||
k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1
|
||||
@ -1138,12 +1138,12 @@ k8s.io/client-go/util/homedir
|
||||
k8s.io/client-go/util/keyutil
|
||||
k8s.io/client-go/util/retry
|
||||
k8s.io/client-go/util/workqueue
|
||||
# k8s.io/cloud-provider v0.23.5 => k8s.io/cloud-provider v0.23.5
|
||||
# k8s.io/cloud-provider v0.23.6 => k8s.io/cloud-provider v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/cloud-provider
|
||||
k8s.io/cloud-provider/volume
|
||||
k8s.io/cloud-provider/volume/helpers
|
||||
# k8s.io/component-base v0.23.5 => k8s.io/component-base v0.23.5
|
||||
# k8s.io/component-base v0.23.6 => k8s.io/component-base v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/component-base/cli/flag
|
||||
k8s.io/component-base/config
|
||||
@ -1154,7 +1154,7 @@ k8s.io/component-base/metrics/legacyregistry
|
||||
k8s.io/component-base/metrics/testutil
|
||||
k8s.io/component-base/traces
|
||||
k8s.io/component-base/version
|
||||
# k8s.io/component-helpers v0.23.5 => k8s.io/component-helpers v0.23.5
|
||||
# k8s.io/component-helpers v0.23.6 => k8s.io/component-helpers v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/component-helpers/node/util/sysctl
|
||||
k8s.io/component-helpers/scheduling/corev1
|
||||
@ -1170,14 +1170,14 @@ k8s.io/klog/v2/internal/severity
|
||||
## explicit; go 1.16
|
||||
k8s.io/kube-openapi/pkg/schemaconv
|
||||
k8s.io/kube-openapi/pkg/util/proto
|
||||
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.23.5
|
||||
# k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/kubectl/pkg/scale
|
||||
k8s.io/kubectl/pkg/util/podutils
|
||||
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.23.5
|
||||
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/kubelet/pkg/apis/stats/v1alpha1
|
||||
# k8s.io/kubernetes v1.23.5
|
||||
# k8s.io/kubernetes v1.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/kubernetes/pkg/api/legacyscheme
|
||||
k8s.io/kubernetes/pkg/api/service
|
||||
@ -1240,7 +1240,7 @@ k8s.io/kubernetes/test/e2e/storage/podlogs
|
||||
k8s.io/kubernetes/test/e2e/storage/utils
|
||||
k8s.io/kubernetes/test/utils
|
||||
k8s.io/kubernetes/test/utils/image
|
||||
# k8s.io/mount-utils v0.23.5 => k8s.io/mount-utils v0.23.5
|
||||
# k8s.io/mount-utils v0.23.6 => k8s.io/mount-utils v0.23.6
|
||||
## explicit; go 1.16
|
||||
k8s.io/mount-utils
|
||||
# k8s.io/utils v0.0.0-20211116205334-6203023598ed
|
||||
@ -1319,29 +1319,29 @@ sigs.k8s.io/yaml
|
||||
# github.com/golang/protobuf => github.com/golang/protobuf v1.4.3
|
||||
# github.com/portworx/sched-ops => github.com/portworx/sched-ops v0.20.4-openstorage-rc3
|
||||
# gomodules.xyz/jsonpatch/v2 => github.com/gomodules/jsonpatch/v2 v2.2.0
|
||||
# k8s.io/api => k8s.io/api v0.23.5
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.5
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.23.5
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.23.5
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.5
|
||||
# k8s.io/client-go => k8s.io/client-go v0.23.5
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.5
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.5
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.23.5
|
||||
# k8s.io/component-base => k8s.io/component-base v0.23.5
|
||||
# k8s.io/component-helpers => k8s.io/component-helpers v0.23.5
|
||||
# k8s.io/controller-manager => k8s.io/controller-manager v0.23.5
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.23.5
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.5
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.5
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.5
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.5
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.5
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.23.5
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.23.5
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.5
|
||||
# k8s.io/metrics => k8s.io/metrics v0.23.5
|
||||
# k8s.io/mount-utils => k8s.io/mount-utils v0.23.5
|
||||
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.5
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.5
|
||||
# k8s.io/api => k8s.io/api v0.23.6
|
||||
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.6
|
||||
# k8s.io/apimachinery => k8s.io/apimachinery v0.23.6
|
||||
# k8s.io/apiserver => k8s.io/apiserver v0.23.6
|
||||
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.6
|
||||
# k8s.io/client-go => k8s.io/client-go v0.23.6
|
||||
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.6
|
||||
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.6
|
||||
# k8s.io/code-generator => k8s.io/code-generator v0.23.6
|
||||
# k8s.io/component-base => k8s.io/component-base v0.23.6
|
||||
# k8s.io/component-helpers => k8s.io/component-helpers v0.23.6
|
||||
# k8s.io/controller-manager => k8s.io/controller-manager v0.23.6
|
||||
# k8s.io/cri-api => k8s.io/cri-api v0.23.6
|
||||
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.6
|
||||
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.6
|
||||
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.6
|
||||
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.6
|
||||
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.6
|
||||
# k8s.io/kubectl => k8s.io/kubectl v0.23.6
|
||||
# k8s.io/kubelet => k8s.io/kubelet v0.23.6
|
||||
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.6
|
||||
# k8s.io/metrics => k8s.io/metrics v0.23.6
|
||||
# k8s.io/mount-utils => k8s.io/mount-utils v0.23.6
|
||||
# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.6
|
||||
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.6
|
||||
# layeh.com/radius => github.com/layeh/radius v0.0.0-20190322222518-890bc1058917
|
||||
|
||||
Reference in New Issue
Block a user