mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-02-22 00:32:59 +08:00
Merge pull request #75577 from mars1024/bugfix/use_add_in_enqueue
replace AddRateLimited with Add in enqueue func Kubernetes-commit: ab35bd06689744ee275fbec4d43cc7a30f5cca4d
This commit is contained in:
parent
7047ee6cec
commit
0e5b089d85
458
Godeps/Godeps.json
generated
458
Godeps/Godeps.json
generated
File diff suppressed because it is too large
Load Diff
4
vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types.go
generated
vendored
4
vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types.go
generated
vendored
@ -133,6 +133,10 @@ const (
|
|||||||
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
|
||||||
type TableOptions struct {
|
type TableOptions struct {
|
||||||
v1.TypeMeta `json:",inline"`
|
v1.TypeMeta `json:",inline"`
|
||||||
|
|
||||||
|
// NoHeaders is only exposed for internal callers.
|
||||||
|
NoHeaders bool `json:"-"`
|
||||||
|
|
||||||
// includeObject decides whether to include each object along with its columnar information.
|
// includeObject decides whether to include each object along with its columnar information.
|
||||||
// Specifying "None" will return no object, specifying "Object" will return the full object contents, and
|
// Specifying "None" will return no object, specifying "Object" will return the full object contents, and
|
||||||
// specifying "Metadata" (the default) will return the object's metadata in the PartialObjectMetadata kind
|
// specifying "Metadata" (the default) will return the object's metadata in the PartialObjectMetadata kind
|
||||||
|
2
vendor/k8s.io/apimachinery/pkg/runtime/types.go
generated
vendored
2
vendor/k8s.io/apimachinery/pkg/runtime/types.go
generated
vendored
@ -43,6 +43,8 @@ type TypeMeta struct {
|
|||||||
const (
|
const (
|
||||||
ContentTypeJSON string = "application/json"
|
ContentTypeJSON string = "application/json"
|
||||||
ContentTypeYAML string = "application/yaml"
|
ContentTypeYAML string = "application/yaml"
|
||||||
|
|
||||||
|
ContentTypeProtobuf string = "application/vnd.kubernetes.protobuf"
|
||||||
)
|
)
|
||||||
|
|
||||||
// RawExtension is used to hold extensions in external versions.
|
// RawExtension is used to hold extensions in external versions.
|
||||||
|
13
vendor/k8s.io/apimachinery/pkg/util/diff/diff.go
generated
vendored
13
vendor/k8s.io/apimachinery/pkg/util/diff/diff.go
generated
vendored
@ -78,7 +78,20 @@ func ObjectGoPrintDiff(a, b interface{}) string {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ObjectReflectDiff returns a multi-line formatted diff between two objects
|
||||||
|
// of equal type. If an object with private fields is passed you will
|
||||||
|
// only see string comparison for those fields. Otherwise this presents the
|
||||||
|
// most human friendly diff of two structs of equal type in this package.
|
||||||
func ObjectReflectDiff(a, b interface{}) string {
|
func ObjectReflectDiff(a, b interface{}) string {
|
||||||
|
if a == nil && b == nil {
|
||||||
|
return "<no diffs>"
|
||||||
|
}
|
||||||
|
if a == nil {
|
||||||
|
return fmt.Sprintf("a is nil and b is not-nil")
|
||||||
|
}
|
||||||
|
if b == nil {
|
||||||
|
return fmt.Sprintf("a is not-nil and b is nil")
|
||||||
|
}
|
||||||
vA, vB := reflect.ValueOf(a), reflect.ValueOf(b)
|
vA, vB := reflect.ValueOf(a), reflect.ValueOf(b)
|
||||||
if vA.Type() != vB.Type() {
|
if vA.Type() != vB.Type() {
|
||||||
return fmt.Sprintf("type A %T and type B %T do not match", a, b)
|
return fmt.Sprintf("type A %T and type B %T do not match", a, b)
|
||||||
|
Loading…
Reference in New Issue
Block a user