feat: kubesphere 4.0 (#6115)
* feat: kubesphere 4.0 Signed-off-by: ci-bot <ci-bot@kubesphere.io> * feat: kubesphere 4.0 Signed-off-by: ci-bot <ci-bot@kubesphere.io> --------- Signed-off-by: ci-bot <ci-bot@kubesphere.io> Co-authored-by: ks-ci-bot <ks-ci-bot@example.com> Co-authored-by: joyceliu <joyceliu@yunify.com>
This commit is contained in:
committed by
GitHub
parent
b5015ec7b9
commit
447a51f08b
1
vendor/sigs.k8s.io/controller-tools/pkg/deepcopy/gen.go
generated
vendored
1
vendor/sigs.k8s.io/controller-tools/pkg/deepcopy/gen.go
generated
vendored
@@ -176,7 +176,6 @@ type ObjectGenCtx struct {
|
||||
func writeHeader(pkg *loader.Package, out io.Writer, packageName string, imports *importsList, headerText string) {
|
||||
// NB(directxman12): blank line after build tags to distinguish them from comments
|
||||
_, err := fmt.Fprintf(out, `//go:build !ignore_autogenerated
|
||||
// +build !ignore_autogenerated
|
||||
|
||||
%[3]s
|
||||
|
||||
|
||||
14
vendor/sigs.k8s.io/controller-tools/pkg/deepcopy/traverse.go
generated
vendored
14
vendor/sigs.k8s.io/controller-tools/pkg/deepcopy/traverse.go
generated
vendored
@@ -374,7 +374,8 @@ func (c *copyMethodMaker) genMapDeepCopy(actualName *namingInfo, mapType *types.
|
||||
c.IfElse("val == nil", func() {
|
||||
c.Line("(*out)[key] = nil")
|
||||
}, func() {
|
||||
c.Line("in, out := &val, &outVal")
|
||||
c.Line("inVal := (*in)[key]")
|
||||
c.Line("in, out := &inVal, &outVal")
|
||||
c.genDeepCopyIntoBlock(&namingInfo{typeInfo: mapType.Elem()}, mapType.Elem())
|
||||
})
|
||||
c.Line("(*out)[key] = outVal")
|
||||
@@ -735,11 +736,14 @@ func hasAnyDeepCopyMethod(pkg *loader.Package, typeInfo types.Type) bool {
|
||||
// eventualUnderlyingType gets the "final" type in a sequence of named aliases.
|
||||
// It's effectively a shortcut for calling Underlying in a loop.
|
||||
func eventualUnderlyingType(typeInfo types.Type) types.Type {
|
||||
last := typeInfo
|
||||
for underlying := typeInfo.Underlying(); underlying != last; last, underlying = underlying, underlying.Underlying() {
|
||||
// get the actual underlying type
|
||||
for {
|
||||
underlying := typeInfo.Underlying()
|
||||
if underlying == typeInfo {
|
||||
break
|
||||
}
|
||||
typeInfo = underlying
|
||||
}
|
||||
return last
|
||||
return typeInfo
|
||||
}
|
||||
|
||||
// fineToShallowCopy checks if a shallow-copying a type is equivalent to deepcopy-ing it.
|
||||
|
||||
1
vendor/sigs.k8s.io/controller-tools/pkg/deepcopy/zz_generated.markerhelp.go
generated
vendored
1
vendor/sigs.k8s.io/controller-tools/pkg/deepcopy/zz_generated.markerhelp.go
generated
vendored
@@ -1,5 +1,4 @@
|
||||
//go:build !ignore_autogenerated
|
||||
// +build !ignore_autogenerated
|
||||
|
||||
/*
|
||||
Copyright2019 The Kubernetes Authors.
|
||||
|
||||
Reference in New Issue
Block a user