github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2026-04-12 00:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65645 from sttts/sttts-gengo-import-aliases

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 65582, 65480, 65310, 65644, 65645). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Bump gengo to remove _ from generated import aliases

Pickup https://github.com/kubernetes/gengo/pull/113 and https://github.com/kubernetes/gengo/pull/111.

Avoid tons of golint exceptions for https://github.com/kubernetes/kubernetes/pull/64664.

Kubernetes-commit: a9be647e65c02c26528cec3cf912d06d12d374c2
This commit is contained in:
Kubernetes Publisher
2018-06-29 20:14:19 -07:00
parent 4066b6ae6b 0cd00ba971
commit be73a27b0f
166 changed files with 1778 additions and 1795 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/k8s.io/api/apps/v1/zz_generated.deepcopy.go
Generated Vendored
+7 -7
View File
@@ -21,8 +21,8 @@ limitations under the License.
package v1
import (
core_v1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
intstr "k8s.io/apimachinery/pkg/util/intstr"
)
@@ -170,7 +170,7 @@ func (in *DaemonSetSpec) DeepCopyInto(out *DaemonSetSpec) {
*out = *in
if in.Selector != nil {
in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector)
*out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out)
}
in.Template.DeepCopyInto(&out.Template)
@@ -331,7 +331,7 @@ func (in *DeploymentSpec) DeepCopyInto(out *DeploymentSpec) {
}
if in.Selector != nil {
in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector)
*out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out)
}
in.Template.DeepCopyInto(&out.Template)
@@ -496,7 +496,7 @@ func (in *ReplicaSetSpec) DeepCopyInto(out *ReplicaSetSpec) {
}
if in.Selector != nil {
in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector)
*out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out)
}
in.Template.DeepCopyInto(&out.Template)
@@ -692,13 +692,13 @@ func (in *StatefulSetSpec) DeepCopyInto(out *StatefulSetSpec) {
}
if in.Selector != nil {
in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector)
*out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out)
}
in.Template.DeepCopyInto(&out.Template)
if in.VolumeClaimTemplates != nil {
in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates
*out = make([]core_v1.PersistentVolumeClaim, len(*in))
*out = make([]corev1.PersistentVolumeClaim, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}