github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #43308 from deads2k/generation-broke 

Automatic merge from submit-queue (batch tested with PRs 42900, 43044, 42896, 43308, 43621)

enable generation

Looks like the deep equals and conversion generation were turned off for sample-apiserver and kube-aggregator.  This turns them back on.

@kubernetes/sig-api-machinery-misc
pull/6/head
Kubernetes Submit Queue 2017-03-27 08:32:29 -07:00 committed by GitHub
parent efa5322766 546b45c9c0
commit 870aee4087
11 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/make-rules/helpers/cache_go_dirs.sh
View File

@ -39,7 +39,7 @@ function kfind() {
# include the "special" vendor directories which are actually part
# of the Kubernetes source tree - generators will use these for
# including certain core API concepts.
find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver \
find -H . ./vendor/k8s.io/apimachinery ./vendor/k8s.io/apiserver ./vendor/k8s.io/kube-aggregator ./vendor/k8s.io/sample-apiserver \
\( \
-not \( \
\( \

18
hack/update-codecgen.sh
View File

@ -31,15 +31,27 @@ generated_files=($(
\( \
-wholename './output' \
-o -wholename './_output' \
-o -wholename './staging/src/k8s.io/client-go' \
-o -wholename './staging/src/k8s.io/apiserver' \
-o -wholename './staging' \
-o -wholename './release' \
-o -wholename './target' \
-o -wholename '*/third_party/*' \
-o -wholename '*/vendor/*' \
-o -wholename '*/codecgen-*-1234.generated.go' \
\) -prune \
\) -name '*.generated.go' | LC_ALL=C sort -r))
\) -name '*.generated.go' | LC_ALL=C sort -r
find ./vendor/k8s.io/kube-aggregator/ -not \( \
\( \
-wholename './output' \
-o -wholename './_output' \
-o -wholename './staging' \
-o -wholename './release' \
-o -wholename './target' \
-o -wholename '*/third_party/*' \
-o -wholename '*/codecgen-*-1234.generated.go' \
\) -prune \
\) -name '*.generated.go' | LC_ALL=C sort -r
))
# We only work for deps within this prefix.
my_prefix="k8s.io/kubernetes"

2
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/doc.go
View File

@ -18,4 +18,4 @@ limitations under the License.
// Package api is the internal version of the API.
// +groupName=apiregistration.k8s.io
package apiregistration
package apiregistration // import "k8s.io/kube-aggregator/pkg/apis/apiregistration"

4
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/doc.go
View File

@ -15,8 +15,8 @@ limitations under the License.
*/
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kube-aggregator/pkg/apis/apiregistration
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration
// Package v1alpha1 is the v1alpha1 version of the API.
// +groupName=apiregistration.k8s.io
package v1alpha1
package v1alpha1 // import "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1"

8
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go
View File

@ -90,7 +90,11 @@ func Convert_v1alpha1_APIServiceList_To_apiregistration_APIServiceList(in *APISe
func autoConvert_apiregistration_APIServiceList_To_v1alpha1_APIServiceList(in *apiregistration.APIServiceList, out *APIServiceList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
if in.Items == nil {
out.Items = make([]APIService, 0)
} else {
out.Items = *(*[]APIService)(unsafe.Pointer(&in.Items))
}
return nil
}
@ -117,7 +121,11 @@ func autoConvert_apiregistration_APIServiceSpec_To_v1alpha1_APIServiceSpec(in *a
out.Group = in.Group
out.Version = in.Version
out.InsecureSkipTLSVerify = in.InsecureSkipTLSVerify
if in.CABundle == nil {
out.CABundle = make([]byte, 0)
} else {
out.CABundle = *(*[]byte)(unsafe.Pointer(&in.CABundle))
}
out.Priority = in.Priority
return nil
}

8
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go
View File

@ -53,8 +53,10 @@ func DeepCopy_v1alpha1_APIService(in interface{}, out interface{}, c *conversion
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_v1alpha1_APIServiceSpec(&in.Spec, &out.Spec, c); err != nil {
if newVal, err := c.DeepCopy(&in.Spec); err != nil {
return err
} else {
out.Spec = *newVal.(*APIServiceSpec)
}
return nil
}
@ -69,8 +71,10 @@ func DeepCopy_v1alpha1_APIServiceList(in interface{}, out interface{}, c *conver
in, out := &in.Items, &out.Items
*out = make([]APIService, len(*in))
for i := range *in {
if err := DeepCopy_v1alpha1_APIService(&(*in)[i], &(*out)[i], c); err != nil {
if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err
} else {
(*out)[i] = *newVal.(*APIService)
}
}
}

8
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/zz_generated.deepcopy.go
View File

@ -53,8 +53,10 @@ func DeepCopy_apiregistration_APIService(in interface{}, out interface{}, c *con
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_apiregistration_APIServiceSpec(&in.Spec, &out.Spec, c); err != nil {
if newVal, err := c.DeepCopy(&in.Spec); err != nil {
return err
} else {
out.Spec = *newVal.(*APIServiceSpec)
}
return nil
}
@ -69,8 +71,10 @@ func DeepCopy_apiregistration_APIServiceList(in interface{}, out interface{}, c
in, out := &in.Items, &out.Items
*out = make([]APIService, len(*in))
for i := range *in {
if err := DeepCopy_apiregistration_APIService(&(*in)[i], &(*out)[i], c); err != nil {
if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err
} else {
(*out)[i] = *newVal.(*APIService)
}
}
}

2
staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/doc.go
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/sample-apiserver/pkg/apis/wardle
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/sample-apiserver/pkg/apis/wardle
// Package v1alpha1 is the v1alpha1 version of the API.
// +groupName=wardle.k8s.io

4
staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.conversion.go
View File

@ -88,7 +88,11 @@ func Convert_v1alpha1_FlunderList_To_wardle_FlunderList(in *FlunderList, out *wa
func autoConvert_wardle_FlunderList_To_v1alpha1_FlunderList(in *wardle.FlunderList, out *FlunderList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
if in.Items == nil {
out.Items = make([]Flunder, 0)
} else {
out.Items = *(*[]Flunder)(unsafe.Pointer(&in.Items))
}
return nil
}

4
staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/zz_generated.deepcopy.go
View File

@ -65,8 +65,10 @@ func DeepCopy_v1alpha1_FlunderList(in interface{}, out interface{}, c *conversio
in, out := &in.Items, &out.Items
*out = make([]Flunder, len(*in))
for i := range *in {
if err := DeepCopy_v1alpha1_Flunder(&(*in)[i], &(*out)[i], c); err != nil {
if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err
} else {
(*out)[i] = *newVal.(*Flunder)
}
}
}

4
staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/zz_generated.deepcopy.go
View File

@ -65,8 +65,10 @@ func DeepCopy_wardle_FlunderList(in interface{}, out interface{}, c *conversion.
in, out := &in.Items, &out.Items
*out = make([]Flunder, len(*in))
for i := range *in {
if err := DeepCopy_wardle_Flunder(&(*in)[i], &(*out)[i], c); err != nil {
if newVal, err := c.DeepCopy(&(*in)[i]); err != nil {
return err
} else {
(*out)[i] = *newVal.(*Flunder)
}
}
}