github/kubernetes
4
0
Fork 0
Code Issues Pull Requests 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.
This commit is contained in:
Kubernetes Submit Queue
2018-06-29 20:14:19 -07:00
committed by GitHub
parent 97e2d2af65 f4244107b9
commit a9be647e65
219 changed files with 2074 additions and 2135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Godeps/Godeps.json generated
View File

@@ -1723,42 +1723,34 @@
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency-go", "ImportPath": "github.com/google/certificate-transparency-go",
"Comment": "v1.0.10",
"Rev": "1bec4527572c443752ad4f2830bef88be0533236" "Rev": "1bec4527572c443752ad4f2830bef88be0533236"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency-go/asn1", "ImportPath": "github.com/google/certificate-transparency-go/asn1",
"Comment": "v1.0.10",
"Rev": "1bec4527572c443752ad4f2830bef88be0533236" "Rev": "1bec4527572c443752ad4f2830bef88be0533236"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency-go/client", "ImportPath": "github.com/google/certificate-transparency-go/client",
"Comment": "v1.0.10",
"Rev": "1bec4527572c443752ad4f2830bef88be0533236" "Rev": "1bec4527572c443752ad4f2830bef88be0533236"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency-go/client/configpb", "ImportPath": "github.com/google/certificate-transparency-go/client/configpb",
"Comment": "v1.0.10",
"Rev": "1bec4527572c443752ad4f2830bef88be0533236" "Rev": "1bec4527572c443752ad4f2830bef88be0533236"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency-go/jsonclient", "ImportPath": "github.com/google/certificate-transparency-go/jsonclient",
"Comment": "v1.0.10",
"Rev": "1bec4527572c443752ad4f2830bef88be0533236" "Rev": "1bec4527572c443752ad4f2830bef88be0533236"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency-go/tls", "ImportPath": "github.com/google/certificate-transparency-go/tls",
"Comment": "v1.0.10",
"Rev": "1bec4527572c443752ad4f2830bef88be0533236" "Rev": "1bec4527572c443752ad4f2830bef88be0533236"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency-go/x509", "ImportPath": "github.com/google/certificate-transparency-go/x509",
"Comment": "v1.0.10",
"Rev": "1bec4527572c443752ad4f2830bef88be0533236" "Rev": "1bec4527572c443752ad4f2830bef88be0533236"
}, },
{ {
"ImportPath": "github.com/google/certificate-transparency-go/x509/pkix", "ImportPath": "github.com/google/certificate-transparency-go/x509/pkix",
"Comment": "v1.0.10",
"Rev": "1bec4527572c443752ad4f2830bef88be0533236" "Rev": "1bec4527572c443752ad4f2830bef88be0533236"
}, },
{ {
@@ -2000,7 +1992,6 @@
}, },
{ {
"ImportPath": "github.com/inconshreveable/mousetrap", "ImportPath": "github.com/inconshreveable/mousetrap",
"Comment": "v1.0",
"Rev": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" "Rev": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
}, },
{ {
@@ -2870,7 +2861,6 @@
}, },
{ {
"ImportPath": "github.com/xiang90/probing", "ImportPath": "github.com/xiang90/probing",
"Comment": "0.0.1",
"Rev": "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2" "Rev": "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"
}, },
{ {
@@ -3312,43 +3302,43 @@
}, },
{ {
"ImportPath": "k8s.io/gengo/args", "ImportPath": "k8s.io/gengo/args",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators", "ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators", "ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/gengo/examples/import-boss/generators", "ImportPath": "k8s.io/gengo/examples/import-boss/generators",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/gengo/examples/set-gen/generators", "ImportPath": "k8s.io/gengo/examples/set-gen/generators",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/gengo/examples/set-gen/sets", "ImportPath": "k8s.io/gengo/examples/set-gen/sets",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/gengo/generator", "ImportPath": "k8s.io/gengo/generator",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/gengo/namer", "ImportPath": "k8s.io/gengo/namer",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/gengo/parser", "ImportPath": "k8s.io/gengo/parser",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/gengo/types", "ImportPath": "k8s.io/gengo/types",
"Rev": "dcbe4570f0cf6efbc583a5321c8f9390f71a544d" "Rev": "5b57d243f2ca39dbbda758ee07b76b4d519f6dc7"
}, },
{ {
"ImportPath": "k8s.io/heapster/metrics/api/v1/types", "ImportPath": "k8s.io/heapster/metrics/api/v1/types",

12
cmd/kubeadm/app/apis/kubeadm/v1alpha1/zz_generated.conversion.go generated
View File

@@ -24,12 +24,12 @@ import (
unsafe "unsafe" unsafe "unsafe"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
kubeproxyconfig_v1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1" kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1"
) )
func init() { func init() {
@@ -158,7 +158,7 @@ func Convert_kubeadm_HostPathMount_To_v1alpha1_HostPathMount(in *kubeadm.HostPat
} }
func autoConvert_v1alpha1_KubeProxy_To_kubeadm_KubeProxy(in *KubeProxy, out *kubeadm.KubeProxy, s conversion.Scope) error { func autoConvert_v1alpha1_KubeProxy_To_kubeadm_KubeProxy(in *KubeProxy, out *kubeadm.KubeProxy, s conversion.Scope) error {
out.Config = (*kubeproxyconfig_v1alpha1.KubeProxyConfiguration)(unsafe.Pointer(in.Config)) out.Config = (*kubeproxyconfigv1alpha1.KubeProxyConfiguration)(unsafe.Pointer(in.Config))
return nil return nil
} }
@@ -168,7 +168,7 @@ func Convert_v1alpha1_KubeProxy_To_kubeadm_KubeProxy(in *KubeProxy, out *kubeadm
} }
func autoConvert_kubeadm_KubeProxy_To_v1alpha1_KubeProxy(in *kubeadm.KubeProxy, out *KubeProxy, s conversion.Scope) error { func autoConvert_kubeadm_KubeProxy_To_v1alpha1_KubeProxy(in *kubeadm.KubeProxy, out *KubeProxy, s conversion.Scope) error {
out.Config = (*kubeproxyconfig_v1alpha1.KubeProxyConfiguration)(unsafe.Pointer(in.Config)) out.Config = (*kubeproxyconfigv1alpha1.KubeProxyConfiguration)(unsafe.Pointer(in.Config))
return nil return nil
} }
@@ -310,7 +310,7 @@ func autoConvert_v1alpha1_NodeConfiguration_To_kubeadm_NodeConfiguration(in *Nod
out.DiscoveryFile = in.DiscoveryFile out.DiscoveryFile = in.DiscoveryFile
out.DiscoveryToken = in.DiscoveryToken out.DiscoveryToken = in.DiscoveryToken
out.DiscoveryTokenAPIServers = *(*[]string)(unsafe.Pointer(&in.DiscoveryTokenAPIServers)) out.DiscoveryTokenAPIServers = *(*[]string)(unsafe.Pointer(&in.DiscoveryTokenAPIServers))
out.DiscoveryTimeout = (*meta_v1.Duration)(unsafe.Pointer(in.DiscoveryTimeout)) out.DiscoveryTimeout = (*metav1.Duration)(unsafe.Pointer(in.DiscoveryTimeout))
// WARNING: in.NodeName requires manual conversion: does not exist in peer-type // WARNING: in.NodeName requires manual conversion: does not exist in peer-type
out.TLSBootstrapToken = in.TLSBootstrapToken out.TLSBootstrapToken = in.TLSBootstrapToken
out.Token = in.Token out.Token = in.Token
@@ -328,7 +328,7 @@ func autoConvert_kubeadm_NodeConfiguration_To_v1alpha1_NodeConfiguration(in *kub
out.DiscoveryFile = in.DiscoveryFile out.DiscoveryFile = in.DiscoveryFile
out.DiscoveryToken = in.DiscoveryToken out.DiscoveryToken = in.DiscoveryToken
out.DiscoveryTokenAPIServers = *(*[]string)(unsafe.Pointer(&in.DiscoveryTokenAPIServers)) out.DiscoveryTokenAPIServers = *(*[]string)(unsafe.Pointer(&in.DiscoveryTokenAPIServers))
out.DiscoveryTimeout = (*meta_v1.Duration)(unsafe.Pointer(in.DiscoveryTimeout)) out.DiscoveryTimeout = (*metav1.Duration)(unsafe.Pointer(in.DiscoveryTimeout))
out.TLSBootstrapToken = in.TLSBootstrapToken out.TLSBootstrapToken = in.TLSBootstrapToken
out.Token = in.Token out.Token = in.Token
out.ClusterName = in.ClusterName out.ClusterName = in.ClusterName

4
cmd/kubeadm/app/apis/kubeadm/v1alpha1/zz_generated.deepcopy.go generated
View File

@@ -24,7 +24,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
kubeproxyconfig_v1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1" kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1"
) )
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -128,7 +128,7 @@ func (in *KubeProxy) DeepCopyInto(out *KubeProxy) {
*out = *in *out = *in
if in.Config != nil { if in.Config != nil {
in, out := &in.Config, &out.Config in, out := &in.Config, &out.Config
*out = new(kubeproxyconfig_v1alpha1.KubeProxyConfiguration) *out = new(kubeproxyconfigv1alpha1.KubeProxyConfiguration)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
return return

4
cmd/kubeadm/app/apis/kubeadm/v1alpha1/zz_generated.defaults.go generated
View File

@@ -23,7 +23,7 @@ package v1alpha1
import ( import (
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
kubeproxyconfig_v1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1" kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1"
) )
// RegisterDefaults adds defaulters functions to the given scheme. // RegisterDefaults adds defaulters functions to the given scheme.
@@ -38,7 +38,7 @@ func RegisterDefaults(scheme *runtime.Scheme) error {
func SetObjectDefaults_MasterConfiguration(in *MasterConfiguration) { func SetObjectDefaults_MasterConfiguration(in *MasterConfiguration) {
SetDefaults_MasterConfiguration(in) SetDefaults_MasterConfiguration(in)
if in.KubeProxy.Config != nil { if in.KubeProxy.Config != nil {
kubeproxyconfig_v1alpha1.SetDefaults_KubeProxyConfiguration(in.KubeProxy.Config) kubeproxyconfigv1alpha1.SetDefaults_KubeProxyConfiguration(in.KubeProxy.Config)
} }
if in.KubeletConfiguration.BaseConfig != nil { if in.KubeletConfiguration.BaseConfig != nil {
v1beta1.SetDefaults_KubeletConfiguration(in.KubeletConfiguration.BaseConfig) v1beta1.SetDefaults_KubeletConfiguration(in.KubeletConfiguration.BaseConfig)

10
cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.conversion.go generated
View File

@@ -23,7 +23,7 @@ package v1alpha2
import ( import (
unsafe "unsafe" unsafe "unsafe"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
@@ -224,7 +224,7 @@ func autoConvert_v1alpha2_HostPathMount_To_kubeadm_HostPathMount(in *HostPathMou
out.HostPath = in.HostPath out.HostPath = in.HostPath
out.MountPath = in.MountPath out.MountPath = in.MountPath
out.Writable = in.Writable out.Writable = in.Writable
out.PathType = core_v1.HostPathType(in.PathType) out.PathType = corev1.HostPathType(in.PathType)
return nil return nil
} }
@@ -238,7 +238,7 @@ func autoConvert_kubeadm_HostPathMount_To_v1alpha2_HostPathMount(in *kubeadm.Hos
out.HostPath = in.HostPath out.HostPath = in.HostPath
out.MountPath = in.MountPath out.MountPath = in.MountPath
out.Writable = in.Writable out.Writable = in.Writable
out.PathType = core_v1.HostPathType(in.PathType) out.PathType = corev1.HostPathType(in.PathType)
return nil return nil
} }
@@ -477,7 +477,7 @@ func Convert_kubeadm_NodeConfiguration_To_v1alpha2_NodeConfiguration(in *kubeadm
func autoConvert_v1alpha2_NodeRegistrationOptions_To_kubeadm_NodeRegistrationOptions(in *NodeRegistrationOptions, out *kubeadm.NodeRegistrationOptions, s conversion.Scope) error { func autoConvert_v1alpha2_NodeRegistrationOptions_To_kubeadm_NodeRegistrationOptions(in *NodeRegistrationOptions, out *kubeadm.NodeRegistrationOptions, s conversion.Scope) error {
out.Name = in.Name out.Name = in.Name
out.CRISocket = in.CRISocket out.CRISocket = in.CRISocket
out.Taints = *(*[]core_v1.Taint)(unsafe.Pointer(&in.Taints)) out.Taints = *(*[]corev1.Taint)(unsafe.Pointer(&in.Taints))
out.KubeletExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.KubeletExtraArgs)) out.KubeletExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.KubeletExtraArgs))
return nil return nil
} }
@@ -490,7 +490,7 @@ func Convert_v1alpha2_NodeRegistrationOptions_To_kubeadm_NodeRegistrationOptions
func autoConvert_kubeadm_NodeRegistrationOptions_To_v1alpha2_NodeRegistrationOptions(in *kubeadm.NodeRegistrationOptions, out *NodeRegistrationOptions, s conversion.Scope) error { func autoConvert_kubeadm_NodeRegistrationOptions_To_v1alpha2_NodeRegistrationOptions(in *kubeadm.NodeRegistrationOptions, out *NodeRegistrationOptions, s conversion.Scope) error {
out.Name = in.Name out.Name = in.Name
out.CRISocket = in.CRISocket out.CRISocket = in.CRISocket
out.Taints = *(*[]core_v1.Taint)(unsafe.Pointer(&in.Taints)) out.Taints = *(*[]corev1.Taint)(unsafe.Pointer(&in.Taints))
out.KubeletExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.KubeletExtraArgs)) out.KubeletExtraArgs = *(*map[string]string)(unsafe.Pointer(&in.KubeletExtraArgs))
return nil return nil
} }

4
cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1alpha2 package v1alpha2
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
@@ -415,7 +415,7 @@ func (in *NodeRegistrationOptions) DeepCopyInto(out *NodeRegistrationOptions) {
*out = *in *out = *in
if in.Taints != nil { if in.Taints != nil {
in, out := &in.Taints, &out.Taints in, out := &in.Taints, &out.Taints
*out = make([]core_v1.Taint, len(*in)) *out = make([]corev1.Taint, len(*in))
for i := range *in { for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i]) (*in)[i].DeepCopyInto(&(*out)[i])
} }

4
cmd/kubeadm/app/apis/kubeadm/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package kubeadm package kubeadm
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
@@ -415,7 +415,7 @@ func (in *NodeRegistrationOptions) DeepCopyInto(out *NodeRegistrationOptions) {
*out = *in *out = *in
if in.Taints != nil { if in.Taints != nil {
in, out := &in.Taints, &out.Taints in, out := &in.Taints, &out.Taints
*out = make([]core_v1.Taint, len(*in)) *out = make([]corev1.Taint, len(*in))
for i := range *in { for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i]) (*in)[i].DeepCopyInto(&(*out)[i])
} }

2
hack/verify-pkg-names.sh
View File

@@ -26,7 +26,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::verify_go_version kube::golang::verify_go_version
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/src/k8s.io/client-go/*vendor/*' ':(exclude)staging/src/k8s.io/metrics/*' ':(exclude)pkg/apis/admission/v1beta1/zz_generated.conversion.go' ':(exclude)staging/src/k8s.io/sample-apiserver/pkg/client/informers/*' ':(exclude)staging/src/k8s.io/code-generator/_examples/*informers/*'; then if git --no-pager grep -E $'^(import |\t)[a-z]+[A-Z_][a-zA-Z]* "[^"]+"$' -- '**/*.go' ':(exclude)vendor/*' ':(exclude)staging/src/k8s.io/metrics/*' ; then
echo "!!! Some package aliases break go conventions." echo "!!! Some package aliases break go conventions."
echo "To fix these errors, do not use capitalized or underlined characters" echo "To fix these errors, do not use capitalized or underlined characters"
echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info." echo "in pkg aliases. Refer to https://blog.golang.org/package-names for more info."

8
pkg/apis/admission/zz_generated.deepcopy.go generated
View File

@@ -31,14 +31,10 @@ func (in *AdmissionRequest) DeepCopyInto(out *AdmissionRequest) {
out.Kind = in.Kind out.Kind = in.Kind
out.Resource = in.Resource out.Resource = in.Resource
in.UserInfo.DeepCopyInto(&out.UserInfo) in.UserInfo.DeepCopyInto(&out.UserInfo)
if in.Object == nil { if in.Object != nil {
out.Object = nil
} else {
out.Object = in.Object.DeepCopyObject() out.Object = in.Object.DeepCopyObject()
} }
if in.OldObject == nil { if in.OldObject != nil {
out.OldObject = nil
} else {
out.OldObject = in.OldObject.DeepCopyObject() out.OldObject = in.OldObject.DeepCopyObject()
} }
return return

68
pkg/apis/apps/v1/zz_generated.conversion.go generated
View File

@@ -24,13 +24,13 @@ import (
unsafe "unsafe" unsafe "unsafe"
v1 "k8s.io/api/apps/v1" v1 "k8s.io/api/apps/v1"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
apps "k8s.io/kubernetes/pkg/apis/apps" apps "k8s.io/kubernetes/pkg/apis/apps"
core "k8s.io/kubernetes/pkg/apis/core" core "k8s.io/kubernetes/pkg/apis/core"
apis_core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" apiscorev1 "k8s.io/kubernetes/pkg/apis/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions"
) )
@@ -209,7 +209,7 @@ func Convert_v1_DaemonSetCondition_To_extensions_DaemonSetCondition(in *v1.Daemo
func autoConvert_extensions_DaemonSetCondition_To_v1_DaemonSetCondition(in *extensions.DaemonSetCondition, out *v1.DaemonSetCondition, s conversion.Scope) error { func autoConvert_extensions_DaemonSetCondition_To_v1_DaemonSetCondition(in *extensions.DaemonSetCondition, out *v1.DaemonSetCondition, s conversion.Scope) error {
out.Type = v1.DaemonSetConditionType(in.Type) out.Type = v1.DaemonSetConditionType(in.Type)
out.Status = core_v1.ConditionStatus(in.Status) out.Status = corev1.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason out.Reason = in.Reason
out.Message = in.Message out.Message = in.Message
@@ -264,8 +264,8 @@ func Convert_extensions_DaemonSetList_To_v1_DaemonSetList(in *extensions.DaemonS
} }
func autoConvert_v1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *v1.DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error { func autoConvert_v1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *v1.DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error {
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := apis_core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_v1_DaemonSetUpdateStrategy_To_extensions_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil { if err := Convert_v1_DaemonSetUpdateStrategy_To_extensions_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
@@ -277,8 +277,8 @@ func autoConvert_v1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *v1.DaemonSetSp
} }
func autoConvert_extensions_DaemonSetSpec_To_v1_DaemonSetSpec(in *extensions.DaemonSetSpec, out *v1.DaemonSetSpec, s conversion.Scope) error { func autoConvert_extensions_DaemonSetSpec_To_v1_DaemonSetSpec(in *extensions.DaemonSetSpec, out *v1.DaemonSetSpec, s conversion.Scope) error {
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := apis_core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_extensions_DaemonSetUpdateStrategy_To_v1_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil { if err := Convert_extensions_DaemonSetUpdateStrategy_To_v1_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
@@ -395,7 +395,7 @@ func Convert_v1_DeploymentCondition_To_extensions_DeploymentCondition(in *v1.Dep
func autoConvert_extensions_DeploymentCondition_To_v1_DeploymentCondition(in *extensions.DeploymentCondition, out *v1.DeploymentCondition, s conversion.Scope) error { func autoConvert_extensions_DeploymentCondition_To_v1_DeploymentCondition(in *extensions.DeploymentCondition, out *v1.DeploymentCondition, s conversion.Scope) error {
out.Type = v1.DeploymentConditionType(in.Type) out.Type = v1.DeploymentConditionType(in.Type)
out.Status = core_v1.ConditionStatus(in.Status) out.Status = corev1.ConditionStatus(in.Status)
out.LastUpdateTime = in.LastUpdateTime out.LastUpdateTime = in.LastUpdateTime
out.LastTransitionTime = in.LastTransitionTime out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason out.Reason = in.Reason
@@ -451,11 +451,11 @@ func Convert_extensions_DeploymentList_To_v1_DeploymentList(in *extensions.Deplo
} }
func autoConvert_v1_DeploymentSpec_To_extensions_DeploymentSpec(in *v1.DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error { func autoConvert_v1_DeploymentSpec_To_extensions_DeploymentSpec(in *v1.DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := apis_core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_v1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := Convert_v1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
@@ -469,11 +469,11 @@ func autoConvert_v1_DeploymentSpec_To_extensions_DeploymentSpec(in *v1.Deploymen
} }
func autoConvert_extensions_DeploymentSpec_To_v1_DeploymentSpec(in *extensions.DeploymentSpec, out *v1.DeploymentSpec, s conversion.Scope) error { func autoConvert_extensions_DeploymentSpec_To_v1_DeploymentSpec(in *extensions.DeploymentSpec, out *v1.DeploymentSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := apis_core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_extensions_DeploymentStrategy_To_v1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := Convert_extensions_DeploymentStrategy_To_v1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
@@ -597,7 +597,7 @@ func Convert_v1_ReplicaSetCondition_To_extensions_ReplicaSetCondition(in *v1.Rep
func autoConvert_extensions_ReplicaSetCondition_To_v1_ReplicaSetCondition(in *extensions.ReplicaSetCondition, out *v1.ReplicaSetCondition, s conversion.Scope) error { func autoConvert_extensions_ReplicaSetCondition_To_v1_ReplicaSetCondition(in *extensions.ReplicaSetCondition, out *v1.ReplicaSetCondition, s conversion.Scope) error {
out.Type = v1.ReplicaSetConditionType(in.Type) out.Type = v1.ReplicaSetConditionType(in.Type)
out.Status = core_v1.ConditionStatus(in.Status) out.Status = corev1.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason out.Reason = in.Reason
out.Message = in.Message out.Message = in.Message
@@ -652,24 +652,24 @@ func Convert_extensions_ReplicaSetList_To_v1_ReplicaSetList(in *extensions.Repli
} }
func autoConvert_v1_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *v1.ReplicaSetSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error { func autoConvert_v1_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *v1.ReplicaSetSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.MinReadySeconds = in.MinReadySeconds out.MinReadySeconds = in.MinReadySeconds
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := apis_core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil
} }
func autoConvert_extensions_ReplicaSetSpec_To_v1_ReplicaSetSpec(in *extensions.ReplicaSetSpec, out *v1.ReplicaSetSpec, s conversion.Scope) error { func autoConvert_extensions_ReplicaSetSpec_To_v1_ReplicaSetSpec(in *extensions.ReplicaSetSpec, out *v1.ReplicaSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.MinReadySeconds = in.MinReadySeconds out.MinReadySeconds = in.MinReadySeconds
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := apis_core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil
@@ -728,7 +728,7 @@ func autoConvert_extensions_RollingUpdateDeployment_To_v1_RollingUpdateDeploymen
} }
func autoConvert_v1_RollingUpdateStatefulSetStrategy_To_apps_RollingUpdateStatefulSetStrategy(in *v1.RollingUpdateStatefulSetStrategy, out *apps.RollingUpdateStatefulSetStrategy, s conversion.Scope) error { func autoConvert_v1_RollingUpdateStatefulSetStrategy_To_apps_RollingUpdateStatefulSetStrategy(in *v1.RollingUpdateStatefulSetStrategy, out *apps.RollingUpdateStatefulSetStrategy, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Partition, &out.Partition, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Partition, &out.Partition, s); err != nil {
return err return err
} }
return nil return nil
@@ -740,7 +740,7 @@ func Convert_v1_RollingUpdateStatefulSetStrategy_To_apps_RollingUpdateStatefulSe
} }
func autoConvert_apps_RollingUpdateStatefulSetStrategy_To_v1_RollingUpdateStatefulSetStrategy(in *apps.RollingUpdateStatefulSetStrategy, out *v1.RollingUpdateStatefulSetStrategy, s conversion.Scope) error { func autoConvert_apps_RollingUpdateStatefulSetStrategy_To_v1_RollingUpdateStatefulSetStrategy(in *apps.RollingUpdateStatefulSetStrategy, out *v1.RollingUpdateStatefulSetStrategy, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Partition, &out.Partition, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Partition, &out.Partition, s); err != nil {
return err return err
} }
return nil return nil
@@ -799,7 +799,7 @@ func Convert_v1_StatefulSetCondition_To_apps_StatefulSetCondition(in *v1.Statefu
func autoConvert_apps_StatefulSetCondition_To_v1_StatefulSetCondition(in *apps.StatefulSetCondition, out *v1.StatefulSetCondition, s conversion.Scope) error { func autoConvert_apps_StatefulSetCondition_To_v1_StatefulSetCondition(in *apps.StatefulSetCondition, out *v1.StatefulSetCondition, s conversion.Scope) error {
out.Type = v1.StatefulSetConditionType(in.Type) out.Type = v1.StatefulSetConditionType(in.Type)
out.Status = core_v1.ConditionStatus(in.Status) out.Status = corev1.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason out.Reason = in.Reason
out.Message = in.Message out.Message = in.Message
@@ -854,11 +854,11 @@ func Convert_apps_StatefulSetList_To_v1_StatefulSetList(in *apps.StatefulSetList
} }
func autoConvert_v1_StatefulSetSpec_To_apps_StatefulSetSpec(in *v1.StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error { func autoConvert_v1_StatefulSetSpec_To_apps_StatefulSetSpec(in *v1.StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := apis_core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
out.VolumeClaimTemplates = *(*[]core.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.VolumeClaimTemplates = *(*[]core.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates))
@@ -872,14 +872,14 @@ func autoConvert_v1_StatefulSetSpec_To_apps_StatefulSetSpec(in *v1.StatefulSetSp
} }
func autoConvert_apps_StatefulSetSpec_To_v1_StatefulSetSpec(in *apps.StatefulSetSpec, out *v1.StatefulSetSpec, s conversion.Scope) error { func autoConvert_apps_StatefulSetSpec_To_v1_StatefulSetSpec(in *apps.StatefulSetSpec, out *v1.StatefulSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := apis_core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
out.VolumeClaimTemplates = *(*[]core_v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.VolumeClaimTemplates = *(*[]corev1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates))
out.ServiceName = in.ServiceName out.ServiceName = in.ServiceName
out.PodManagementPolicy = v1.PodManagementPolicyType(in.PodManagementPolicy) out.PodManagementPolicy = v1.PodManagementPolicyType(in.PodManagementPolicy)
if err := Convert_apps_StatefulSetUpdateStrategy_To_v1_StatefulSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil { if err := Convert_apps_StatefulSetUpdateStrategy_To_v1_StatefulSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
@@ -890,7 +890,7 @@ func autoConvert_apps_StatefulSetSpec_To_v1_StatefulSetSpec(in *apps.StatefulSet
} }
func autoConvert_v1_StatefulSetStatus_To_apps_StatefulSetStatus(in *v1.StatefulSetStatus, out *apps.StatefulSetStatus, s conversion.Scope) error { func autoConvert_v1_StatefulSetStatus_To_apps_StatefulSetStatus(in *v1.StatefulSetStatus, out *apps.StatefulSetStatus, s conversion.Scope) error {
if err := meta_v1.Convert_int64_To_Pointer_int64(&in.ObservedGeneration, &out.ObservedGeneration, s); err != nil { if err := metav1.Convert_int64_To_Pointer_int64(&in.ObservedGeneration, &out.ObservedGeneration, s); err != nil {
return err return err
} }
out.Replicas = in.Replicas out.Replicas = in.Replicas
@@ -905,7 +905,7 @@ func autoConvert_v1_StatefulSetStatus_To_apps_StatefulSetStatus(in *v1.StatefulS
} }
func autoConvert_apps_StatefulSetStatus_To_v1_StatefulSetStatus(in *apps.StatefulSetStatus, out *v1.StatefulSetStatus, s conversion.Scope) error { func autoConvert_apps_StatefulSetStatus_To_v1_StatefulSetStatus(in *apps.StatefulSetStatus, out *v1.StatefulSetStatus, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int64_To_int64(&in.ObservedGeneration, &out.ObservedGeneration, s); err != nil { if err := metav1.Convert_Pointer_int64_To_int64(&in.ObservedGeneration, &out.ObservedGeneration, s); err != nil {
return err return err
} }
out.Replicas = in.Replicas out.Replicas = in.Replicas

298
pkg/apis/apps/v1/zz_generated.defaults.go generated
View File

@@ -23,7 +23,7 @@ package v1
import ( import (
v1 "k8s.io/api/apps/v1" v1 "k8s.io/api/apps/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
) )
// RegisterDefaults adds defaulters functions to the given scheme. // RegisterDefaults adds defaulters functions to the given scheme.
@@ -43,138 +43,138 @@ func RegisterDefaults(scheme *runtime.Scheme) error {
func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) {
SetDefaults_DaemonSet(in) SetDefaults_DaemonSet(in)
core_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec)
for i := range in.Spec.Template.Spec.Volumes { for i := range in.Spec.Template.Spec.Volumes {
a := &in.Spec.Template.Spec.Volumes[i] a := &in.Spec.Template.Spec.Volumes[i]
core_v1.SetDefaults_Volume(a) corev1.SetDefaults_Volume(a)
if a.VolumeSource.HostPath != nil { if a.VolumeSource.HostPath != nil {
core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath)
} }
if a.VolumeSource.Secret != nil { if a.VolumeSource.Secret != nil {
core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
} }
if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI != nil {
core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
} }
if a.VolumeSource.RBD != nil { if a.VolumeSource.RBD != nil {
core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD)
} }
if a.VolumeSource.DownwardAPI != nil { if a.VolumeSource.DownwardAPI != nil {
core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI)
for j := range a.VolumeSource.DownwardAPI.Items { for j := range a.VolumeSource.DownwardAPI.Items {
b := &a.VolumeSource.DownwardAPI.Items[j] b := &a.VolumeSource.DownwardAPI.Items[j]
if b.FieldRef != nil { if b.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.FieldRef)
} }
} }
} }
if a.VolumeSource.ConfigMap != nil { if a.VolumeSource.ConfigMap != nil {
core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap)
} }
if a.VolumeSource.AzureDisk != nil { if a.VolumeSource.AzureDisk != nil {
core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk)
} }
if a.VolumeSource.Projected != nil { if a.VolumeSource.Projected != nil {
core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected)
for j := range a.VolumeSource.Projected.Sources { for j := range a.VolumeSource.Projected.Sources {
b := &a.VolumeSource.Projected.Sources[j] b := &a.VolumeSource.Projected.Sources[j]
if b.DownwardAPI != nil { if b.DownwardAPI != nil {
for k := range b.DownwardAPI.Items { for k := range b.DownwardAPI.Items {
c := &b.DownwardAPI.Items[k] c := &b.DownwardAPI.Items[k]
if c.FieldRef != nil { if c.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) corev1.SetDefaults_ObjectFieldSelector(c.FieldRef)
} }
} }
} }
if b.ServiceAccountToken != nil { if b.ServiceAccountToken != nil {
core_v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken)
} }
} }
} }
if a.VolumeSource.ScaleIO != nil { if a.VolumeSource.ScaleIO != nil {
core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO)
} }
} }
for i := range in.Spec.Template.Spec.InitContainers { for i := range in.Spec.Template.Spec.InitContainers {
a := &in.Spec.Template.Spec.InitContainers[i] a := &in.Spec.Template.Spec.InitContainers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }
} }
for i := range in.Spec.Template.Spec.Containers { for i := range in.Spec.Template.Spec.Containers {
a := &in.Spec.Template.Spec.Containers[i] a := &in.Spec.Template.Spec.Containers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }
@@ -190,138 +190,138 @@ func SetObjectDefaults_DaemonSetList(in *v1.DaemonSetList) {
func SetObjectDefaults_Deployment(in *v1.Deployment) { func SetObjectDefaults_Deployment(in *v1.Deployment) {
SetDefaults_Deployment(in) SetDefaults_Deployment(in)
core_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec)
for i := range in.Spec.Template.Spec.Volumes { for i := range in.Spec.Template.Spec.Volumes {
a := &in.Spec.Template.Spec.Volumes[i] a := &in.Spec.Template.Spec.Volumes[i]
core_v1.SetDefaults_Volume(a) corev1.SetDefaults_Volume(a)
if a.VolumeSource.HostPath != nil { if a.VolumeSource.HostPath != nil {
core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath)
} }
if a.VolumeSource.Secret != nil { if a.VolumeSource.Secret != nil {
core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
} }
if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI != nil {
core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
} }
if a.VolumeSource.RBD != nil { if a.VolumeSource.RBD != nil {
core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD)
} }
if a.VolumeSource.DownwardAPI != nil { if a.VolumeSource.DownwardAPI != nil {
core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI)
for j := range a.VolumeSource.DownwardAPI.Items { for j := range a.VolumeSource.DownwardAPI.Items {
b := &a.VolumeSource.DownwardAPI.Items[j] b := &a.VolumeSource.DownwardAPI.Items[j]
if b.FieldRef != nil { if b.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.FieldRef)
} }
} }
} }
if a.VolumeSource.ConfigMap != nil { if a.VolumeSource.ConfigMap != nil {
core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap)
} }
if a.VolumeSource.AzureDisk != nil { if a.VolumeSource.AzureDisk != nil {
core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk)
} }
if a.VolumeSource.Projected != nil { if a.VolumeSource.Projected != nil {
core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected)
for j := range a.VolumeSource.Projected.Sources { for j := range a.VolumeSource.Projected.Sources {
b := &a.VolumeSource.Projected.Sources[j] b := &a.VolumeSource.Projected.Sources[j]
if b.DownwardAPI != nil { if b.DownwardAPI != nil {
for k := range b.DownwardAPI.Items { for k := range b.DownwardAPI.Items {
c := &b.DownwardAPI.Items[k] c := &b.DownwardAPI.Items[k]
if c.FieldRef != nil { if c.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) corev1.SetDefaults_ObjectFieldSelector(c.FieldRef)
} }
} }
} }
if b.ServiceAccountToken != nil { if b.ServiceAccountToken != nil {
core_v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken)
} }
} }
} }
if a.VolumeSource.ScaleIO != nil { if a.VolumeSource.ScaleIO != nil {
core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO)
} }
} }
for i := range in.Spec.Template.Spec.InitContainers { for i := range in.Spec.Template.Spec.InitContainers {
a := &in.Spec.Template.Spec.InitContainers[i] a := &in.Spec.Template.Spec.InitContainers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }
} }
for i := range in.Spec.Template.Spec.Containers { for i := range in.Spec.Template.Spec.Containers {
a := &in.Spec.Template.Spec.Containers[i] a := &in.Spec.Template.Spec.Containers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }
@@ -337,138 +337,138 @@ func SetObjectDefaults_DeploymentList(in *v1.DeploymentList) {
func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) {
SetDefaults_ReplicaSet(in) SetDefaults_ReplicaSet(in)
core_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec)
for i := range in.Spec.Template.Spec.Volumes { for i := range in.Spec.Template.Spec.Volumes {
a := &in.Spec.Template.Spec.Volumes[i] a := &in.Spec.Template.Spec.Volumes[i]
core_v1.SetDefaults_Volume(a) corev1.SetDefaults_Volume(a)
if a.VolumeSource.HostPath != nil { if a.VolumeSource.HostPath != nil {
core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath)
} }
if a.VolumeSource.Secret != nil { if a.VolumeSource.Secret != nil {
core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
} }
if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI != nil {
core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
} }
if a.VolumeSource.RBD != nil { if a.VolumeSource.RBD != nil {
core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD)
} }
if a.VolumeSource.DownwardAPI != nil { if a.VolumeSource.DownwardAPI != nil {
core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI)
for j := range a.VolumeSource.DownwardAPI.Items { for j := range a.VolumeSource.DownwardAPI.Items {
b := &a.VolumeSource.DownwardAPI.Items[j] b := &a.VolumeSource.DownwardAPI.Items[j]
if b.FieldRef != nil { if b.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.FieldRef)
} }
} }
} }
if a.VolumeSource.ConfigMap != nil { if a.VolumeSource.ConfigMap != nil {
core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap)
} }
if a.VolumeSource.AzureDisk != nil { if a.VolumeSource.AzureDisk != nil {
core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk)
} }
if a.VolumeSource.Projected != nil { if a.VolumeSource.Projected != nil {
core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected)
for j := range a.VolumeSource.Projected.Sources { for j := range a.VolumeSource.Projected.Sources {
b := &a.VolumeSource.Projected.Sources[j] b := &a.VolumeSource.Projected.Sources[j]
if b.DownwardAPI != nil { if b.DownwardAPI != nil {
for k := range b.DownwardAPI.Items { for k := range b.DownwardAPI.Items {
c := &b.DownwardAPI.Items[k] c := &b.DownwardAPI.Items[k]
if c.FieldRef != nil { if c.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) corev1.SetDefaults_ObjectFieldSelector(c.FieldRef)
} }
} }
} }
if b.ServiceAccountToken != nil { if b.ServiceAccountToken != nil {
core_v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken)
} }
} }
} }
if a.VolumeSource.ScaleIO != nil { if a.VolumeSource.ScaleIO != nil {
core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO)
} }
} }
for i := range in.Spec.Template.Spec.InitContainers { for i := range in.Spec.Template.Spec.InitContainers {
a := &in.Spec.Template.Spec.InitContainers[i] a := &in.Spec.Template.Spec.InitContainers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }
} }
for i := range in.Spec.Template.Spec.Containers { for i := range in.Spec.Template.Spec.Containers {
a := &in.Spec.Template.Spec.Containers[i] a := &in.Spec.Template.Spec.Containers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }
@@ -484,148 +484,148 @@ func SetObjectDefaults_ReplicaSetList(in *v1.ReplicaSetList) {
func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) {
SetDefaults_StatefulSet(in) SetDefaults_StatefulSet(in)
core_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec)
for i := range in.Spec.Template.Spec.Volumes { for i := range in.Spec.Template.Spec.Volumes {
a := &in.Spec.Template.Spec.Volumes[i] a := &in.Spec.Template.Spec.Volumes[i]
core_v1.SetDefaults_Volume(a) corev1.SetDefaults_Volume(a)
if a.VolumeSource.HostPath != nil { if a.VolumeSource.HostPath != nil {
core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath)
} }
if a.VolumeSource.Secret != nil { if a.VolumeSource.Secret != nil {
core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
} }
if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI != nil {
core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
} }
if a.VolumeSource.RBD != nil { if a.VolumeSource.RBD != nil {
core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD)
} }
if a.VolumeSource.DownwardAPI != nil { if a.VolumeSource.DownwardAPI != nil {
core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI)
for j := range a.VolumeSource.DownwardAPI.Items { for j := range a.VolumeSource.DownwardAPI.Items {
b := &a.VolumeSource.DownwardAPI.Items[j] b := &a.VolumeSource.DownwardAPI.Items[j]
if b.FieldRef != nil { if b.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.FieldRef)
} }
} }
} }
if a.VolumeSource.ConfigMap != nil { if a.VolumeSource.ConfigMap != nil {
core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap)
} }
if a.VolumeSource.AzureDisk != nil { if a.VolumeSource.AzureDisk != nil {
core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk)
} }
if a.VolumeSource.Projected != nil { if a.VolumeSource.Projected != nil {
core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected)
for j := range a.VolumeSource.Projected.Sources { for j := range a.VolumeSource.Projected.Sources {
b := &a.VolumeSource.Projected.Sources[j] b := &a.VolumeSource.Projected.Sources[j]
if b.DownwardAPI != nil { if b.DownwardAPI != nil {
for k := range b.DownwardAPI.Items { for k := range b.DownwardAPI.Items {
c := &b.DownwardAPI.Items[k] c := &b.DownwardAPI.Items[k]
if c.FieldRef != nil { if c.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) corev1.SetDefaults_ObjectFieldSelector(c.FieldRef)
} }
} }
} }
if b.ServiceAccountToken != nil { if b.ServiceAccountToken != nil {
core_v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken)
} }
} }
} }
if a.VolumeSource.ScaleIO != nil { if a.VolumeSource.ScaleIO != nil {
core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO)
} }
} }
for i := range in.Spec.Template.Spec.InitContainers { for i := range in.Spec.Template.Spec.InitContainers {
a := &in.Spec.Template.Spec.InitContainers[i] a := &in.Spec.Template.Spec.InitContainers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }
} }
for i := range in.Spec.Template.Spec.Containers { for i := range in.Spec.Template.Spec.Containers {
a := &in.Spec.Template.Spec.Containers[i] a := &in.Spec.Template.Spec.Containers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }
} }
for i := range in.Spec.VolumeClaimTemplates { for i := range in.Spec.VolumeClaimTemplates {
a := &in.Spec.VolumeClaimTemplates[i] a := &in.Spec.VolumeClaimTemplates[i]
core_v1.SetDefaults_PersistentVolumeClaim(a) corev1.SetDefaults_PersistentVolumeClaim(a)
core_v1.SetDefaults_ResourceList(&a.Spec.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Spec.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Spec.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Spec.Resources.Requests)
core_v1.SetDefaults_ResourceList(&a.Status.Capacity) corev1.SetDefaults_ResourceList(&a.Status.Capacity)
} }
} }

32
pkg/apis/apps/v1beta1/zz_generated.conversion.go generated
View File

@@ -25,13 +25,13 @@ import (
v1beta1 "k8s.io/api/apps/v1beta1" v1beta1 "k8s.io/api/apps/v1beta1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
apps "k8s.io/kubernetes/pkg/apis/apps" apps "k8s.io/kubernetes/pkg/apis/apps"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
core "k8s.io/kubernetes/pkg/apis/core" core "k8s.io/kubernetes/pkg/apis/core"
core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions"
) )
@@ -291,11 +291,11 @@ func Convert_extensions_DeploymentRollback_To_v1beta1_DeploymentRollback(in *ext
} }
func autoConvert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *v1beta1.DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error { func autoConvert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *v1beta1.DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
@@ -310,11 +310,11 @@ func autoConvert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *v1beta1
} }
func autoConvert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensions.DeploymentSpec, out *v1beta1.DeploymentSpec, s conversion.Scope) error { func autoConvert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensions.DeploymentSpec, out *v1beta1.DeploymentSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
@@ -423,7 +423,7 @@ func autoConvert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDepl
} }
func autoConvert_v1beta1_RollingUpdateStatefulSetStrategy_To_apps_RollingUpdateStatefulSetStrategy(in *v1beta1.RollingUpdateStatefulSetStrategy, out *apps.RollingUpdateStatefulSetStrategy, s conversion.Scope) error { func autoConvert_v1beta1_RollingUpdateStatefulSetStrategy_To_apps_RollingUpdateStatefulSetStrategy(in *v1beta1.RollingUpdateStatefulSetStrategy, out *apps.RollingUpdateStatefulSetStrategy, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Partition, &out.Partition, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Partition, &out.Partition, s); err != nil {
return err return err
} }
return nil return nil
@@ -435,7 +435,7 @@ func Convert_v1beta1_RollingUpdateStatefulSetStrategy_To_apps_RollingUpdateState
} }
func autoConvert_apps_RollingUpdateStatefulSetStrategy_To_v1beta1_RollingUpdateStatefulSetStrategy(in *apps.RollingUpdateStatefulSetStrategy, out *v1beta1.RollingUpdateStatefulSetStrategy, s conversion.Scope) error { func autoConvert_apps_RollingUpdateStatefulSetStrategy_To_v1beta1_RollingUpdateStatefulSetStrategy(in *apps.RollingUpdateStatefulSetStrategy, out *v1beta1.RollingUpdateStatefulSetStrategy, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Partition, &out.Partition, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Partition, &out.Partition, s); err != nil {
return err return err
} }
return nil return nil
@@ -614,11 +614,11 @@ func Convert_apps_StatefulSetList_To_v1beta1_StatefulSetList(in *apps.StatefulSe
} }
func autoConvert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *v1beta1.StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error { func autoConvert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *v1beta1.StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
out.VolumeClaimTemplates = *(*[]core.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.VolumeClaimTemplates = *(*[]core.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates))
@@ -632,11 +632,11 @@ func autoConvert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *v1beta1.Sta
} }
func autoConvert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.StatefulSetSpec, out *v1beta1.StatefulSetSpec, s conversion.Scope) error { func autoConvert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.StatefulSetSpec, out *v1beta1.StatefulSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
out.VolumeClaimTemplates = *(*[]v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.VolumeClaimTemplates = *(*[]v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates))

56
pkg/apis/apps/v1beta2/zz_generated.conversion.go generated
View File

@@ -25,13 +25,13 @@ import (
v1beta2 "k8s.io/api/apps/v1beta2" v1beta2 "k8s.io/api/apps/v1beta2"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
apps "k8s.io/kubernetes/pkg/apis/apps" apps "k8s.io/kubernetes/pkg/apis/apps"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
core "k8s.io/kubernetes/pkg/apis/core" core "k8s.io/kubernetes/pkg/apis/core"
core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions"
) )
@@ -271,8 +271,8 @@ func Convert_extensions_DaemonSetList_To_v1beta2_DaemonSetList(in *extensions.Da
} }
func autoConvert_v1beta2_DaemonSetSpec_To_extensions_DaemonSetSpec(in *v1beta2.DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error { func autoConvert_v1beta2_DaemonSetSpec_To_extensions_DaemonSetSpec(in *v1beta2.DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error {
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_v1beta2_DaemonSetUpdateStrategy_To_extensions_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil { if err := Convert_v1beta2_DaemonSetUpdateStrategy_To_extensions_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
@@ -284,8 +284,8 @@ func autoConvert_v1beta2_DaemonSetSpec_To_extensions_DaemonSetSpec(in *v1beta2.D
} }
func autoConvert_extensions_DaemonSetSpec_To_v1beta2_DaemonSetSpec(in *extensions.DaemonSetSpec, out *v1beta2.DaemonSetSpec, s conversion.Scope) error { func autoConvert_extensions_DaemonSetSpec_To_v1beta2_DaemonSetSpec(in *extensions.DaemonSetSpec, out *v1beta2.DaemonSetSpec, s conversion.Scope) error {
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_extensions_DaemonSetUpdateStrategy_To_v1beta2_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil { if err := Convert_extensions_DaemonSetUpdateStrategy_To_v1beta2_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
@@ -458,11 +458,11 @@ func Convert_extensions_DeploymentList_To_v1beta2_DeploymentList(in *extensions.
} }
func autoConvert_v1beta2_DeploymentSpec_To_extensions_DeploymentSpec(in *v1beta2.DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error { func autoConvert_v1beta2_DeploymentSpec_To_extensions_DeploymentSpec(in *v1beta2.DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_v1beta2_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := Convert_v1beta2_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
@@ -476,11 +476,11 @@ func autoConvert_v1beta2_DeploymentSpec_To_extensions_DeploymentSpec(in *v1beta2
} }
func autoConvert_extensions_DeploymentSpec_To_v1beta2_DeploymentSpec(in *extensions.DeploymentSpec, out *v1beta2.DeploymentSpec, s conversion.Scope) error { func autoConvert_extensions_DeploymentSpec_To_v1beta2_DeploymentSpec(in *extensions.DeploymentSpec, out *v1beta2.DeploymentSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_extensions_DeploymentStrategy_To_v1beta2_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := Convert_extensions_DeploymentStrategy_To_v1beta2_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
@@ -659,24 +659,24 @@ func Convert_extensions_ReplicaSetList_To_v1beta2_ReplicaSetList(in *extensions.
} }
func autoConvert_v1beta2_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *v1beta2.ReplicaSetSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error { func autoConvert_v1beta2_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *v1beta2.ReplicaSetSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.MinReadySeconds = in.MinReadySeconds out.MinReadySeconds = in.MinReadySeconds
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil
} }
func autoConvert_extensions_ReplicaSetSpec_To_v1beta2_ReplicaSetSpec(in *extensions.ReplicaSetSpec, out *v1beta2.ReplicaSetSpec, s conversion.Scope) error { func autoConvert_extensions_ReplicaSetSpec_To_v1beta2_ReplicaSetSpec(in *extensions.ReplicaSetSpec, out *v1beta2.ReplicaSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.MinReadySeconds = in.MinReadySeconds out.MinReadySeconds = in.MinReadySeconds
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil
@@ -735,7 +735,7 @@ func autoConvert_extensions_RollingUpdateDeployment_To_v1beta2_RollingUpdateDepl
} }
func autoConvert_v1beta2_RollingUpdateStatefulSetStrategy_To_apps_RollingUpdateStatefulSetStrategy(in *v1beta2.RollingUpdateStatefulSetStrategy, out *apps.RollingUpdateStatefulSetStrategy, s conversion.Scope) error { func autoConvert_v1beta2_RollingUpdateStatefulSetStrategy_To_apps_RollingUpdateStatefulSetStrategy(in *v1beta2.RollingUpdateStatefulSetStrategy, out *apps.RollingUpdateStatefulSetStrategy, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Partition, &out.Partition, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Partition, &out.Partition, s); err != nil {
return err return err
} }
return nil return nil
@@ -747,7 +747,7 @@ func Convert_v1beta2_RollingUpdateStatefulSetStrategy_To_apps_RollingUpdateState
} }
func autoConvert_apps_RollingUpdateStatefulSetStrategy_To_v1beta2_RollingUpdateStatefulSetStrategy(in *apps.RollingUpdateStatefulSetStrategy, out *v1beta2.RollingUpdateStatefulSetStrategy, s conversion.Scope) error { func autoConvert_apps_RollingUpdateStatefulSetStrategy_To_v1beta2_RollingUpdateStatefulSetStrategy(in *apps.RollingUpdateStatefulSetStrategy, out *v1beta2.RollingUpdateStatefulSetStrategy, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Partition, &out.Partition, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Partition, &out.Partition, s); err != nil {
return err return err
} }
return nil return nil
@@ -926,11 +926,11 @@ func Convert_apps_StatefulSetList_To_v1beta2_StatefulSetList(in *apps.StatefulSe
} }
func autoConvert_v1beta2_StatefulSetSpec_To_apps_StatefulSetSpec(in *v1beta2.StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error { func autoConvert_v1beta2_StatefulSetSpec_To_apps_StatefulSetSpec(in *v1beta2.StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
out.VolumeClaimTemplates = *(*[]core.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.VolumeClaimTemplates = *(*[]core.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates))
@@ -944,11 +944,11 @@ func autoConvert_v1beta2_StatefulSetSpec_To_apps_StatefulSetSpec(in *v1beta2.Sta
} }
func autoConvert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec(in *apps.StatefulSetSpec, out *v1beta2.StatefulSetSpec, s conversion.Scope) error { func autoConvert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec(in *apps.StatefulSetSpec, out *v1beta2.StatefulSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
out.VolumeClaimTemplates = *(*[]v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.VolumeClaimTemplates = *(*[]v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates))
@@ -962,7 +962,7 @@ func autoConvert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec(in *apps.Statef
} }
func autoConvert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus(in *v1beta2.StatefulSetStatus, out *apps.StatefulSetStatus, s conversion.Scope) error { func autoConvert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus(in *v1beta2.StatefulSetStatus, out *apps.StatefulSetStatus, s conversion.Scope) error {
if err := meta_v1.Convert_int64_To_Pointer_int64(&in.ObservedGeneration, &out.ObservedGeneration, s); err != nil { if err := metav1.Convert_int64_To_Pointer_int64(&in.ObservedGeneration, &out.ObservedGeneration, s); err != nil {
return err return err
} }
out.Replicas = in.Replicas out.Replicas = in.Replicas
@@ -977,7 +977,7 @@ func autoConvert_v1beta2_StatefulSetStatus_To_apps_StatefulSetStatus(in *v1beta2
} }
func autoConvert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus(in *apps.StatefulSetStatus, out *v1beta2.StatefulSetStatus, s conversion.Scope) error { func autoConvert_apps_StatefulSetStatus_To_v1beta2_StatefulSetStatus(in *apps.StatefulSetStatus, out *v1beta2.StatefulSetStatus, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int64_To_int64(&in.ObservedGeneration, &out.ObservedGeneration, s); err != nil { if err := metav1.Convert_Pointer_int64_To_int64(&in.ObservedGeneration, &out.ObservedGeneration, s); err != nil {
return err return err
} }
out.Replicas = in.Replicas out.Replicas = in.Replicas

4
pkg/apis/apps/zz_generated.deepcopy.go generated
View File

@@ -31,9 +31,7 @@ func (in *ControllerRevision) DeepCopyInto(out *ControllerRevision) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
if in.Data == nil { if in.Data != nil {
out.Data = nil
} else {
out.Data = in.Data.DeepCopyObject() out.Data = in.Data.DeepCopyObject()
} }
return return

6
pkg/apis/authentication/v1/zz_generated.conversion.go generated
View File

@@ -24,7 +24,7 @@ import (
unsafe "unsafe" unsafe "unsafe"
v1 "k8s.io/api/authentication/v1" v1 "k8s.io/api/authentication/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
@@ -118,7 +118,7 @@ func Convert_authentication_TokenRequest_To_v1_TokenRequest(in *authentication.T
func autoConvert_v1_TokenRequestSpec_To_authentication_TokenRequestSpec(in *v1.TokenRequestSpec, out *authentication.TokenRequestSpec, s conversion.Scope) error { func autoConvert_v1_TokenRequestSpec_To_authentication_TokenRequestSpec(in *v1.TokenRequestSpec, out *authentication.TokenRequestSpec, s conversion.Scope) error {
out.Audiences = *(*[]string)(unsafe.Pointer(&in.Audiences)) out.Audiences = *(*[]string)(unsafe.Pointer(&in.Audiences))
if err := meta_v1.Convert_Pointer_int64_To_int64(&in.ExpirationSeconds, &out.ExpirationSeconds, s); err != nil { if err := metav1.Convert_Pointer_int64_To_int64(&in.ExpirationSeconds, &out.ExpirationSeconds, s); err != nil {
return err return err
} }
out.BoundObjectRef = (*authentication.BoundObjectReference)(unsafe.Pointer(in.BoundObjectRef)) out.BoundObjectRef = (*authentication.BoundObjectReference)(unsafe.Pointer(in.BoundObjectRef))
@@ -132,7 +132,7 @@ func Convert_v1_TokenRequestSpec_To_authentication_TokenRequestSpec(in *v1.Token
func autoConvert_authentication_TokenRequestSpec_To_v1_TokenRequestSpec(in *authentication.TokenRequestSpec, out *v1.TokenRequestSpec, s conversion.Scope) error { func autoConvert_authentication_TokenRequestSpec_To_v1_TokenRequestSpec(in *authentication.TokenRequestSpec, out *v1.TokenRequestSpec, s conversion.Scope) error {
out.Audiences = *(*[]string)(unsafe.Pointer(&in.Audiences)) out.Audiences = *(*[]string)(unsafe.Pointer(&in.Audiences))
if err := meta_v1.Convert_int64_To_Pointer_int64(&in.ExpirationSeconds, &out.ExpirationSeconds, s); err != nil { if err := metav1.Convert_int64_To_Pointer_int64(&in.ExpirationSeconds, &out.ExpirationSeconds, s); err != nil {
return err return err
} }
out.BoundObjectRef = (*v1.BoundObjectReference)(unsafe.Pointer(in.BoundObjectRef)) out.BoundObjectRef = (*v1.BoundObjectReference)(unsafe.Pointer(in.BoundObjectRef))

22
pkg/apis/autoscaling/v1/zz_generated.conversion.go generated
View File

@@ -24,9 +24,9 @@ import (
unsafe "unsafe" unsafe "unsafe"
v1 "k8s.io/api/autoscaling/v1" v1 "k8s.io/api/autoscaling/v1"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
resource "k8s.io/apimachinery/pkg/api/resource" resource "k8s.io/apimachinery/pkg/api/resource"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
@@ -108,7 +108,7 @@ func Convert_autoscaling_CrossVersionObjectReference_To_v1_CrossVersionObjectRef
func autoConvert_v1_ExternalMetricSource_To_autoscaling_ExternalMetricSource(in *v1.ExternalMetricSource, out *autoscaling.ExternalMetricSource, s conversion.Scope) error { func autoConvert_v1_ExternalMetricSource_To_autoscaling_ExternalMetricSource(in *v1.ExternalMetricSource, out *autoscaling.ExternalMetricSource, s conversion.Scope) error {
out.MetricName = in.MetricName out.MetricName = in.MetricName
out.MetricSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.MetricSelector)) out.MetricSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.MetricSelector))
out.TargetValue = (*resource.Quantity)(unsafe.Pointer(in.TargetValue)) out.TargetValue = (*resource.Quantity)(unsafe.Pointer(in.TargetValue))
out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue)) out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue))
return nil return nil
@@ -121,7 +121,7 @@ func Convert_v1_ExternalMetricSource_To_autoscaling_ExternalMetricSource(in *v1.
func autoConvert_autoscaling_ExternalMetricSource_To_v1_ExternalMetricSource(in *autoscaling.ExternalMetricSource, out *v1.ExternalMetricSource, s conversion.Scope) error { func autoConvert_autoscaling_ExternalMetricSource_To_v1_ExternalMetricSource(in *autoscaling.ExternalMetricSource, out *v1.ExternalMetricSource, s conversion.Scope) error {
out.MetricName = in.MetricName out.MetricName = in.MetricName
out.MetricSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.MetricSelector)) out.MetricSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.MetricSelector))
out.TargetValue = (*resource.Quantity)(unsafe.Pointer(in.TargetValue)) out.TargetValue = (*resource.Quantity)(unsafe.Pointer(in.TargetValue))
out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue)) out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue))
return nil return nil
@@ -134,7 +134,7 @@ func Convert_autoscaling_ExternalMetricSource_To_v1_ExternalMetricSource(in *aut
func autoConvert_v1_ExternalMetricStatus_To_autoscaling_ExternalMetricStatus(in *v1.ExternalMetricStatus, out *autoscaling.ExternalMetricStatus, s conversion.Scope) error { func autoConvert_v1_ExternalMetricStatus_To_autoscaling_ExternalMetricStatus(in *v1.ExternalMetricStatus, out *autoscaling.ExternalMetricStatus, s conversion.Scope) error {
out.MetricName = in.MetricName out.MetricName = in.MetricName
out.MetricSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.MetricSelector)) out.MetricSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.MetricSelector))
out.CurrentValue = in.CurrentValue out.CurrentValue = in.CurrentValue
out.CurrentAverageValue = (*resource.Quantity)(unsafe.Pointer(in.CurrentAverageValue)) out.CurrentAverageValue = (*resource.Quantity)(unsafe.Pointer(in.CurrentAverageValue))
return nil return nil
@@ -147,7 +147,7 @@ func Convert_v1_ExternalMetricStatus_To_autoscaling_ExternalMetricStatus(in *v1.
func autoConvert_autoscaling_ExternalMetricStatus_To_v1_ExternalMetricStatus(in *autoscaling.ExternalMetricStatus, out *v1.ExternalMetricStatus, s conversion.Scope) error { func autoConvert_autoscaling_ExternalMetricStatus_To_v1_ExternalMetricStatus(in *autoscaling.ExternalMetricStatus, out *v1.ExternalMetricStatus, s conversion.Scope) error {
out.MetricName = in.MetricName out.MetricName = in.MetricName
out.MetricSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.MetricSelector)) out.MetricSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.MetricSelector))
out.CurrentValue = in.CurrentValue out.CurrentValue = in.CurrentValue
out.CurrentAverageValue = (*resource.Quantity)(unsafe.Pointer(in.CurrentAverageValue)) out.CurrentAverageValue = (*resource.Quantity)(unsafe.Pointer(in.CurrentAverageValue))
return nil return nil
@@ -196,7 +196,7 @@ func Convert_v1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAut
func autoConvert_autoscaling_HorizontalPodAutoscalerCondition_To_v1_HorizontalPodAutoscalerCondition(in *autoscaling.HorizontalPodAutoscalerCondition, out *v1.HorizontalPodAutoscalerCondition, s conversion.Scope) error { func autoConvert_autoscaling_HorizontalPodAutoscalerCondition_To_v1_HorizontalPodAutoscalerCondition(in *autoscaling.HorizontalPodAutoscalerCondition, out *v1.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
out.Type = v1.HorizontalPodAutoscalerConditionType(in.Type) out.Type = v1.HorizontalPodAutoscalerConditionType(in.Type)
out.Status = core_v1.ConditionStatus(in.Status) out.Status = corev1.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason out.Reason = in.Reason
out.Message = in.Message out.Message = in.Message
@@ -272,7 +272,7 @@ func autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAuto
func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *v1.HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error { func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *v1.HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.LastScaleTime = (*metav1.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas out.DesiredReplicas = in.DesiredReplicas
// WARNING: in.CurrentCPUUtilizationPercentage requires manual conversion: does not exist in peer-type // WARNING: in.CurrentCPUUtilizationPercentage requires manual conversion: does not exist in peer-type
@@ -281,7 +281,7 @@ func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAu
func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *v1.HorizontalPodAutoscalerStatus, s conversion.Scope) error { func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *v1.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.LastScaleTime = (*metav1.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas out.DesiredReplicas = in.DesiredReplicas
// WARNING: in.CurrentMetrics requires manual conversion: does not exist in peer-type // WARNING: in.CurrentMetrics requires manual conversion: does not exist in peer-type
@@ -458,7 +458,7 @@ func Convert_v1_ResourceMetricSource_To_autoscaling_ResourceMetricSource(in *v1.
} }
func autoConvert_autoscaling_ResourceMetricSource_To_v1_ResourceMetricSource(in *autoscaling.ResourceMetricSource, out *v1.ResourceMetricSource, s conversion.Scope) error { func autoConvert_autoscaling_ResourceMetricSource_To_v1_ResourceMetricSource(in *autoscaling.ResourceMetricSource, out *v1.ResourceMetricSource, s conversion.Scope) error {
out.Name = core_v1.ResourceName(in.Name) out.Name = corev1.ResourceName(in.Name)
out.TargetAverageUtilization = (*int32)(unsafe.Pointer(in.TargetAverageUtilization)) out.TargetAverageUtilization = (*int32)(unsafe.Pointer(in.TargetAverageUtilization))
out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue)) out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue))
return nil return nil
@@ -482,7 +482,7 @@ func Convert_v1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus(in *v1.
} }
func autoConvert_autoscaling_ResourceMetricStatus_To_v1_ResourceMetricStatus(in *autoscaling.ResourceMetricStatus, out *v1.ResourceMetricStatus, s conversion.Scope) error { func autoConvert_autoscaling_ResourceMetricStatus_To_v1_ResourceMetricStatus(in *autoscaling.ResourceMetricStatus, out *v1.ResourceMetricStatus, s conversion.Scope) error {
out.Name = core_v1.ResourceName(in.Name) out.Name = corev1.ResourceName(in.Name)
out.CurrentAverageUtilization = (*int32)(unsafe.Pointer(in.CurrentAverageUtilization)) out.CurrentAverageUtilization = (*int32)(unsafe.Pointer(in.CurrentAverageUtilization))
out.CurrentAverageValue = in.CurrentAverageValue out.CurrentAverageValue = in.CurrentAverageValue
return nil return nil

8
pkg/apis/autoscaling/v2beta1/zz_generated.conversion.go generated
View File

@@ -24,7 +24,7 @@ import (
unsafe "unsafe" unsafe "unsafe"
v2beta1 "k8s.io/api/autoscaling/v2beta1" v2beta1 "k8s.io/api/autoscaling/v2beta1"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
resource "k8s.io/apimachinery/pkg/api/resource" resource "k8s.io/apimachinery/pkg/api/resource"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
@@ -200,7 +200,7 @@ func Convert_v2beta1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalP
func autoConvert_autoscaling_HorizontalPodAutoscalerCondition_To_v2beta1_HorizontalPodAutoscalerCondition(in *autoscaling.HorizontalPodAutoscalerCondition, out *v2beta1.HorizontalPodAutoscalerCondition, s conversion.Scope) error { func autoConvert_autoscaling_HorizontalPodAutoscalerCondition_To_v2beta1_HorizontalPodAutoscalerCondition(in *autoscaling.HorizontalPodAutoscalerCondition, out *v2beta1.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
out.Type = v2beta1.HorizontalPodAutoscalerConditionType(in.Type) out.Type = v2beta1.HorizontalPodAutoscalerConditionType(in.Type)
out.Status = core_v1.ConditionStatus(in.Status) out.Status = corev1.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason out.Reason = in.Reason
out.Message = in.Message out.Message = in.Message
@@ -463,7 +463,7 @@ func Convert_v2beta1_ResourceMetricSource_To_autoscaling_ResourceMetricSource(in
} }
func autoConvert_autoscaling_ResourceMetricSource_To_v2beta1_ResourceMetricSource(in *autoscaling.ResourceMetricSource, out *v2beta1.ResourceMetricSource, s conversion.Scope) error { func autoConvert_autoscaling_ResourceMetricSource_To_v2beta1_ResourceMetricSource(in *autoscaling.ResourceMetricSource, out *v2beta1.ResourceMetricSource, s conversion.Scope) error {
out.Name = core_v1.ResourceName(in.Name) out.Name = corev1.ResourceName(in.Name)
out.TargetAverageUtilization = (*int32)(unsafe.Pointer(in.TargetAverageUtilization)) out.TargetAverageUtilization = (*int32)(unsafe.Pointer(in.TargetAverageUtilization))
out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue)) out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue))
return nil return nil
@@ -487,7 +487,7 @@ func Convert_v2beta1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus(in
} }
func autoConvert_autoscaling_ResourceMetricStatus_To_v2beta1_ResourceMetricStatus(in *autoscaling.ResourceMetricStatus, out *v2beta1.ResourceMetricStatus, s conversion.Scope) error { func autoConvert_autoscaling_ResourceMetricStatus_To_v2beta1_ResourceMetricStatus(in *autoscaling.ResourceMetricStatus, out *v2beta1.ResourceMetricStatus, s conversion.Scope) error {
out.Name = core_v1.ResourceName(in.Name) out.Name = corev1.ResourceName(in.Name)
out.CurrentAverageUtilization = (*int32)(unsafe.Pointer(in.CurrentAverageUtilization)) out.CurrentAverageUtilization = (*int32)(unsafe.Pointer(in.CurrentAverageUtilization))
out.CurrentAverageValue = in.CurrentAverageValue out.CurrentAverageValue = in.CurrentAverageValue
return nil return nil

24
pkg/apis/batch/v1/zz_generated.conversion.go generated
View File

@@ -24,13 +24,13 @@ import (
unsafe "unsafe" unsafe "unsafe"
v1 "k8s.io/api/batch/v1" v1 "k8s.io/api/batch/v1"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
batch "k8s.io/kubernetes/pkg/apis/batch" batch "k8s.io/kubernetes/pkg/apis/batch"
core "k8s.io/kubernetes/pkg/apis/core" core "k8s.io/kubernetes/pkg/apis/core"
apis_core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" apiscorev1 "k8s.io/kubernetes/pkg/apis/core/v1"
) )
func init() { func init() {
@@ -103,7 +103,7 @@ func Convert_v1_JobCondition_To_batch_JobCondition(in *v1.JobCondition, out *bat
func autoConvert_batch_JobCondition_To_v1_JobCondition(in *batch.JobCondition, out *v1.JobCondition, s conversion.Scope) error { func autoConvert_batch_JobCondition_To_v1_JobCondition(in *batch.JobCondition, out *v1.JobCondition, s conversion.Scope) error {
out.Type = v1.JobConditionType(in.Type) out.Type = v1.JobConditionType(in.Type)
out.Status = core_v1.ConditionStatus(in.Status) out.Status = corev1.ConditionStatus(in.Status)
out.LastProbeTime = in.LastProbeTime out.LastProbeTime = in.LastProbeTime
out.LastTransitionTime = in.LastTransitionTime out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason out.Reason = in.Reason
@@ -163,9 +163,9 @@ func autoConvert_v1_JobSpec_To_batch_JobSpec(in *v1.JobSpec, out *batch.JobSpec,
out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.Completions = (*int32)(unsafe.Pointer(in.Completions))
out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds))
out.BackoffLimit = (*int32)(unsafe.Pointer(in.BackoffLimit)) out.BackoffLimit = (*int32)(unsafe.Pointer(in.BackoffLimit))
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector))
if err := apis_core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil
@@ -176,9 +176,9 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *v1.JobSpec,
out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.Completions = (*int32)(unsafe.Pointer(in.Completions))
out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds))
out.BackoffLimit = (*int32)(unsafe.Pointer(in.BackoffLimit)) out.BackoffLimit = (*int32)(unsafe.Pointer(in.BackoffLimit))
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector))
if err := apis_core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := apiscorev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil
@@ -186,8 +186,8 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *v1.JobSpec,
func autoConvert_v1_JobStatus_To_batch_JobStatus(in *v1.JobStatus, out *batch.JobStatus, s conversion.Scope) error { func autoConvert_v1_JobStatus_To_batch_JobStatus(in *v1.JobStatus, out *batch.JobStatus, s conversion.Scope) error {
out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions)) out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions))
out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime)) out.CompletionTime = (*metav1.Time)(unsafe.Pointer(in.CompletionTime))
out.Active = in.Active out.Active = in.Active
out.Succeeded = in.Succeeded out.Succeeded = in.Succeeded
out.Failed = in.Failed out.Failed = in.Failed
@@ -201,8 +201,8 @@ func Convert_v1_JobStatus_To_batch_JobStatus(in *v1.JobStatus, out *batch.JobSta
func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *v1.JobStatus, s conversion.Scope) error { func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *v1.JobStatus, s conversion.Scope) error {
out.Conditions = *(*[]v1.JobCondition)(unsafe.Pointer(&in.Conditions)) out.Conditions = *(*[]v1.JobCondition)(unsafe.Pointer(&in.Conditions))
out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime)) out.CompletionTime = (*metav1.Time)(unsafe.Pointer(in.CompletionTime))
out.Active = in.Active out.Active = in.Active
out.Succeeded = in.Succeeded out.Succeeded = in.Succeeded
out.Failed = in.Failed out.Failed = in.Failed

74
pkg/apis/batch/v1/zz_generated.defaults.go generated
View File

@@ -23,7 +23,7 @@ package v1
import ( import (
v1 "k8s.io/api/batch/v1" v1 "k8s.io/api/batch/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
) )
// RegisterDefaults adds defaulters functions to the given scheme. // RegisterDefaults adds defaulters functions to the given scheme.
@@ -37,138 +37,138 @@ func RegisterDefaults(scheme *runtime.Scheme) error {
func SetObjectDefaults_Job(in *v1.Job) { func SetObjectDefaults_Job(in *v1.Job) {
SetDefaults_Job(in) SetDefaults_Job(in)
core_v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec)
for i := range in.Spec.Template.Spec.Volumes { for i := range in.Spec.Template.Spec.Volumes {
a := &in.Spec.Template.Spec.Volumes[i] a := &in.Spec.Template.Spec.Volumes[i]
core_v1.SetDefaults_Volume(a) corev1.SetDefaults_Volume(a)
if a.VolumeSource.HostPath != nil { if a.VolumeSource.HostPath != nil {
core_v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath)
} }
if a.VolumeSource.Secret != nil { if a.VolumeSource.Secret != nil {
core_v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
} }
if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI != nil {
core_v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
} }
if a.VolumeSource.RBD != nil { if a.VolumeSource.RBD != nil {
core_v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD)
} }
if a.VolumeSource.DownwardAPI != nil { if a.VolumeSource.DownwardAPI != nil {
core_v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI)
for j := range a.VolumeSource.DownwardAPI.Items { for j := range a.VolumeSource.DownwardAPI.Items {
b := &a.VolumeSource.DownwardAPI.Items[j] b := &a.VolumeSource.DownwardAPI.Items[j]
if b.FieldRef != nil { if b.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.FieldRef)
} }
} }
} }
if a.VolumeSource.ConfigMap != nil { if a.VolumeSource.ConfigMap != nil {
core_v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap)
} }
if a.VolumeSource.AzureDisk != nil { if a.VolumeSource.AzureDisk != nil {
core_v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk)
} }
if a.VolumeSource.Projected != nil { if a.VolumeSource.Projected != nil {
core_v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected)
for j := range a.VolumeSource.Projected.Sources { for j := range a.VolumeSource.Projected.Sources {
b := &a.VolumeSource.Projected.Sources[j] b := &a.VolumeSource.Projected.Sources[j]
if b.DownwardAPI != nil { if b.DownwardAPI != nil {
for k := range b.DownwardAPI.Items { for k := range b.DownwardAPI.Items {
c := &b.DownwardAPI.Items[k] c := &b.DownwardAPI.Items[k]
if c.FieldRef != nil { if c.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(c.FieldRef) corev1.SetDefaults_ObjectFieldSelector(c.FieldRef)
} }
} }
} }
if b.ServiceAccountToken != nil { if b.ServiceAccountToken != nil {
core_v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken)
} }
} }
} }
if a.VolumeSource.ScaleIO != nil { if a.VolumeSource.ScaleIO != nil {
core_v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO)
} }
} }
for i := range in.Spec.Template.Spec.InitContainers { for i := range in.Spec.Template.Spec.InitContainers {
a := &in.Spec.Template.Spec.InitContainers[i] a := &in.Spec.Template.Spec.InitContainers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }
} }
for i := range in.Spec.Template.Spec.Containers { for i := range in.Spec.Template.Spec.Containers {
a := &in.Spec.Template.Spec.Containers[i] a := &in.Spec.Template.Spec.Containers[i]
core_v1.SetDefaults_Container(a) corev1.SetDefaults_Container(a)
for j := range a.Ports { for j := range a.Ports {
b := &a.Ports[j] b := &a.Ports[j]
core_v1.SetDefaults_ContainerPort(b) corev1.SetDefaults_ContainerPort(b)
} }
for j := range a.Env { for j := range a.Env {
b := &a.Env[j] b := &a.Env[j]
if b.ValueFrom != nil { if b.ValueFrom != nil {
if b.ValueFrom.FieldRef != nil { if b.ValueFrom.FieldRef != nil {
core_v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef)
} }
} }
} }
core_v1.SetDefaults_ResourceList(&a.Resources.Limits) corev1.SetDefaults_ResourceList(&a.Resources.Limits)
core_v1.SetDefaults_ResourceList(&a.Resources.Requests) corev1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
core_v1.SetDefaults_Probe(a.LivenessProbe) corev1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.Handler.HTTPGet)
} }
} }
if a.ReadinessProbe != nil { if a.ReadinessProbe != nil {
core_v1.SetDefaults_Probe(a.ReadinessProbe) corev1.SetDefaults_Probe(a.ReadinessProbe)
if a.ReadinessProbe.Handler.HTTPGet != nil { if a.ReadinessProbe.Handler.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.Handler.HTTPGet)
} }
} }
if a.Lifecycle != nil { if a.Lifecycle != nil {
if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart != nil {
if a.Lifecycle.PostStart.HTTPGet != nil { if a.Lifecycle.PostStart.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet)
} }
} }
if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop != nil {
if a.Lifecycle.PreStop.HTTPGet != nil { if a.Lifecycle.PreStop.HTTPGet != nil {
core_v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet)
} }
} }
} }

10
pkg/apis/batch/v1beta1/zz_generated.conversion.go generated
View File

@@ -24,12 +24,12 @@ import (
unsafe "unsafe" unsafe "unsafe"
v1beta1 "k8s.io/api/batch/v1beta1" v1beta1 "k8s.io/api/batch/v1beta1"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
batch "k8s.io/kubernetes/pkg/apis/batch" batch "k8s.io/kubernetes/pkg/apis/batch"
batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
core "k8s.io/kubernetes/pkg/apis/core" core "k8s.io/kubernetes/pkg/apis/core"
) )
@@ -178,7 +178,7 @@ func Convert_v1beta1_CronJobStatus_To_batch_CronJobStatus(in *v1beta1.CronJobSta
} }
func autoConvert_batch_CronJobStatus_To_v1beta1_CronJobStatus(in *batch.CronJobStatus, out *v1beta1.CronJobStatus, s conversion.Scope) error { func autoConvert_batch_CronJobStatus_To_v1beta1_CronJobStatus(in *batch.CronJobStatus, out *v1beta1.CronJobStatus, s conversion.Scope) error {
out.Active = *(*[]core_v1.ObjectReference)(unsafe.Pointer(&in.Active)) out.Active = *(*[]corev1.ObjectReference)(unsafe.Pointer(&in.Active))
out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime)) out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime))
return nil return nil
} }
@@ -216,7 +216,7 @@ func Convert_batch_JobTemplate_To_v1beta1_JobTemplate(in *batch.JobTemplate, out
func autoConvert_v1beta1_JobTemplateSpec_To_batch_JobTemplateSpec(in *v1beta1.JobTemplateSpec, out *batch.JobTemplateSpec, s conversion.Scope) error { func autoConvert_v1beta1_JobTemplateSpec_To_batch_JobTemplateSpec(in *v1beta1.JobTemplateSpec, out *batch.JobTemplateSpec, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta out.ObjectMeta = in.ObjectMeta
if err := batch_v1.Convert_v1_JobSpec_To_batch_JobSpec(&in.Spec, &out.Spec, s); err != nil { if err := batchv1.Convert_v1_JobSpec_To_batch_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err return err
} }
return nil return nil
@@ -229,7 +229,7 @@ func Convert_v1beta1_JobTemplateSpec_To_batch_JobTemplateSpec(in *v1beta1.JobTem
func autoConvert_batch_JobTemplateSpec_To_v1beta1_JobTemplateSpec(in *batch.JobTemplateSpec, out *v1beta1.JobTemplateSpec, s conversion.Scope) error { func autoConvert_batch_JobTemplateSpec_To_v1beta1_JobTemplateSpec(in *batch.JobTemplateSpec, out *v1beta1.JobTemplateSpec, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta out.ObjectMeta = in.ObjectMeta
if err := batch_v1.Convert_batch_JobSpec_To_v1_JobSpec(&in.Spec, &out.Spec, s); err != nil { if err := batchv1.Convert_batch_JobSpec_To_v1_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err return err
} }
return nil return nil

10
pkg/apis/batch/v2alpha1/zz_generated.conversion.go generated
View File

@@ -24,12 +24,12 @@ import (
unsafe "unsafe" unsafe "unsafe"
v2alpha1 "k8s.io/api/batch/v2alpha1" v2alpha1 "k8s.io/api/batch/v2alpha1"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
batch "k8s.io/kubernetes/pkg/apis/batch" batch "k8s.io/kubernetes/pkg/apis/batch"
batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1"
core "k8s.io/kubernetes/pkg/apis/core" core "k8s.io/kubernetes/pkg/apis/core"
) )
@@ -178,7 +178,7 @@ func Convert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *v2alpha1.CronJobS
} }
func autoConvert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *v2alpha1.CronJobStatus, s conversion.Scope) error { func autoConvert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *v2alpha1.CronJobStatus, s conversion.Scope) error {
out.Active = *(*[]core_v1.ObjectReference)(unsafe.Pointer(&in.Active)) out.Active = *(*[]corev1.ObjectReference)(unsafe.Pointer(&in.Active))
out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime)) out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime))
return nil return nil
} }
@@ -216,7 +216,7 @@ func Convert_batch_JobTemplate_To_v2alpha1_JobTemplate(in *batch.JobTemplate, ou
func autoConvert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *v2alpha1.JobTemplateSpec, out *batch.JobTemplateSpec, s conversion.Scope) error { func autoConvert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *v2alpha1.JobTemplateSpec, out *batch.JobTemplateSpec, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta out.ObjectMeta = in.ObjectMeta
if err := batch_v1.Convert_v1_JobSpec_To_batch_JobSpec(&in.Spec, &out.Spec, s); err != nil { if err := batchv1.Convert_v1_JobSpec_To_batch_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err return err
} }
return nil return nil
@@ -229,7 +229,7 @@ func Convert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(in *v2alpha1.JobT
func autoConvert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in *batch.JobTemplateSpec, out *v2alpha1.JobTemplateSpec, s conversion.Scope) error { func autoConvert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in *batch.JobTemplateSpec, out *v2alpha1.JobTemplateSpec, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta out.ObjectMeta = in.ObjectMeta
if err := batch_v1.Convert_batch_JobSpec_To_v1_JobSpec(&in.Spec, &out.Spec, s); err != nil { if err := batchv1.Convert_batch_JobSpec_To_v1_JobSpec(&in.Spec, &out.Spec, s); err != nil {
return err return err
} }
return nil return nil

34
pkg/apis/core/v1/zz_generated.conversion.go generated
View File

@@ -25,7 +25,7 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
resource "k8s.io/apimachinery/pkg/api/resource" resource "k8s.io/apimachinery/pkg/api/resource"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
@@ -3145,7 +3145,7 @@ func Convert_core_PersistentVolumeClaimList_To_v1_PersistentVolumeClaimList(in *
func autoConvert_v1_PersistentVolumeClaimSpec_To_core_PersistentVolumeClaimSpec(in *v1.PersistentVolumeClaimSpec, out *core.PersistentVolumeClaimSpec, s conversion.Scope) error { func autoConvert_v1_PersistentVolumeClaimSpec_To_core_PersistentVolumeClaimSpec(in *v1.PersistentVolumeClaimSpec, out *core.PersistentVolumeClaimSpec, s conversion.Scope) error {
out.AccessModes = *(*[]core.PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes)) out.AccessModes = *(*[]core.PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes))
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := Convert_v1_ResourceRequirements_To_core_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { if err := Convert_v1_ResourceRequirements_To_core_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil {
return err return err
} }
@@ -3162,7 +3162,7 @@ func Convert_v1_PersistentVolumeClaimSpec_To_core_PersistentVolumeClaimSpec(in *
func autoConvert_core_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *core.PersistentVolumeClaimSpec, out *v1.PersistentVolumeClaimSpec, s conversion.Scope) error { func autoConvert_core_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *core.PersistentVolumeClaimSpec, out *v1.PersistentVolumeClaimSpec, s conversion.Scope) error {
out.AccessModes = *(*[]v1.PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes)) out.AccessModes = *(*[]v1.PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes))
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := Convert_core_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { if err := Convert_core_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil {
return err return err
} }
@@ -3460,7 +3460,7 @@ func Convert_core_PodAffinity_To_v1_PodAffinity(in *core.PodAffinity, out *v1.Po
} }
func autoConvert_v1_PodAffinityTerm_To_core_PodAffinityTerm(in *v1.PodAffinityTerm, out *core.PodAffinityTerm, s conversion.Scope) error { func autoConvert_v1_PodAffinityTerm_To_core_PodAffinityTerm(in *v1.PodAffinityTerm, out *core.PodAffinityTerm, s conversion.Scope) error {
out.LabelSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.LabelSelector)) out.LabelSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.LabelSelector))
out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces))
out.TopologyKey = in.TopologyKey out.TopologyKey = in.TopologyKey
return nil return nil
@@ -3472,7 +3472,7 @@ func Convert_v1_PodAffinityTerm_To_core_PodAffinityTerm(in *v1.PodAffinityTerm,
} }
func autoConvert_core_PodAffinityTerm_To_v1_PodAffinityTerm(in *core.PodAffinityTerm, out *v1.PodAffinityTerm, s conversion.Scope) error { func autoConvert_core_PodAffinityTerm_To_v1_PodAffinityTerm(in *core.PodAffinityTerm, out *v1.PodAffinityTerm, s conversion.Scope) error {
out.LabelSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.LabelSelector)) out.LabelSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.LabelSelector))
out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces))
out.TopologyKey = in.TopologyKey out.TopologyKey = in.TopologyKey
return nil return nil
@@ -3686,7 +3686,7 @@ func autoConvert_v1_PodLogOptions_To_core_PodLogOptions(in *v1.PodLogOptions, ou
out.Follow = in.Follow out.Follow = in.Follow
out.Previous = in.Previous out.Previous = in.Previous
out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds)) out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds))
out.SinceTime = (*meta_v1.Time)(unsafe.Pointer(in.SinceTime)) out.SinceTime = (*metav1.Time)(unsafe.Pointer(in.SinceTime))
out.Timestamps = in.Timestamps out.Timestamps = in.Timestamps
out.TailLines = (*int64)(unsafe.Pointer(in.TailLines)) out.TailLines = (*int64)(unsafe.Pointer(in.TailLines))
out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes)) out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes))
@@ -3703,7 +3703,7 @@ func autoConvert_core_PodLogOptions_To_v1_PodLogOptions(in *core.PodLogOptions,
out.Follow = in.Follow out.Follow = in.Follow
out.Previous = in.Previous out.Previous = in.Previous
out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds)) out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds))
out.SinceTime = (*meta_v1.Time)(unsafe.Pointer(in.SinceTime)) out.SinceTime = (*metav1.Time)(unsafe.Pointer(in.SinceTime))
out.Timestamps = in.Timestamps out.Timestamps = in.Timestamps
out.TailLines = (*int64)(unsafe.Pointer(in.TailLines)) out.TailLines = (*int64)(unsafe.Pointer(in.TailLines))
out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes)) out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes))
@@ -3802,7 +3802,7 @@ func autoConvert_core_PodSecurityContext_To_v1_PodSecurityContext(in *core.PodSe
} }
func autoConvert_v1_PodSignature_To_core_PodSignature(in *v1.PodSignature, out *core.PodSignature, s conversion.Scope) error { func autoConvert_v1_PodSignature_To_core_PodSignature(in *v1.PodSignature, out *core.PodSignature, s conversion.Scope) error {
out.PodController = (*meta_v1.OwnerReference)(unsafe.Pointer(in.PodController)) out.PodController = (*metav1.OwnerReference)(unsafe.Pointer(in.PodController))
return nil return nil
} }
@@ -3812,7 +3812,7 @@ func Convert_v1_PodSignature_To_core_PodSignature(in *v1.PodSignature, out *core
} }
func autoConvert_core_PodSignature_To_v1_PodSignature(in *core.PodSignature, out *v1.PodSignature, s conversion.Scope) error { func autoConvert_core_PodSignature_To_v1_PodSignature(in *core.PodSignature, out *v1.PodSignature, s conversion.Scope) error {
out.PodController = (*meta_v1.OwnerReference)(unsafe.Pointer(in.PodController)) out.PodController = (*metav1.OwnerReference)(unsafe.Pointer(in.PodController))
return nil return nil
} }
@@ -3964,7 +3964,7 @@ func autoConvert_v1_PodStatus_To_core_PodStatus(in *v1.PodStatus, out *core.PodS
out.NominatedNodeName = in.NominatedNodeName out.NominatedNodeName = in.NominatedNodeName
out.HostIP = in.HostIP out.HostIP = in.HostIP
out.PodIP = in.PodIP out.PodIP = in.PodIP
out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
out.InitContainerStatuses = *(*[]core.ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses)) out.InitContainerStatuses = *(*[]core.ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses))
out.ContainerStatuses = *(*[]core.ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses)) out.ContainerStatuses = *(*[]core.ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses))
out.QOSClass = core.PodQOSClass(in.QOSClass) out.QOSClass = core.PodQOSClass(in.QOSClass)
@@ -3984,7 +3984,7 @@ func autoConvert_core_PodStatus_To_v1_PodStatus(in *core.PodStatus, out *v1.PodS
out.NominatedNodeName = in.NominatedNodeName out.NominatedNodeName = in.NominatedNodeName
out.HostIP = in.HostIP out.HostIP = in.HostIP
out.PodIP = in.PodIP out.PodIP = in.PodIP
out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
out.QOSClass = v1.PodQOSClass(in.QOSClass) out.QOSClass = v1.PodQOSClass(in.QOSClass)
out.InitContainerStatuses = *(*[]v1.ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses)) out.InitContainerStatuses = *(*[]v1.ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses))
out.ContainerStatuses = *(*[]v1.ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses)) out.ContainerStatuses = *(*[]v1.ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses))
@@ -4505,7 +4505,7 @@ func Convert_core_ReplicationControllerList_To_v1_ReplicationControllerList(in *
} }
func autoConvert_v1_ReplicationControllerSpec_To_core_ReplicationControllerSpec(in *v1.ReplicationControllerSpec, out *core.ReplicationControllerSpec, s conversion.Scope) error { func autoConvert_v1_ReplicationControllerSpec_To_core_ReplicationControllerSpec(in *v1.ReplicationControllerSpec, out *core.ReplicationControllerSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.MinReadySeconds = in.MinReadySeconds out.MinReadySeconds = in.MinReadySeconds
@@ -4523,7 +4523,7 @@ func autoConvert_v1_ReplicationControllerSpec_To_core_ReplicationControllerSpec(
} }
func autoConvert_core_ReplicationControllerSpec_To_v1_ReplicationControllerSpec(in *core.ReplicationControllerSpec, out *v1.ReplicationControllerSpec, s conversion.Scope) error { func autoConvert_core_ReplicationControllerSpec_To_v1_ReplicationControllerSpec(in *core.ReplicationControllerSpec, out *v1.ReplicationControllerSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.MinReadySeconds = in.MinReadySeconds out.MinReadySeconds = in.MinReadySeconds
@@ -5189,7 +5189,7 @@ func Convert_core_ServiceAccountList_To_v1_ServiceAccountList(in *core.ServiceAc
func autoConvert_v1_ServiceAccountTokenProjection_To_core_ServiceAccountTokenProjection(in *v1.ServiceAccountTokenProjection, out *core.ServiceAccountTokenProjection, s conversion.Scope) error { func autoConvert_v1_ServiceAccountTokenProjection_To_core_ServiceAccountTokenProjection(in *v1.ServiceAccountTokenProjection, out *core.ServiceAccountTokenProjection, s conversion.Scope) error {
out.Audience = in.Audience out.Audience = in.Audience
if err := meta_v1.Convert_Pointer_int64_To_int64(&in.ExpirationSeconds, &out.ExpirationSeconds, s); err != nil { if err := metav1.Convert_Pointer_int64_To_int64(&in.ExpirationSeconds, &out.ExpirationSeconds, s); err != nil {
return err return err
} }
out.Path = in.Path out.Path = in.Path
@@ -5203,7 +5203,7 @@ func Convert_v1_ServiceAccountTokenProjection_To_core_ServiceAccountTokenProject
func autoConvert_core_ServiceAccountTokenProjection_To_v1_ServiceAccountTokenProjection(in *core.ServiceAccountTokenProjection, out *v1.ServiceAccountTokenProjection, s conversion.Scope) error { func autoConvert_core_ServiceAccountTokenProjection_To_v1_ServiceAccountTokenProjection(in *core.ServiceAccountTokenProjection, out *v1.ServiceAccountTokenProjection, s conversion.Scope) error {
out.Audience = in.Audience out.Audience = in.Audience
if err := meta_v1.Convert_int64_To_Pointer_int64(&in.ExpirationSeconds, &out.ExpirationSeconds, s); err != nil { if err := metav1.Convert_int64_To_Pointer_int64(&in.ExpirationSeconds, &out.ExpirationSeconds, s); err != nil {
return err return err
} }
out.Path = in.Path out.Path = in.Path
@@ -5497,7 +5497,7 @@ func autoConvert_v1_Taint_To_core_Taint(in *v1.Taint, out *core.Taint, s convers
out.Key = in.Key out.Key = in.Key
out.Value = in.Value out.Value = in.Value
out.Effect = core.TaintEffect(in.Effect) out.Effect = core.TaintEffect(in.Effect)
out.TimeAdded = (*meta_v1.Time)(unsafe.Pointer(in.TimeAdded)) out.TimeAdded = (*metav1.Time)(unsafe.Pointer(in.TimeAdded))
return nil return nil
} }
@@ -5510,7 +5510,7 @@ func autoConvert_core_Taint_To_v1_Taint(in *core.Taint, out *v1.Taint, s convers
out.Key = in.Key out.Key = in.Key
out.Value = in.Value out.Value = in.Value
out.Effect = v1.TaintEffect(in.Effect) out.Effect = v1.TaintEffect(in.Effect)
out.TimeAdded = (*meta_v1.Time)(unsafe.Pointer(in.TimeAdded)) out.TimeAdded = (*metav1.Time)(unsafe.Pointer(in.TimeAdded))
return nil return nil
} }

4
pkg/apis/core/zz_generated.deepcopy.go generated
View File

@@ -1877,9 +1877,7 @@ func (in *List) DeepCopyInto(out *List) {
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]runtime.Object, len(*in)) *out = make([]runtime.Object, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
(*out)[i] = (*in)[i].DeepCopyObject() (*out)[i] = (*in)[i].DeepCopyObject()
} }
} }

40
pkg/apis/extensions/v1beta1/zz_generated.conversion.go generated
View File

@@ -25,12 +25,12 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
v1beta1 "k8s.io/api/extensions/v1beta1" v1beta1 "k8s.io/api/extensions/v1beta1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
core "k8s.io/kubernetes/pkg/apis/core" core "k8s.io/kubernetes/pkg/apis/core"
core_v1 "k8s.io/kubernetes/pkg/apis/core/v1" corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
extensions "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions"
policy "k8s.io/kubernetes/pkg/apis/policy" policy "k8s.io/kubernetes/pkg/apis/policy"
) )
@@ -375,8 +375,8 @@ func Convert_extensions_DaemonSetList_To_v1beta1_DaemonSetList(in *extensions.Da
} }
func autoConvert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *v1beta1.DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error { func autoConvert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *v1beta1.DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error {
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_v1beta1_DaemonSetUpdateStrategy_To_extensions_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil { if err := Convert_v1beta1_DaemonSetUpdateStrategy_To_extensions_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
@@ -394,8 +394,8 @@ func Convert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *v1beta1.Daemo
} }
func autoConvert_extensions_DaemonSetSpec_To_v1beta1_DaemonSetSpec(in *extensions.DaemonSetSpec, out *v1beta1.DaemonSetSpec, s conversion.Scope) error { func autoConvert_extensions_DaemonSetSpec_To_v1beta1_DaemonSetSpec(in *extensions.DaemonSetSpec, out *v1beta1.DaemonSetSpec, s conversion.Scope) error {
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_extensions_DaemonSetUpdateStrategy_To_v1beta1_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil { if err := Convert_extensions_DaemonSetUpdateStrategy_To_v1beta1_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
@@ -621,11 +621,11 @@ func Convert_extensions_DeploymentRollback_To_v1beta1_DeploymentRollback(in *ext
} }
func autoConvert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *v1beta1.DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error { func autoConvert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *v1beta1.DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
@@ -640,11 +640,11 @@ func autoConvert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *v1beta1
} }
func autoConvert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensions.DeploymentSpec, out *v1beta1.DeploymentSpec, s conversion.Scope) error { func autoConvert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensions.DeploymentSpec, out *v1beta1.DeploymentSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if err := Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { if err := Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
@@ -1118,7 +1118,7 @@ func autoConvert_v1beta1_PodSecurityPolicySpec_To_policy_PodSecurityPolicySpec(i
} }
out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem
out.DefaultAllowPrivilegeEscalation = (*bool)(unsafe.Pointer(in.DefaultAllowPrivilegeEscalation)) out.DefaultAllowPrivilegeEscalation = (*bool)(unsafe.Pointer(in.DefaultAllowPrivilegeEscalation))
if err := meta_v1.Convert_Pointer_bool_To_bool(&in.AllowPrivilegeEscalation, &out.AllowPrivilegeEscalation, s); err != nil { if err := metav1.Convert_Pointer_bool_To_bool(&in.AllowPrivilegeEscalation, &out.AllowPrivilegeEscalation, s); err != nil {
return err return err
} }
out.AllowedHostPaths = *(*[]policy.AllowedHostPath)(unsafe.Pointer(&in.AllowedHostPaths)) out.AllowedHostPaths = *(*[]policy.AllowedHostPath)(unsafe.Pointer(&in.AllowedHostPaths))
@@ -1157,7 +1157,7 @@ func autoConvert_policy_PodSecurityPolicySpec_To_v1beta1_PodSecurityPolicySpec(i
} }
out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem
out.DefaultAllowPrivilegeEscalation = (*bool)(unsafe.Pointer(in.DefaultAllowPrivilegeEscalation)) out.DefaultAllowPrivilegeEscalation = (*bool)(unsafe.Pointer(in.DefaultAllowPrivilegeEscalation))
if err := meta_v1.Convert_bool_To_Pointer_bool(&in.AllowPrivilegeEscalation, &out.AllowPrivilegeEscalation, s); err != nil { if err := metav1.Convert_bool_To_Pointer_bool(&in.AllowPrivilegeEscalation, &out.AllowPrivilegeEscalation, s); err != nil {
return err return err
} }
out.AllowedHostPaths = *(*[]v1beta1.AllowedHostPath)(unsafe.Pointer(&in.AllowedHostPaths)) out.AllowedHostPaths = *(*[]v1beta1.AllowedHostPath)(unsafe.Pointer(&in.AllowedHostPaths))
@@ -1275,24 +1275,24 @@ func Convert_extensions_ReplicaSetList_To_v1beta1_ReplicaSetList(in *extensions.
} }
func autoConvert_v1beta1_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *v1beta1.ReplicaSetSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error { func autoConvert_v1beta1_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *v1beta1.ReplicaSetSpec, out *extensions.ReplicaSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.MinReadySeconds = in.MinReadySeconds out.MinReadySeconds = in.MinReadySeconds
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil
} }
func autoConvert_extensions_ReplicaSetSpec_To_v1beta1_ReplicaSetSpec(in *extensions.ReplicaSetSpec, out *v1beta1.ReplicaSetSpec, s conversion.Scope) error { func autoConvert_extensions_ReplicaSetSpec_To_v1beta1_ReplicaSetSpec(in *extensions.ReplicaSetSpec, out *v1beta1.ReplicaSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.MinReadySeconds = in.MinReadySeconds out.MinReadySeconds = in.MinReadySeconds
out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector))
if err := core_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := corev1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
return nil return nil

14
pkg/apis/networking/v1/zz_generated.conversion.go generated
View File

@@ -23,9 +23,9 @@ package v1
import ( import (
unsafe "unsafe" unsafe "unsafe"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/networking/v1" v1 "k8s.io/api/networking/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
intstr "k8s.io/apimachinery/pkg/util/intstr" intstr "k8s.io/apimachinery/pkg/util/intstr"
@@ -175,8 +175,8 @@ func Convert_networking_NetworkPolicyList_To_v1_NetworkPolicyList(in *networking
} }
func autoConvert_v1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(in *v1.NetworkPolicyPeer, out *networking.NetworkPolicyPeer, s conversion.Scope) error { func autoConvert_v1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(in *v1.NetworkPolicyPeer, out *networking.NetworkPolicyPeer, s conversion.Scope) error {
out.PodSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.PodSelector)) out.PodSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.PodSelector))
out.NamespaceSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) out.NamespaceSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.NamespaceSelector))
out.IPBlock = (*networking.IPBlock)(unsafe.Pointer(in.IPBlock)) out.IPBlock = (*networking.IPBlock)(unsafe.Pointer(in.IPBlock))
return nil return nil
} }
@@ -187,8 +187,8 @@ func Convert_v1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(in *v1.Network
} }
func autoConvert_networking_NetworkPolicyPeer_To_v1_NetworkPolicyPeer(in *networking.NetworkPolicyPeer, out *v1.NetworkPolicyPeer, s conversion.Scope) error { func autoConvert_networking_NetworkPolicyPeer_To_v1_NetworkPolicyPeer(in *networking.NetworkPolicyPeer, out *v1.NetworkPolicyPeer, s conversion.Scope) error {
out.PodSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.PodSelector)) out.PodSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.PodSelector))
out.NamespaceSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) out.NamespaceSelector = (*metav1.LabelSelector)(unsafe.Pointer(in.NamespaceSelector))
out.IPBlock = (*v1.IPBlock)(unsafe.Pointer(in.IPBlock)) out.IPBlock = (*v1.IPBlock)(unsafe.Pointer(in.IPBlock))
return nil return nil
} }
@@ -210,7 +210,7 @@ func Convert_v1_NetworkPolicyPort_To_networking_NetworkPolicyPort(in *v1.Network
} }
func autoConvert_networking_NetworkPolicyPort_To_v1_NetworkPolicyPort(in *networking.NetworkPolicyPort, out *v1.NetworkPolicyPort, s conversion.Scope) error { func autoConvert_networking_NetworkPolicyPort_To_v1_NetworkPolicyPort(in *networking.NetworkPolicyPort, out *v1.NetworkPolicyPort, s conversion.Scope) error {
out.Protocol = (*core_v1.Protocol)(unsafe.Pointer(in.Protocol)) out.Protocol = (*corev1.Protocol)(unsafe.Pointer(in.Protocol))
out.Port = (*intstr.IntOrString)(unsafe.Pointer(in.Port)) out.Port = (*intstr.IntOrString)(unsafe.Pointer(in.Port))
return nil return nil
} }

10
pkg/apis/policy/v1beta1/zz_generated.conversion.go generated
View File

@@ -23,7 +23,7 @@ package v1beta1
import ( import (
unsafe "unsafe" unsafe "unsafe"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1beta1 "k8s.io/api/policy/v1beta1" v1beta1 "k8s.io/api/policy/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
@@ -423,9 +423,9 @@ func Convert_v1beta1_PodSecurityPolicySpec_To_policy_PodSecurityPolicySpec(in *v
func autoConvert_policy_PodSecurityPolicySpec_To_v1beta1_PodSecurityPolicySpec(in *policy.PodSecurityPolicySpec, out *v1beta1.PodSecurityPolicySpec, s conversion.Scope) error { func autoConvert_policy_PodSecurityPolicySpec_To_v1beta1_PodSecurityPolicySpec(in *policy.PodSecurityPolicySpec, out *v1beta1.PodSecurityPolicySpec, s conversion.Scope) error {
out.Privileged = in.Privileged out.Privileged = in.Privileged
out.DefaultAddCapabilities = *(*[]core_v1.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities)) out.DefaultAddCapabilities = *(*[]corev1.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities))
out.RequiredDropCapabilities = *(*[]core_v1.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities)) out.RequiredDropCapabilities = *(*[]corev1.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities))
out.AllowedCapabilities = *(*[]core_v1.Capability)(unsafe.Pointer(&in.AllowedCapabilities)) out.AllowedCapabilities = *(*[]corev1.Capability)(unsafe.Pointer(&in.AllowedCapabilities))
out.Volumes = *(*[]v1beta1.FSType)(unsafe.Pointer(&in.Volumes)) out.Volumes = *(*[]v1beta1.FSType)(unsafe.Pointer(&in.Volumes))
out.HostNetwork = in.HostNetwork out.HostNetwork = in.HostNetwork
out.HostPorts = *(*[]v1beta1.HostPortRange)(unsafe.Pointer(&in.HostPorts)) out.HostPorts = *(*[]v1beta1.HostPortRange)(unsafe.Pointer(&in.HostPorts))
@@ -495,7 +495,7 @@ func Convert_v1beta1_SELinuxStrategyOptions_To_policy_SELinuxStrategyOptions(in
func autoConvert_policy_SELinuxStrategyOptions_To_v1beta1_SELinuxStrategyOptions(in *policy.SELinuxStrategyOptions, out *v1beta1.SELinuxStrategyOptions, s conversion.Scope) error { func autoConvert_policy_SELinuxStrategyOptions_To_v1beta1_SELinuxStrategyOptions(in *policy.SELinuxStrategyOptions, out *v1beta1.SELinuxStrategyOptions, s conversion.Scope) error {
out.Rule = v1beta1.SELinuxStrategy(in.Rule) out.Rule = v1beta1.SELinuxStrategy(in.Rule)
out.SELinuxOptions = (*core_v1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions)) out.SELinuxOptions = (*corev1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions))
return nil return nil
} }

6
pkg/apis/rbac/v1/zz_generated.conversion.go generated
View File

@@ -24,7 +24,7 @@ import (
unsafe "unsafe" unsafe "unsafe"
v1 "k8s.io/api/rbac/v1" v1 "k8s.io/api/rbac/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
rbac "k8s.io/kubernetes/pkg/apis/rbac" rbac "k8s.io/kubernetes/pkg/apis/rbac"
@@ -66,7 +66,7 @@ func RegisterConversions(scheme *runtime.Scheme) error {
} }
func autoConvert_v1_AggregationRule_To_rbac_AggregationRule(in *v1.AggregationRule, out *rbac.AggregationRule, s conversion.Scope) error { func autoConvert_v1_AggregationRule_To_rbac_AggregationRule(in *v1.AggregationRule, out *rbac.AggregationRule, s conversion.Scope) error {
out.ClusterRoleSelectors = *(*[]meta_v1.LabelSelector)(unsafe.Pointer(&in.ClusterRoleSelectors)) out.ClusterRoleSelectors = *(*[]metav1.LabelSelector)(unsafe.Pointer(&in.ClusterRoleSelectors))
return nil return nil
} }
@@ -76,7 +76,7 @@ func Convert_v1_AggregationRule_To_rbac_AggregationRule(in *v1.AggregationRule,
} }
func autoConvert_rbac_AggregationRule_To_v1_AggregationRule(in *rbac.AggregationRule, out *v1.AggregationRule, s conversion.Scope) error { func autoConvert_rbac_AggregationRule_To_v1_AggregationRule(in *rbac.AggregationRule, out *v1.AggregationRule, s conversion.Scope) error {
out.ClusterRoleSelectors = *(*[]meta_v1.LabelSelector)(unsafe.Pointer(&in.ClusterRoleSelectors)) out.ClusterRoleSelectors = *(*[]metav1.LabelSelector)(unsafe.Pointer(&in.ClusterRoleSelectors))
return nil return nil
} }

6
pkg/apis/storage/v1/zz_generated.conversion.go generated
View File

@@ -23,7 +23,7 @@ package v1
import ( import (
unsafe "unsafe" unsafe "unsafe"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/storage/v1" v1 "k8s.io/api/storage/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
@@ -67,11 +67,11 @@ func autoConvert_storage_StorageClass_To_v1_StorageClass(in *storage.StorageClas
out.ObjectMeta = in.ObjectMeta out.ObjectMeta = in.ObjectMeta
out.Provisioner = in.Provisioner out.Provisioner = in.Provisioner
out.Parameters = *(*map[string]string)(unsafe.Pointer(&in.Parameters)) out.Parameters = *(*map[string]string)(unsafe.Pointer(&in.Parameters))
out.ReclaimPolicy = (*core_v1.PersistentVolumeReclaimPolicy)(unsafe.Pointer(in.ReclaimPolicy)) out.ReclaimPolicy = (*corev1.PersistentVolumeReclaimPolicy)(unsafe.Pointer(in.ReclaimPolicy))
out.MountOptions = *(*[]string)(unsafe.Pointer(&in.MountOptions)) out.MountOptions = *(*[]string)(unsafe.Pointer(&in.MountOptions))
out.AllowVolumeExpansion = (*bool)(unsafe.Pointer(in.AllowVolumeExpansion)) out.AllowVolumeExpansion = (*bool)(unsafe.Pointer(in.AllowVolumeExpansion))
out.VolumeBindingMode = (*v1.VolumeBindingMode)(unsafe.Pointer(in.VolumeBindingMode)) out.VolumeBindingMode = (*v1.VolumeBindingMode)(unsafe.Pointer(in.VolumeBindingMode))
out.AllowedTopologies = *(*[]core_v1.TopologySelectorTerm)(unsafe.Pointer(&in.AllowedTopologies)) out.AllowedTopologies = *(*[]corev1.TopologySelectorTerm)(unsafe.Pointer(&in.AllowedTopologies))
return nil return nil
} }

22
pkg/scheduler/api/v1/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
) )
@@ -31,12 +31,12 @@ func (in *ExtenderArgs) DeepCopyInto(out *ExtenderArgs) {
*out = *in *out = *in
if in.Pod != nil { if in.Pod != nil {
in, out := &in.Pod, &out.Pod in, out := &in.Pod, &out.Pod
*out = new(core_v1.Pod) *out = new(corev1.Pod)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.Nodes != nil { if in.Nodes != nil {
in, out := &in.Nodes, &out.Nodes in, out := &in.Nodes, &out.Nodes
*out = new(core_v1.NodeList) *out = new(corev1.NodeList)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.NodeNames != nil { if in.NodeNames != nil {
@@ -124,7 +124,7 @@ func (in *ExtenderFilterResult) DeepCopyInto(out *ExtenderFilterResult) {
*out = *in *out = *in
if in.Nodes != nil { if in.Nodes != nil {
in, out := &in.Nodes, &out.Nodes in, out := &in.Nodes, &out.Nodes
*out = new(core_v1.NodeList) *out = new(corev1.NodeList)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.NodeNames != nil { if in.NodeNames != nil {
@@ -177,7 +177,7 @@ func (in *ExtenderPreemptionArgs) DeepCopyInto(out *ExtenderPreemptionArgs) {
*out = *in *out = *in
if in.Pod != nil { if in.Pod != nil {
in, out := &in.Pod, &out.Pod in, out := &in.Pod, &out.Pod
*out = new(core_v1.Pod) *out = new(corev1.Pod)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.NodeNameToVictims != nil { if in.NodeNameToVictims != nil {
@@ -372,9 +372,7 @@ func (in *MetaVictims) DeepCopyInto(out *MetaVictims) {
in, out := &in.Pods, &out.Pods in, out := &in.Pods, &out.Pods
*out = make([]*MetaPod, len(*in)) *out = make([]*MetaPod, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
in, out := &(*in)[i], &(*out)[i] in, out := &(*in)[i], &(*out)[i]
*out = new(MetaPod) *out = new(MetaPod)
**out = **in **out = **in
@@ -618,13 +616,11 @@ func (in *Victims) DeepCopyInto(out *Victims) {
*out = *in *out = *in
if in.Pods != nil { if in.Pods != nil {
in, out := &in.Pods, &out.Pods in, out := &in.Pods, &out.Pods
*out = make([]*core_v1.Pod, len(*in)) *out = make([]*corev1.Pod, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
in, out := &(*in)[i], &(*out)[i] in, out := &(*in)[i], &(*out)[i]
*out = new(core_v1.Pod) *out = new(corev1.Pod)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
} }

8
pkg/scheduler/api/zz_generated.deepcopy.go generated
View File

@@ -372,9 +372,7 @@ func (in *MetaVictims) DeepCopyInto(out *MetaVictims) {
in, out := &in.Pods, &out.Pods in, out := &in.Pods, &out.Pods
*out = make([]*MetaPod, len(*in)) *out = make([]*MetaPod, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
in, out := &(*in)[i], &(*out)[i] in, out := &(*in)[i], &(*out)[i]
*out = new(MetaPod) *out = new(MetaPod)
**out = **in **out = **in
@@ -620,9 +618,7 @@ func (in *Victims) DeepCopyInto(out *Victims) {
in, out := &in.Pods, &out.Pods in, out := &in.Pods, &out.Pods
*out = make([]*v1.Pod, len(*in)) *out = make([]*v1.Pod, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
in, out := &(*in)[i], &(*out)[i] in, out := &(*in)[i], &(*out)[i]
*out = new(v1.Pod) *out = new(v1.Pod)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)

14
staging/src/k8s.io/api/apps/v1/zz_generated.deepcopy.go generated
View File

@@ -21,8 +21,8 @@ limitations under the License.
package v1 package v1
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
intstr "k8s.io/apimachinery/pkg/util/intstr" intstr "k8s.io/apimachinery/pkg/util/intstr"
) )
@@ -170,7 +170,7 @@ func (in *DaemonSetSpec) DeepCopyInto(out *DaemonSetSpec) {
*out = *in *out = *in
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
in.Template.DeepCopyInto(&out.Template) in.Template.DeepCopyInto(&out.Template)
@@ -331,7 +331,7 @@ func (in *DeploymentSpec) DeepCopyInto(out *DeploymentSpec) {
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
in.Template.DeepCopyInto(&out.Template) in.Template.DeepCopyInto(&out.Template)
@@ -496,7 +496,7 @@ func (in *ReplicaSetSpec) DeepCopyInto(out *ReplicaSetSpec) {
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
in.Template.DeepCopyInto(&out.Template) in.Template.DeepCopyInto(&out.Template)
@@ -692,13 +692,13 @@ func (in *StatefulSetSpec) DeepCopyInto(out *StatefulSetSpec) {
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
in.Template.DeepCopyInto(&out.Template) in.Template.DeepCopyInto(&out.Template)
if in.VolumeClaimTemplates != nil { if in.VolumeClaimTemplates != nil {
in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates
*out = make([]core_v1.PersistentVolumeClaim, len(*in)) *out = make([]corev1.PersistentVolumeClaim, len(*in))
for i := range *in { for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i]) (*in)[i].DeepCopyInto(&(*out)[i])
} }

4
staging/src/k8s.io/api/apps/v1beta1/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
intstr "k8s.io/apimachinery/pkg/util/intstr" intstr "k8s.io/apimachinery/pkg/util/intstr"
@@ -515,7 +515,7 @@ func (in *StatefulSetSpec) DeepCopyInto(out *StatefulSetSpec) {
in.Template.DeepCopyInto(&out.Template) in.Template.DeepCopyInto(&out.Template)
if in.VolumeClaimTemplates != nil { if in.VolumeClaimTemplates != nil {
in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates
*out = make([]core_v1.PersistentVolumeClaim, len(*in)) *out = make([]corev1.PersistentVolumeClaim, len(*in))
for i := range *in { for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i]) (*in)[i].DeepCopyInto(&(*out)[i])
} }

4
staging/src/k8s.io/api/apps/v1beta2/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1beta2 package v1beta2
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
intstr "k8s.io/apimachinery/pkg/util/intstr" intstr "k8s.io/apimachinery/pkg/util/intstr"
@@ -765,7 +765,7 @@ func (in *StatefulSetSpec) DeepCopyInto(out *StatefulSetSpec) {
in.Template.DeepCopyInto(&out.Template) in.Template.DeepCopyInto(&out.Template)
if in.VolumeClaimTemplates != nil { if in.VolumeClaimTemplates != nil {
in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates
*out = make([]core_v1.PersistentVolumeClaim, len(*in)) *out = make([]corev1.PersistentVolumeClaim, len(*in))
for i := range *in { for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i]) (*in)[i].DeepCopyInto(&(*out)[i])
} }

6
staging/src/k8s.io/api/autoscaling/v1/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
) )
@@ -46,7 +46,7 @@ func (in *ExternalMetricSource) DeepCopyInto(out *ExternalMetricSource) {
*out = *in *out = *in
if in.MetricSelector != nil { if in.MetricSelector != nil {
in, out := &in.MetricSelector, &out.MetricSelector in, out := &in.MetricSelector, &out.MetricSelector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.TargetValue != nil { if in.TargetValue != nil {
@@ -77,7 +77,7 @@ func (in *ExternalMetricStatus) DeepCopyInto(out *ExternalMetricStatus) {
*out = *in *out = *in
if in.MetricSelector != nil { if in.MetricSelector != nil {
in, out := &in.MetricSelector, &out.MetricSelector in, out := &in.MetricSelector, &out.MetricSelector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
out.CurrentValue = in.CurrentValue.DeepCopy() out.CurrentValue = in.CurrentValue.DeepCopy()

4
staging/src/k8s.io/api/batch/v1/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
) )
@@ -129,7 +129,7 @@ func (in *JobSpec) DeepCopyInto(out *JobSpec) {
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.ManualSelector != nil { if in.ManualSelector != nil {

8
staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
) )
@@ -2665,7 +2665,7 @@ func (in *PersistentVolumeClaimSpec) DeepCopyInto(out *PersistentVolumeClaimSpec
} }
if in.Selector != nil { if in.Selector != nil {
in, out := &in.Selector, &out.Selector in, out := &in.Selector, &out.Selector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
in.Resources.DeepCopyInto(&out.Resources) in.Resources.DeepCopyInto(&out.Resources)
@@ -3046,7 +3046,7 @@ func (in *PodAffinityTerm) DeepCopyInto(out *PodAffinityTerm) {
*out = *in *out = *in
if in.LabelSelector != nil { if in.LabelSelector != nil {
in, out := &in.LabelSelector, &out.LabelSelector in, out := &in.LabelSelector, &out.LabelSelector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.Namespaces != nil { if in.Namespaces != nil {
@@ -3428,7 +3428,7 @@ func (in *PodSignature) DeepCopyInto(out *PodSignature) {
*out = *in *out = *in
if in.PodController != nil { if in.PodController != nil {
in, out := &in.PodController, &out.PodController in, out := &in.PodController, &out.PodController
*out = new(meta_v1.OwnerReference) *out = new(metav1.OwnerReference)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
return return

12
staging/src/k8s.io/api/extensions/v1beta1/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
intstr "k8s.io/apimachinery/pkg/util/intstr" intstr "k8s.io/apimachinery/pkg/util/intstr"
@@ -955,7 +955,7 @@ func (in *NetworkPolicyPort) DeepCopyInto(out *NetworkPolicyPort) {
*out = *in *out = *in
if in.Protocol != nil { if in.Protocol != nil {
in, out := &in.Protocol, &out.Protocol in, out := &in.Protocol, &out.Protocol
*out = new(core_v1.Protocol) *out = new(corev1.Protocol)
**out = **in **out = **in
} }
if in.Port != nil { if in.Port != nil {
@@ -1077,17 +1077,17 @@ func (in *PodSecurityPolicySpec) DeepCopyInto(out *PodSecurityPolicySpec) {
*out = *in *out = *in
if in.DefaultAddCapabilities != nil { if in.DefaultAddCapabilities != nil {
in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities
*out = make([]core_v1.Capability, len(*in)) *out = make([]corev1.Capability, len(*in))
copy(*out, *in) copy(*out, *in)
} }
if in.RequiredDropCapabilities != nil { if in.RequiredDropCapabilities != nil {
in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities
*out = make([]core_v1.Capability, len(*in)) *out = make([]corev1.Capability, len(*in))
copy(*out, *in) copy(*out, *in)
} }
if in.AllowedCapabilities != nil { if in.AllowedCapabilities != nil {
in, out := &in.AllowedCapabilities, &out.AllowedCapabilities in, out := &in.AllowedCapabilities, &out.AllowedCapabilities
*out = make([]core_v1.Capability, len(*in)) *out = make([]corev1.Capability, len(*in))
copy(*out, *in) copy(*out, *in)
} }
if in.Volumes != nil { if in.Volumes != nil {
@@ -1389,7 +1389,7 @@ func (in *SELinuxStrategyOptions) DeepCopyInto(out *SELinuxStrategyOptions) {
*out = *in *out = *in
if in.SELinuxOptions != nil { if in.SELinuxOptions != nil {
in, out := &in.SELinuxOptions, &out.SELinuxOptions in, out := &in.SELinuxOptions, &out.SELinuxOptions
*out = new(core_v1.SELinuxOptions) *out = new(corev1.SELinuxOptions)
**out = **in **out = **in
} }
return return

10
staging/src/k8s.io/api/networking/v1/zz_generated.deepcopy.go generated
View File

@@ -21,8 +21,8 @@ limitations under the License.
package v1 package v1
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
intstr "k8s.io/apimachinery/pkg/util/intstr" intstr "k8s.io/apimachinery/pkg/util/intstr"
) )
@@ -173,12 +173,12 @@ func (in *NetworkPolicyPeer) DeepCopyInto(out *NetworkPolicyPeer) {
*out = *in *out = *in
if in.PodSelector != nil { if in.PodSelector != nil {
in, out := &in.PodSelector, &out.PodSelector in, out := &in.PodSelector, &out.PodSelector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.NamespaceSelector != nil { if in.NamespaceSelector != nil {
in, out := &in.NamespaceSelector, &out.NamespaceSelector in, out := &in.NamespaceSelector, &out.NamespaceSelector
*out = new(meta_v1.LabelSelector) *out = new(metav1.LabelSelector)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.IPBlock != nil { if in.IPBlock != nil {
@@ -204,7 +204,7 @@ func (in *NetworkPolicyPort) DeepCopyInto(out *NetworkPolicyPort) {
*out = *in *out = *in
if in.Protocol != nil { if in.Protocol != nil {
in, out := &in.Protocol, &out.Protocol in, out := &in.Protocol, &out.Protocol
*out = new(core_v1.Protocol) *out = new(corev1.Protocol)
**out = **in **out = **in
} }
if in.Port != nil { if in.Port != nil {

10
staging/src/k8s.io/api/policy/v1beta1/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
intstr "k8s.io/apimachinery/pkg/util/intstr" intstr "k8s.io/apimachinery/pkg/util/intstr"
@@ -323,17 +323,17 @@ func (in *PodSecurityPolicySpec) DeepCopyInto(out *PodSecurityPolicySpec) {
*out = *in *out = *in
if in.DefaultAddCapabilities != nil { if in.DefaultAddCapabilities != nil {
in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities
*out = make([]core_v1.Capability, len(*in)) *out = make([]corev1.Capability, len(*in))
copy(*out, *in) copy(*out, *in)
} }
if in.RequiredDropCapabilities != nil { if in.RequiredDropCapabilities != nil {
in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities
*out = make([]core_v1.Capability, len(*in)) *out = make([]corev1.Capability, len(*in))
copy(*out, *in) copy(*out, *in)
} }
if in.AllowedCapabilities != nil { if in.AllowedCapabilities != nil {
in, out := &in.AllowedCapabilities, &out.AllowedCapabilities in, out := &in.AllowedCapabilities, &out.AllowedCapabilities
*out = make([]core_v1.Capability, len(*in)) *out = make([]corev1.Capability, len(*in))
copy(*out, *in) copy(*out, *in)
} }
if in.Volumes != nil { if in.Volumes != nil {
@@ -419,7 +419,7 @@ func (in *SELinuxStrategyOptions) DeepCopyInto(out *SELinuxStrategyOptions) {
*out = *in *out = *in
if in.SELinuxOptions != nil { if in.SELinuxOptions != nil {
in, out := &in.SELinuxOptions, &out.SELinuxOptions in, out := &in.SELinuxOptions, &out.SELinuxOptions
*out = new(core_v1.SELinuxOptions) *out = new(corev1.SELinuxOptions)
**out = **in **out = **in
} }
return return

4
staging/src/k8s.io/api/rbac/v1/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
) )
@@ -30,7 +30,7 @@ func (in *AggregationRule) DeepCopyInto(out *AggregationRule) {
*out = *in *out = *in
if in.ClusterRoleSelectors != nil { if in.ClusterRoleSelectors != nil {
in, out := &in.ClusterRoleSelectors, &out.ClusterRoleSelectors in, out := &in.ClusterRoleSelectors, &out.ClusterRoleSelectors
*out = make([]meta_v1.LabelSelector, len(*in)) *out = make([]metav1.LabelSelector, len(*in))
for i := range *in { for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i]) (*in)[i].DeepCopyInto(&(*out)[i])
} }

6
staging/src/k8s.io/api/storage/v1/zz_generated.deepcopy.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
) )
@@ -39,7 +39,7 @@ func (in *StorageClass) DeepCopyInto(out *StorageClass) {
} }
if in.ReclaimPolicy != nil { if in.ReclaimPolicy != nil {
in, out := &in.ReclaimPolicy, &out.ReclaimPolicy in, out := &in.ReclaimPolicy, &out.ReclaimPolicy
*out = new(core_v1.PersistentVolumeReclaimPolicy) *out = new(corev1.PersistentVolumeReclaimPolicy)
**out = **in **out = **in
} }
if in.MountOptions != nil { if in.MountOptions != nil {
@@ -59,7 +59,7 @@ func (in *StorageClass) DeepCopyInto(out *StorageClass) {
} }
if in.AllowedTopologies != nil { if in.AllowedTopologies != nil {
in, out := &in.AllowedTopologies, &out.AllowedTopologies in, out := &in.AllowedTopologies, &out.AllowedTopologies
*out = make([]core_v1.TopologySelectorTerm, len(*in)) *out = make([]corev1.TopologySelectorTerm, len(*in))
for i := range *in { for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i]) (*in)[i].DeepCopyInto(&(*out)[i])
} }

22
staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/typed/cr/v1/example.go
View File

@@ -21,7 +21,7 @@ package v1
import ( import (
v1 "k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1" v1 "k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1"
scheme "k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/scheme" scheme "k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/scheme"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
rest "k8s.io/client-go/rest" rest "k8s.io/client-go/rest"
@@ -37,11 +37,11 @@ type ExamplesGetter interface {
type ExampleInterface interface { type ExampleInterface interface {
Create(*v1.Example) (*v1.Example, error) Create(*v1.Example) (*v1.Example, error)
Update(*v1.Example) (*v1.Example, error) Update(*v1.Example) (*v1.Example, error)
Delete(name string, options *meta_v1.DeleteOptions) error Delete(name string, options *metav1.DeleteOptions) error
DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error
Get(name string, options meta_v1.GetOptions) (*v1.Example, error) Get(name string, options metav1.GetOptions) (*v1.Example, error)
List(opts meta_v1.ListOptions) (*v1.ExampleList, error) List(opts metav1.ListOptions) (*v1.ExampleList, error)
Watch(opts meta_v1.ListOptions) (watch.Interface, error) Watch(opts metav1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Example, err error) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.Example, err error)
ExampleExpansion ExampleExpansion
} }
@@ -61,7 +61,7 @@ func newExamples(c *CrV1Client, namespace string) *examples {
} }
// Get takes name of the example, and returns the corresponding example object, and an error if there is any. // Get takes name of the example, and returns the corresponding example object, and an error if there is any.
func (c *examples) Get(name string, options meta_v1.GetOptions) (result *v1.Example, err error) { func (c *examples) Get(name string, options metav1.GetOptions) (result *v1.Example, err error) {
result = &v1.Example{} result = &v1.Example{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@@ -74,7 +74,7 @@ func (c *examples) Get(name string, options meta_v1.GetOptions) (result *v1.Exam
} }
// List takes label and field selectors, and returns the list of Examples that match those selectors. // List takes label and field selectors, and returns the list of Examples that match those selectors.
func (c *examples) List(opts meta_v1.ListOptions) (result *v1.ExampleList, err error) { func (c *examples) List(opts metav1.ListOptions) (result *v1.ExampleList, err error) {
result = &v1.ExampleList{} result = &v1.ExampleList{}
err = c.client.Get(). err = c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@@ -86,7 +86,7 @@ func (c *examples) List(opts meta_v1.ListOptions) (result *v1.ExampleList, err e
} }
// Watch returns a watch.Interface that watches the requested examples. // Watch returns a watch.Interface that watches the requested examples.
func (c *examples) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { func (c *examples) Watch(opts metav1.ListOptions) (watch.Interface, error) {
opts.Watch = true opts.Watch = true
return c.client.Get(). return c.client.Get().
Namespace(c.ns). Namespace(c.ns).
@@ -121,7 +121,7 @@ func (c *examples) Update(example *v1.Example) (result *v1.Example, err error) {
} }
// Delete takes name of the example and deletes it. Returns an error if one occurs. // Delete takes name of the example and deletes it. Returns an error if one occurs.
func (c *examples) Delete(name string, options *meta_v1.DeleteOptions) error { func (c *examples) Delete(name string, options *metav1.DeleteOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("examples"). Resource("examples").
@@ -132,7 +132,7 @@ func (c *examples) Delete(name string, options *meta_v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (c *examples) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { func (c *examples) DeleteCollection(options *metav1.DeleteOptions, listOptions metav1.ListOptions) error {
return c.client.Delete(). return c.client.Delete().
Namespace(c.ns). Namespace(c.ns).
Resource("examples"). Resource("examples").

38
staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/typed/cr/v1/fake/fake_example.go
View File

@@ -19,7 +19,7 @@ limitations under the License.
package fake package fake
import ( import (
cr_v1 "k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1" crv1 "k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels" labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -39,20 +39,20 @@ var examplesResource = schema.GroupVersionResource{Group: "cr.example.apiextensi
var examplesKind = schema.GroupVersionKind{Group: "cr.example.apiextensions.k8s.io", Version: "v1", Kind: "Example"} var examplesKind = schema.GroupVersionKind{Group: "cr.example.apiextensions.k8s.io", Version: "v1", Kind: "Example"}
// Get takes name of the example, and returns the corresponding example object, and an error if there is any. // Get takes name of the example, and returns the corresponding example object, and an error if there is any.
func (c *FakeExamples) Get(name string, options v1.GetOptions) (result *cr_v1.Example, err error) { func (c *FakeExamples) Get(name string, options v1.GetOptions) (result *crv1.Example, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewGetAction(examplesResource, c.ns, name), &cr_v1.Example{}) Invokes(testing.NewGetAction(examplesResource, c.ns, name), &crv1.Example{})
if obj == nil { if obj == nil {
return nil, err return nil, err
} }
return obj.(*cr_v1.Example), err return obj.(*crv1.Example), err
} }
// List takes label and field selectors, and returns the list of Examples that match those selectors. // List takes label and field selectors, and returns the list of Examples that match those selectors.
func (c *FakeExamples) List(opts v1.ListOptions) (result *cr_v1.ExampleList, err error) { func (c *FakeExamples) List(opts v1.ListOptions) (result *crv1.ExampleList, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewListAction(examplesResource, examplesKind, c.ns, opts), &cr_v1.ExampleList{}) Invokes(testing.NewListAction(examplesResource, examplesKind, c.ns, opts), &crv1.ExampleList{})
if obj == nil { if obj == nil {
return nil, err return nil, err
@@ -62,8 +62,8 @@ func (c *FakeExamples) List(opts v1.ListOptions) (result *cr_v1.ExampleList, err
if label == nil { if label == nil {
label = labels.Everything() label = labels.Everything()
} }
list := &cr_v1.ExampleList{ListMeta: obj.(*cr_v1.ExampleList).ListMeta} list := &crv1.ExampleList{ListMeta: obj.(*crv1.ExampleList).ListMeta}
for _, item := range obj.(*cr_v1.ExampleList).Items { for _, item := range obj.(*crv1.ExampleList).Items {
if label.Matches(labels.Set(item.Labels)) { if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item) list.Items = append(list.Items, item)
} }
@@ -79,31 +79,31 @@ func (c *FakeExamples) Watch(opts v1.ListOptions) (watch.Interface, error) {
} }
// Create takes the representation of a example and creates it. Returns the server's representation of the example, and an error, if there is any. // Create takes the representation of a example and creates it. Returns the server's representation of the example, and an error, if there is any.
func (c *FakeExamples) Create(example *cr_v1.Example) (result *cr_v1.Example, err error) { func (c *FakeExamples) Create(example *crv1.Example) (result *crv1.Example, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewCreateAction(examplesResource, c.ns, example), &cr_v1.Example{}) Invokes(testing.NewCreateAction(examplesResource, c.ns, example), &crv1.Example{})
if obj == nil { if obj == nil {
return nil, err return nil, err
} }
return obj.(*cr_v1.Example), err return obj.(*crv1.Example), err
} }
// Update takes the representation of a example and updates it. Returns the server's representation of the example, and an error, if there is any. // Update takes the representation of a example and updates it. Returns the server's representation of the example, and an error, if there is any.
func (c *FakeExamples) Update(example *cr_v1.Example) (result *cr_v1.Example, err error) { func (c *FakeExamples) Update(example *crv1.Example) (result *crv1.Example, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewUpdateAction(examplesResource, c.ns, example), &cr_v1.Example{}) Invokes(testing.NewUpdateAction(examplesResource, c.ns, example), &crv1.Example{})
if obj == nil { if obj == nil {
return nil, err return nil, err
} }
return obj.(*cr_v1.Example), err return obj.(*crv1.Example), err
} }
// Delete takes name of the example and deletes it. Returns an error if one occurs. // Delete takes name of the example and deletes it. Returns an error if one occurs.
func (c *FakeExamples) Delete(name string, options *v1.DeleteOptions) error { func (c *FakeExamples) Delete(name string, options *v1.DeleteOptions) error {
_, err := c.Fake. _, err := c.Fake.
Invokes(testing.NewDeleteAction(examplesResource, c.ns, name), &cr_v1.Example{}) Invokes(testing.NewDeleteAction(examplesResource, c.ns, name), &crv1.Example{})
return err return err
} }
@@ -112,17 +112,17 @@ func (c *FakeExamples) Delete(name string, options *v1.DeleteOptions) error {
func (c *FakeExamples) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { func (c *FakeExamples) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(examplesResource, c.ns, listOptions) action := testing.NewDeleteCollectionAction(examplesResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &cr_v1.ExampleList{}) _, err := c.Fake.Invokes(action, &crv1.ExampleList{})
return err return err
} }
// Patch applies the patch and returns the patched example. // Patch applies the patch and returns the patched example.
func (c *FakeExamples) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *cr_v1.Example, err error) { func (c *FakeExamples) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *crv1.Example, err error) {
obj, err := c.Fake. obj, err := c.Fake.
Invokes(testing.NewPatchSubresourceAction(examplesResource, c.ns, name, data, subresources...), &cr_v1.Example{}) Invokes(testing.NewPatchSubresourceAction(examplesResource, c.ns, name, data, subresources...), &crv1.Example{})
if obj == nil { if obj == nil {
return nil, err return nil, err
} }
return obj.(*cr_v1.Example), err return obj.(*crv1.Example), err
} }

12
staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/informers/externalversions/cr/v1/example.go
View File

@@ -21,11 +21,11 @@ package v1
import ( import (
time "time" time "time"
cr_v1 "k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1" crv1 "k8s.io/apiextensions-apiserver/examples/client-go/pkg/apis/cr/v1"
versioned "k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned" versioned "k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned"
internalinterfaces "k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/informers/externalversions/internalinterfaces" internalinterfaces "k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/informers/externalversions/internalinterfaces"
v1 "k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/listers/cr/v1" v1 "k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/listers/cr/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
cache "k8s.io/client-go/tools/cache" cache "k8s.io/client-go/tools/cache"
@@ -57,20 +57,20 @@ func NewExampleInformer(client versioned.Interface, namespace string, resyncPeri
func NewFilteredExampleInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredExampleInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CrV1().Examples(namespace).List(options) return client.CrV1().Examples(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CrV1().Examples(namespace).Watch(options) return client.CrV1().Examples(namespace).Watch(options)
}, },
}, },
&cr_v1.Example{}, &crv1.Example{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *exampleInformer) defaultInformer(client versioned.Interface, resyncPeri
} }
func (f *exampleInformer) Informer() cache.SharedIndexInformer { func (f *exampleInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&cr_v1.Example{}, f.defaultInformer) return f.factory.InformerFor(&crv1.Example{}, f.defaultInformer)
} }
func (f *exampleInformer) Lister() v1.ExampleLister { func (f *exampleInformer) Lister() v1.ExampleLister {

6
staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
apiextensions_v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" clientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces" internalinterfaces "k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces"
v1beta1 "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1" v1beta1 "k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1"
@@ -69,7 +69,7 @@ func NewFilteredCustomResourceDefinitionInformer(client clientset.Interface, res
return client.ApiextensionsV1beta1().CustomResourceDefinitions().Watch(options) return client.ApiextensionsV1beta1().CustomResourceDefinitions().Watch(options)
}, },
}, },
&apiextensions_v1beta1.CustomResourceDefinition{}, &apiextensionsv1beta1.CustomResourceDefinition{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -80,7 +80,7 @@ func (f *customResourceDefinitionInformer) defaultInformer(client clientset.Inte
} }
func (f *customResourceDefinitionInformer) Informer() cache.SharedIndexInformer { func (f *customResourceDefinitionInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apiextensions_v1beta1.CustomResourceDefinition{}, f.defaultInformer) return f.factory.InformerFor(&apiextensionsv1beta1.CustomResourceDefinition{}, f.defaultInformer)
} }
func (f *customResourceDefinitionInformer) Lister() v1beta1.CustomResourceDefinitionLister { func (f *customResourceDefinitionInformer) Lister() v1beta1.CustomResourceDefinitionLister {

12
staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion/zz_generated.deepcopy.go generated
View File

@@ -33,9 +33,7 @@ func (in *List) DeepCopyInto(out *List) {
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]runtime.Object, len(*in)) *out = make([]runtime.Object, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
(*out)[i] = (*in)[i].DeepCopyObject() (*out)[i] = (*in)[i].DeepCopyObject()
} }
} }
@@ -65,14 +63,10 @@ func (in *List) DeepCopyObject() runtime.Object {
func (in *ListOptions) DeepCopyInto(out *ListOptions) { func (in *ListOptions) DeepCopyInto(out *ListOptions) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
if in.LabelSelector == nil { if in.LabelSelector != nil {
out.LabelSelector = nil
} else {
out.LabelSelector = in.LabelSelector.DeepCopySelector() out.LabelSelector = in.LabelSelector.DeepCopySelector()
} }
if in.FieldSelector == nil { if in.FieldSelector != nil {
out.FieldSelector = nil
} else {
out.FieldSelector = in.FieldSelector.DeepCopySelector() out.FieldSelector = in.FieldSelector.DeepCopySelector()
} }
if in.TimeoutSeconds != nil { if in.TimeoutSeconds != nil {

4
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go generated
View File

@@ -443,9 +443,7 @@ func (in *Initializers) DeepCopy() *Initializers {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *InternalEvent) DeepCopyInto(out *InternalEvent) { func (in *InternalEvent) DeepCopyInto(out *InternalEvent) {
*out = *in *out = *in
if in.Object == nil { if in.Object != nil {
out.Object = nil
} else {
out.Object = in.Object.DeepCopyObject() out.Object = in.Object.DeepCopyObject()
} }
return return

4
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.deepcopy.go generated
View File

@@ -58,9 +58,7 @@ func (in *PartialObjectMetadataList) DeepCopyInto(out *PartialObjectMetadataList
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]*PartialObjectMetadata, len(*in)) *out = make([]*PartialObjectMetadata, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
in, out := &(*in)[i], &(*out)[i] in, out := &(*in)[i], &(*out)[i]
*out = new(PartialObjectMetadata) *out = new(PartialObjectMetadata)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)

6
staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1/zz_generated.conversion.go generated
View File

@@ -23,7 +23,7 @@ package v1
import ( import (
unsafe "unsafe" unsafe "unsafe"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
testapigroup "k8s.io/apimachinery/pkg/apis/testapigroup" testapigroup "k8s.io/apimachinery/pkg/apis/testapigroup"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
@@ -201,7 +201,7 @@ func autoConvert_v1_CarpStatus_To_testapigroup_CarpStatus(in *CarpStatus, out *t
out.Reason = in.Reason out.Reason = in.Reason
out.HostIP = in.HostIP out.HostIP = in.HostIP
out.CarpIP = in.CarpIP out.CarpIP = in.CarpIP
out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
return nil return nil
} }
@@ -217,7 +217,7 @@ func autoConvert_testapigroup_CarpStatus_To_v1_CarpStatus(in *testapigroup.CarpS
out.Reason = in.Reason out.Reason = in.Reason
out.HostIP = in.HostIP out.HostIP = in.HostIP
out.CarpIP = in.CarpIP out.CarpIP = in.CarpIP
out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
return nil return nil
} }

20
staging/src/k8s.io/apimachinery/pkg/runtime/testing/zz_generated.deepcopy.go generated
View File

@@ -28,14 +28,10 @@ import (
func (in *EmbeddedTest) DeepCopyInto(out *EmbeddedTest) { func (in *EmbeddedTest) DeepCopyInto(out *EmbeddedTest) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
if in.Object == nil { if in.Object != nil {
out.Object = nil
} else {
out.Object = in.Object.DeepCopyObject() out.Object = in.Object.DeepCopyObject()
} }
if in.EmptyObject == nil { if in.EmptyObject != nil {
out.EmptyObject = nil
} else {
out.EmptyObject = in.EmptyObject.DeepCopyObject() out.EmptyObject = in.EmptyObject.DeepCopyObject()
} }
return return
@@ -366,9 +362,7 @@ func (in *InternalComplex) DeepCopyObject() runtime.Object {
func (in *InternalExtensionType) DeepCopyInto(out *InternalExtensionType) { func (in *InternalExtensionType) DeepCopyInto(out *InternalExtensionType) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
if in.Extension == nil { if in.Extension != nil {
out.Extension = nil
} else {
out.Extension = in.Extension.DeepCopyObject() out.Extension = in.Extension.DeepCopyObject()
} }
return return
@@ -396,9 +390,7 @@ func (in *InternalExtensionType) DeepCopyObject() runtime.Object {
func (in *InternalOptionalExtensionType) DeepCopyInto(out *InternalOptionalExtensionType) { func (in *InternalOptionalExtensionType) DeepCopyInto(out *InternalOptionalExtensionType) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
if in.Extension == nil { if in.Extension != nil {
out.Extension = nil
} else {
out.Extension = in.Extension.DeepCopyObject() out.Extension = in.Extension.DeepCopyObject()
} }
return return
@@ -455,9 +447,7 @@ func (in *ObjectTest) DeepCopyInto(out *ObjectTest) {
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]runtime.Object, len(*in)) *out = make([]runtime.Object, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
(*out)[i] = (*in)[i].DeepCopyObject() (*out)[i] = (*in)[i].DeepCopyObject()
} }
} }

8
staging/src/k8s.io/apimachinery/pkg/runtime/zz_generated.deepcopy.go generated
View File

@@ -28,9 +28,7 @@ func (in *RawExtension) DeepCopyInto(out *RawExtension) {
*out = make([]byte, len(*in)) *out = make([]byte, len(*in))
copy(*out, *in) copy(*out, *in)
} }
if in.Object == nil { if in.Object != nil {
out.Object = nil
} else {
out.Object = in.Object.DeepCopyObject() out.Object = in.Object.DeepCopyObject()
} }
return return
@@ -83,9 +81,7 @@ func (in *VersionedObjects) DeepCopyInto(out *VersionedObjects) {
in, out := &in.Objects, &out.Objects in, out := &in.Objects, &out.Objects
*out = make([]Object, len(*in)) *out = make([]Object, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
(*out)[i] = (*in)[i].DeepCopyObject() (*out)[i] = (*in)[i].DeepCopyObject()
} }
} }

4
staging/src/k8s.io/apimachinery/pkg/test/zz_generated.deepcopy.go generated
View File

@@ -33,9 +33,7 @@ func (in *List) DeepCopyInto(out *List) {
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]runtime.Object, len(*in)) *out = make([]runtime.Object, len(*in))
for i := range *in { for i := range *in {
if (*in)[i] == nil { if (*in)[i] != nil {
(*out)[i] = nil
} else {
(*out)[i] = (*in)[i].DeepCopyObject() (*out)[i] = (*in)[i].DeepCopyObject()
} }
} }

4
staging/src/k8s.io/apimachinery/pkg/watch/zz_generated.deepcopy.go generated
View File

@@ -23,9 +23,7 @@ package watch
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *Event) DeepCopyInto(out *Event) { func (in *Event) DeepCopyInto(out *Event) {
*out = *in *out = *in
if in.Object == nil { if in.Object != nil {
out.Object = nil
} else {
out.Object = in.Object.DeepCopyObject() out.Object = in.Object.DeepCopyObject()
} }
return return

4
staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.conversion.go generated
View File

@@ -23,7 +23,7 @@ package v1alpha1
import ( import (
unsafe "unsafe" unsafe "unsafe"
authentication_v1 "k8s.io/api/authentication/v1" authenticationv1 "k8s.io/api/authentication/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
@@ -99,7 +99,7 @@ func autoConvert_audit_Event_To_v1alpha1_Event(in *audit.Event, out *Event, s co
if err := s.Convert(&in.User, &out.User, 0); err != nil { if err := s.Convert(&in.User, &out.User, 0); err != nil {
return err return err
} }
out.ImpersonatedUser = (*authentication_v1.UserInfo)(unsafe.Pointer(in.ImpersonatedUser)) out.ImpersonatedUser = (*authenticationv1.UserInfo)(unsafe.Pointer(in.ImpersonatedUser))
out.SourceIPs = *(*[]string)(unsafe.Pointer(&in.SourceIPs)) out.SourceIPs = *(*[]string)(unsafe.Pointer(&in.SourceIPs))
out.UserAgent = in.UserAgent out.UserAgent = in.UserAgent
if in.ObjectRef != nil { if in.ObjectRef != nil {

4
staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go generated
View File

@@ -22,7 +22,7 @@ package v1alpha1
import ( import (
v1 "k8s.io/api/authentication/v1" v1 "k8s.io/api/authentication/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
) )
@@ -50,7 +50,7 @@ func (in *Event) DeepCopyInto(out *Event) {
} }
if in.ResponseStatus != nil { if in.ResponseStatus != nil {
in, out := &in.ResponseStatus, &out.ResponseStatus in, out := &in.ResponseStatus, &out.ResponseStatus
*out = new(meta_v1.Status) *out = new(metav1.Status)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.RequestObject != nil { if in.RequestObject != nil {

4
staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1/zz_generated.conversion.go generated
View File

@@ -23,7 +23,7 @@ package v1beta1
import ( import (
unsafe "unsafe" unsafe "unsafe"
authentication_v1 "k8s.io/api/authentication/v1" authenticationv1 "k8s.io/api/authentication/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
@@ -91,7 +91,7 @@ func autoConvert_audit_Event_To_v1beta1_Event(in *audit.Event, out *Event, s con
if err := s.Convert(&in.User, &out.User, 0); err != nil { if err := s.Convert(&in.User, &out.User, 0); err != nil {
return err return err
} }
out.ImpersonatedUser = (*authentication_v1.UserInfo)(unsafe.Pointer(in.ImpersonatedUser)) out.ImpersonatedUser = (*authenticationv1.UserInfo)(unsafe.Pointer(in.ImpersonatedUser))
out.SourceIPs = *(*[]string)(unsafe.Pointer(&in.SourceIPs)) out.SourceIPs = *(*[]string)(unsafe.Pointer(&in.SourceIPs))
out.UserAgent = in.UserAgent out.UserAgent = in.UserAgent
out.ObjectRef = (*ObjectReference)(unsafe.Pointer(in.ObjectRef)) out.ObjectRef = (*ObjectReference)(unsafe.Pointer(in.ObjectRef))

4
staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1/zz_generated.deepcopy.go generated
View File

@@ -22,7 +22,7 @@ package v1beta1
import ( import (
v1 "k8s.io/api/authentication/v1" v1 "k8s.io/api/authentication/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
) )
@@ -50,7 +50,7 @@ func (in *Event) DeepCopyInto(out *Event) {
} }
if in.ResponseStatus != nil { if in.ResponseStatus != nil {
in, out := &in.ResponseStatus, &out.ResponseStatus in, out := &in.ResponseStatus, &out.ResponseStatus
*out = new(meta_v1.Status) *out = new(metav1.Status)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.RequestObject != nil { if in.RequestObject != nil {

6
staging/src/k8s.io/apiserver/pkg/apis/example/v1/zz_generated.conversion.go generated
View File

@@ -23,7 +23,7 @@ package v1
import ( import (
unsafe "unsafe" unsafe "unsafe"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
example "k8s.io/apiserver/pkg/apis/example" example "k8s.io/apiserver/pkg/apis/example"
@@ -201,7 +201,7 @@ func autoConvert_v1_PodStatus_To_example_PodStatus(in *PodStatus, out *example.P
out.Reason = in.Reason out.Reason = in.Reason
out.HostIP = in.HostIP out.HostIP = in.HostIP
out.PodIP = in.PodIP out.PodIP = in.PodIP
out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
return nil return nil
} }
@@ -217,7 +217,7 @@ func autoConvert_example_PodStatus_To_v1_PodStatus(in *example.PodStatus, out *P
out.Reason = in.Reason out.Reason = in.Reason
out.HostIP = in.HostIP out.HostIP = in.HostIP
out.PodIP = in.PodIP out.PodIP = in.PodIP
out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.StartTime = (*metav1.Time)(unsafe.Pointer(in.StartTime))
return nil return nil
} }

6
staging/src/k8s.io/apiserver/pkg/apis/example2/v1/zz_generated.conversion.go generated
View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1 package v1
import ( import (
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
example "k8s.io/apiserver/pkg/apis/example" example "k8s.io/apiserver/pkg/apis/example"
@@ -77,14 +77,14 @@ func Convert_example_ReplicaSet_To_v1_ReplicaSet(in *example.ReplicaSet, out *Re
} }
func autoConvert_v1_ReplicaSetSpec_To_example_ReplicaSetSpec(in *ReplicaSetSpec, out *example.ReplicaSetSpec, s conversion.Scope) error { func autoConvert_v1_ReplicaSetSpec_To_example_ReplicaSetSpec(in *ReplicaSetSpec, out *example.ReplicaSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
return nil return nil
} }
func autoConvert_example_ReplicaSetSpec_To_v1_ReplicaSetSpec(in *example.ReplicaSetSpec, out *ReplicaSetSpec, s conversion.Scope) error { func autoConvert_example_ReplicaSetSpec_To_v1_ReplicaSetSpec(in *example.ReplicaSetSpec, out *ReplicaSetSpec, s conversion.Scope) error {
if err := meta_v1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := metav1.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
return nil return nil

4
staging/src/k8s.io/apiserver/pkg/registry/rest/zz_generated.deepcopy.go generated
View File

@@ -27,9 +27,7 @@ import (
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ConnectRequest) DeepCopyInto(out *ConnectRequest) { func (in *ConnectRequest) DeepCopyInto(out *ConnectRequest) {
*out = *in *out = *in
if in.Options == nil { if in.Options != nil {
out.Options = nil
} else {
out.Options = in.Options.DeepCopyObject() out.Options = in.Options.DeepCopyObject()
} }
return return

6
staging/src/k8s.io/client-go/informers/admissionregistration/v1alpha1/initializerconfiguration.go
View File

@@ -21,7 +21,7 @@ package v1alpha1
import ( import (
time "time" time "time"
admissionregistration_v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -69,7 +69,7 @@ func NewFilteredInitializerConfigurationInformer(client kubernetes.Interface, re
return client.AdmissionregistrationV1alpha1().InitializerConfigurations().Watch(options) return client.AdmissionregistrationV1alpha1().InitializerConfigurations().Watch(options)
}, },
}, },
&admissionregistration_v1alpha1.InitializerConfiguration{}, &admissionregistrationv1alpha1.InitializerConfiguration{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -80,7 +80,7 @@ func (f *initializerConfigurationInformer) defaultInformer(client kubernetes.Int
} }
func (f *initializerConfigurationInformer) Informer() cache.SharedIndexInformer { func (f *initializerConfigurationInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&admissionregistration_v1alpha1.InitializerConfiguration{}, f.defaultInformer) return f.factory.InformerFor(&admissionregistrationv1alpha1.InitializerConfiguration{}, f.defaultInformer)
} }
func (f *initializerConfigurationInformer) Lister() v1alpha1.InitializerConfigurationLister { func (f *initializerConfigurationInformer) Lister() v1alpha1.InitializerConfigurationLister {

6
staging/src/k8s.io/client-go/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
admissionregistration_v1beta1 "k8s.io/api/admissionregistration/v1beta1" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -69,7 +69,7 @@ func NewFilteredMutatingWebhookConfigurationInformer(client kubernetes.Interface
return client.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().Watch(options) return client.AdmissionregistrationV1beta1().MutatingWebhookConfigurations().Watch(options)
}, },
}, },
&admissionregistration_v1beta1.MutatingWebhookConfiguration{}, &admissionregistrationv1beta1.MutatingWebhookConfiguration{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -80,7 +80,7 @@ func (f *mutatingWebhookConfigurationInformer) defaultInformer(client kubernetes
} }
func (f *mutatingWebhookConfigurationInformer) Informer() cache.SharedIndexInformer { func (f *mutatingWebhookConfigurationInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&admissionregistration_v1beta1.MutatingWebhookConfiguration{}, f.defaultInformer) return f.factory.InformerFor(&admissionregistrationv1beta1.MutatingWebhookConfiguration{}, f.defaultInformer)
} }
func (f *mutatingWebhookConfigurationInformer) Lister() v1beta1.MutatingWebhookConfigurationLister { func (f *mutatingWebhookConfigurationInformer) Lister() v1beta1.MutatingWebhookConfigurationLister {

6
staging/src/k8s.io/client-go/informers/admissionregistration/v1beta1/validatingwebhookconfiguration.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
admissionregistration_v1beta1 "k8s.io/api/admissionregistration/v1beta1" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -69,7 +69,7 @@ func NewFilteredValidatingWebhookConfigurationInformer(client kubernetes.Interfa
return client.AdmissionregistrationV1beta1().ValidatingWebhookConfigurations().Watch(options) return client.AdmissionregistrationV1beta1().ValidatingWebhookConfigurations().Watch(options)
}, },
}, },
&admissionregistration_v1beta1.ValidatingWebhookConfiguration{}, &admissionregistrationv1beta1.ValidatingWebhookConfiguration{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -80,7 +80,7 @@ func (f *validatingWebhookConfigurationInformer) defaultInformer(client kubernet
} }
func (f *validatingWebhookConfigurationInformer) Informer() cache.SharedIndexInformer { func (f *validatingWebhookConfigurationInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&admissionregistration_v1beta1.ValidatingWebhookConfiguration{}, f.defaultInformer) return f.factory.InformerFor(&admissionregistrationv1beta1.ValidatingWebhookConfiguration{}, f.defaultInformer)
} }
func (f *validatingWebhookConfigurationInformer) Lister() v1beta1.ValidatingWebhookConfigurationLister { func (f *validatingWebhookConfigurationInformer) Lister() v1beta1.ValidatingWebhookConfigurationLister {

12
staging/src/k8s.io/client-go/informers/apps/v1/controllerrevision.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
apps_v1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewControllerRevisionInformer(client kubernetes.Interface, namespace string
func NewFilteredControllerRevisionInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredControllerRevisionInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().ControllerRevisions(namespace).List(options) return client.AppsV1().ControllerRevisions(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().ControllerRevisions(namespace).Watch(options) return client.AppsV1().ControllerRevisions(namespace).Watch(options)
}, },
}, },
&apps_v1.ControllerRevision{}, &appsv1.ControllerRevision{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *controllerRevisionInformer) defaultInformer(client kubernetes.Interface
} }
func (f *controllerRevisionInformer) Informer() cache.SharedIndexInformer { func (f *controllerRevisionInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1.ControllerRevision{}, f.defaultInformer) return f.factory.InformerFor(&appsv1.ControllerRevision{}, f.defaultInformer)
} }
func (f *controllerRevisionInformer) Lister() v1.ControllerRevisionLister { func (f *controllerRevisionInformer) Lister() v1.ControllerRevisionLister {

12
staging/src/k8s.io/client-go/informers/apps/v1/daemonset.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
apps_v1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewDaemonSetInformer(client kubernetes.Interface, namespace string, resyncP
func NewFilteredDaemonSetInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredDaemonSetInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().DaemonSets(namespace).List(options) return client.AppsV1().DaemonSets(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().DaemonSets(namespace).Watch(options) return client.AppsV1().DaemonSets(namespace).Watch(options)
}, },
}, },
&apps_v1.DaemonSet{}, &appsv1.DaemonSet{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *daemonSetInformer) defaultInformer(client kubernetes.Interface, resyncP
} }
func (f *daemonSetInformer) Informer() cache.SharedIndexInformer { func (f *daemonSetInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1.DaemonSet{}, f.defaultInformer) return f.factory.InformerFor(&appsv1.DaemonSet{}, f.defaultInformer)
} }
func (f *daemonSetInformer) Lister() v1.DaemonSetLister { func (f *daemonSetInformer) Lister() v1.DaemonSetLister {

12
staging/src/k8s.io/client-go/informers/apps/v1/deployment.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
apps_v1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewDeploymentInformer(client kubernetes.Interface, namespace string, resync
func NewFilteredDeploymentInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredDeploymentInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().Deployments(namespace).List(options) return client.AppsV1().Deployments(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().Deployments(namespace).Watch(options) return client.AppsV1().Deployments(namespace).Watch(options)
}, },
}, },
&apps_v1.Deployment{}, &appsv1.Deployment{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *deploymentInformer) defaultInformer(client kubernetes.Interface, resync
} }
func (f *deploymentInformer) Informer() cache.SharedIndexInformer { func (f *deploymentInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1.Deployment{}, f.defaultInformer) return f.factory.InformerFor(&appsv1.Deployment{}, f.defaultInformer)
} }
func (f *deploymentInformer) Lister() v1.DeploymentLister { func (f *deploymentInformer) Lister() v1.DeploymentLister {

12
staging/src/k8s.io/client-go/informers/apps/v1/replicaset.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
apps_v1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewReplicaSetInformer(client kubernetes.Interface, namespace string, resync
func NewFilteredReplicaSetInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredReplicaSetInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().ReplicaSets(namespace).List(options) return client.AppsV1().ReplicaSets(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().ReplicaSets(namespace).Watch(options) return client.AppsV1().ReplicaSets(namespace).Watch(options)
}, },
}, },
&apps_v1.ReplicaSet{}, &appsv1.ReplicaSet{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *replicaSetInformer) defaultInformer(client kubernetes.Interface, resync
} }
func (f *replicaSetInformer) Informer() cache.SharedIndexInformer { func (f *replicaSetInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1.ReplicaSet{}, f.defaultInformer) return f.factory.InformerFor(&appsv1.ReplicaSet{}, f.defaultInformer)
} }
func (f *replicaSetInformer) Lister() v1.ReplicaSetLister { func (f *replicaSetInformer) Lister() v1.ReplicaSetLister {

12
staging/src/k8s.io/client-go/informers/apps/v1/statefulset.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
apps_v1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewStatefulSetInformer(client kubernetes.Interface, namespace string, resyn
func NewFilteredStatefulSetInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredStatefulSetInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().StatefulSets(namespace).List(options) return client.AppsV1().StatefulSets(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AppsV1().StatefulSets(namespace).Watch(options) return client.AppsV1().StatefulSets(namespace).Watch(options)
}, },
}, },
&apps_v1.StatefulSet{}, &appsv1.StatefulSet{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *statefulSetInformer) defaultInformer(client kubernetes.Interface, resyn
} }
func (f *statefulSetInformer) Informer() cache.SharedIndexInformer { func (f *statefulSetInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1.StatefulSet{}, f.defaultInformer) return f.factory.InformerFor(&appsv1.StatefulSet{}, f.defaultInformer)
} }
func (f *statefulSetInformer) Lister() v1.StatefulSetLister { func (f *statefulSetInformer) Lister() v1.StatefulSetLister {

6
staging/src/k8s.io/client-go/informers/apps/v1beta1/controllerrevision.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
apps_v1beta1 "k8s.io/api/apps/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredControllerRevisionInformer(client kubernetes.Interface, namespac
return client.AppsV1beta1().ControllerRevisions(namespace).Watch(options) return client.AppsV1beta1().ControllerRevisions(namespace).Watch(options)
}, },
}, },
&apps_v1beta1.ControllerRevision{}, &appsv1beta1.ControllerRevision{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *controllerRevisionInformer) defaultInformer(client kubernetes.Interface
} }
func (f *controllerRevisionInformer) Informer() cache.SharedIndexInformer { func (f *controllerRevisionInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1beta1.ControllerRevision{}, f.defaultInformer) return f.factory.InformerFor(&appsv1beta1.ControllerRevision{}, f.defaultInformer)
} }
func (f *controllerRevisionInformer) Lister() v1beta1.ControllerRevisionLister { func (f *controllerRevisionInformer) Lister() v1beta1.ControllerRevisionLister {

6
staging/src/k8s.io/client-go/informers/apps/v1beta1/deployment.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
apps_v1beta1 "k8s.io/api/apps/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredDeploymentInformer(client kubernetes.Interface, namespace string
return client.AppsV1beta1().Deployments(namespace).Watch(options) return client.AppsV1beta1().Deployments(namespace).Watch(options)
}, },
}, },
&apps_v1beta1.Deployment{}, &appsv1beta1.Deployment{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *deploymentInformer) defaultInformer(client kubernetes.Interface, resync
} }
func (f *deploymentInformer) Informer() cache.SharedIndexInformer { func (f *deploymentInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1beta1.Deployment{}, f.defaultInformer) return f.factory.InformerFor(&appsv1beta1.Deployment{}, f.defaultInformer)
} }
func (f *deploymentInformer) Lister() v1beta1.DeploymentLister { func (f *deploymentInformer) Lister() v1beta1.DeploymentLister {

6
staging/src/k8s.io/client-go/informers/apps/v1beta1/statefulset.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
apps_v1beta1 "k8s.io/api/apps/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredStatefulSetInformer(client kubernetes.Interface, namespace strin
return client.AppsV1beta1().StatefulSets(namespace).Watch(options) return client.AppsV1beta1().StatefulSets(namespace).Watch(options)
}, },
}, },
&apps_v1beta1.StatefulSet{}, &appsv1beta1.StatefulSet{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *statefulSetInformer) defaultInformer(client kubernetes.Interface, resyn
} }
func (f *statefulSetInformer) Informer() cache.SharedIndexInformer { func (f *statefulSetInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1beta1.StatefulSet{}, f.defaultInformer) return f.factory.InformerFor(&appsv1beta1.StatefulSet{}, f.defaultInformer)
} }
func (f *statefulSetInformer) Lister() v1beta1.StatefulSetLister { func (f *statefulSetInformer) Lister() v1beta1.StatefulSetLister {

6
staging/src/k8s.io/client-go/informers/apps/v1beta2/controllerrevision.go
View File

@@ -21,7 +21,7 @@ package v1beta2
import ( import (
time "time" time "time"
apps_v1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredControllerRevisionInformer(client kubernetes.Interface, namespac
return client.AppsV1beta2().ControllerRevisions(namespace).Watch(options) return client.AppsV1beta2().ControllerRevisions(namespace).Watch(options)
}, },
}, },
&apps_v1beta2.ControllerRevision{}, &appsv1beta2.ControllerRevision{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *controllerRevisionInformer) defaultInformer(client kubernetes.Interface
} }
func (f *controllerRevisionInformer) Informer() cache.SharedIndexInformer { func (f *controllerRevisionInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1beta2.ControllerRevision{}, f.defaultInformer) return f.factory.InformerFor(&appsv1beta2.ControllerRevision{}, f.defaultInformer)
} }
func (f *controllerRevisionInformer) Lister() v1beta2.ControllerRevisionLister { func (f *controllerRevisionInformer) Lister() v1beta2.ControllerRevisionLister {

6
staging/src/k8s.io/client-go/informers/apps/v1beta2/daemonset.go
View File

@@ -21,7 +21,7 @@ package v1beta2
import ( import (
time "time" time "time"
apps_v1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredDaemonSetInformer(client kubernetes.Interface, namespace string,
return client.AppsV1beta2().DaemonSets(namespace).Watch(options) return client.AppsV1beta2().DaemonSets(namespace).Watch(options)
}, },
}, },
&apps_v1beta2.DaemonSet{}, &appsv1beta2.DaemonSet{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *daemonSetInformer) defaultInformer(client kubernetes.Interface, resyncP
} }
func (f *daemonSetInformer) Informer() cache.SharedIndexInformer { func (f *daemonSetInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1beta2.DaemonSet{}, f.defaultInformer) return f.factory.InformerFor(&appsv1beta2.DaemonSet{}, f.defaultInformer)
} }
func (f *daemonSetInformer) Lister() v1beta2.DaemonSetLister { func (f *daemonSetInformer) Lister() v1beta2.DaemonSetLister {

6
staging/src/k8s.io/client-go/informers/apps/v1beta2/deployment.go
View File

@@ -21,7 +21,7 @@ package v1beta2
import ( import (
time "time" time "time"
apps_v1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredDeploymentInformer(client kubernetes.Interface, namespace string
return client.AppsV1beta2().Deployments(namespace).Watch(options) return client.AppsV1beta2().Deployments(namespace).Watch(options)
}, },
}, },
&apps_v1beta2.Deployment{}, &appsv1beta2.Deployment{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *deploymentInformer) defaultInformer(client kubernetes.Interface, resync
} }
func (f *deploymentInformer) Informer() cache.SharedIndexInformer { func (f *deploymentInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1beta2.Deployment{}, f.defaultInformer) return f.factory.InformerFor(&appsv1beta2.Deployment{}, f.defaultInformer)
} }
func (f *deploymentInformer) Lister() v1beta2.DeploymentLister { func (f *deploymentInformer) Lister() v1beta2.DeploymentLister {

6
staging/src/k8s.io/client-go/informers/apps/v1beta2/replicaset.go
View File

@@ -21,7 +21,7 @@ package v1beta2
import ( import (
time "time" time "time"
apps_v1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredReplicaSetInformer(client kubernetes.Interface, namespace string
return client.AppsV1beta2().ReplicaSets(namespace).Watch(options) return client.AppsV1beta2().ReplicaSets(namespace).Watch(options)
}, },
}, },
&apps_v1beta2.ReplicaSet{}, &appsv1beta2.ReplicaSet{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *replicaSetInformer) defaultInformer(client kubernetes.Interface, resync
} }
func (f *replicaSetInformer) Informer() cache.SharedIndexInformer { func (f *replicaSetInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1beta2.ReplicaSet{}, f.defaultInformer) return f.factory.InformerFor(&appsv1beta2.ReplicaSet{}, f.defaultInformer)
} }
func (f *replicaSetInformer) Lister() v1beta2.ReplicaSetLister { func (f *replicaSetInformer) Lister() v1beta2.ReplicaSetLister {

6
staging/src/k8s.io/client-go/informers/apps/v1beta2/statefulset.go
View File

@@ -21,7 +21,7 @@ package v1beta2
import ( import (
time "time" time "time"
apps_v1beta2 "k8s.io/api/apps/v1beta2" appsv1beta2 "k8s.io/api/apps/v1beta2"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredStatefulSetInformer(client kubernetes.Interface, namespace strin
return client.AppsV1beta2().StatefulSets(namespace).Watch(options) return client.AppsV1beta2().StatefulSets(namespace).Watch(options)
}, },
}, },
&apps_v1beta2.StatefulSet{}, &appsv1beta2.StatefulSet{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *statefulSetInformer) defaultInformer(client kubernetes.Interface, resyn
} }
func (f *statefulSetInformer) Informer() cache.SharedIndexInformer { func (f *statefulSetInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&apps_v1beta2.StatefulSet{}, f.defaultInformer) return f.factory.InformerFor(&appsv1beta2.StatefulSet{}, f.defaultInformer)
} }
func (f *statefulSetInformer) Lister() v1beta2.StatefulSetLister { func (f *statefulSetInformer) Lister() v1beta2.StatefulSetLister {

12
staging/src/k8s.io/client-go/informers/autoscaling/v1/horizontalpodautoscaler.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
autoscaling_v1 "k8s.io/api/autoscaling/v1" autoscalingv1 "k8s.io/api/autoscaling/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewHorizontalPodAutoscalerInformer(client kubernetes.Interface, namespace s
func NewFilteredHorizontalPodAutoscalerInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredHorizontalPodAutoscalerInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AutoscalingV1().HorizontalPodAutoscalers(namespace).List(options) return client.AutoscalingV1().HorizontalPodAutoscalers(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.AutoscalingV1().HorizontalPodAutoscalers(namespace).Watch(options) return client.AutoscalingV1().HorizontalPodAutoscalers(namespace).Watch(options)
}, },
}, },
&autoscaling_v1.HorizontalPodAutoscaler{}, &autoscalingv1.HorizontalPodAutoscaler{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *horizontalPodAutoscalerInformer) defaultInformer(client kubernetes.Inte
} }
func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer { func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&autoscaling_v1.HorizontalPodAutoscaler{}, f.defaultInformer) return f.factory.InformerFor(&autoscalingv1.HorizontalPodAutoscaler{}, f.defaultInformer)
} }
func (f *horizontalPodAutoscalerInformer) Lister() v1.HorizontalPodAutoscalerLister { func (f *horizontalPodAutoscalerInformer) Lister() v1.HorizontalPodAutoscalerLister {

6
staging/src/k8s.io/client-go/informers/autoscaling/v2beta1/horizontalpodautoscaler.go
View File

@@ -21,7 +21,7 @@ package v2beta1
import ( import (
time "time" time "time"
autoscaling_v2beta1 "k8s.io/api/autoscaling/v2beta1" autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredHorizontalPodAutoscalerInformer(client kubernetes.Interface, nam
return client.AutoscalingV2beta1().HorizontalPodAutoscalers(namespace).Watch(options) return client.AutoscalingV2beta1().HorizontalPodAutoscalers(namespace).Watch(options)
}, },
}, },
&autoscaling_v2beta1.HorizontalPodAutoscaler{}, &autoscalingv2beta1.HorizontalPodAutoscaler{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *horizontalPodAutoscalerInformer) defaultInformer(client kubernetes.Inte
} }
func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer { func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&autoscaling_v2beta1.HorizontalPodAutoscaler{}, f.defaultInformer) return f.factory.InformerFor(&autoscalingv2beta1.HorizontalPodAutoscaler{}, f.defaultInformer)
} }
func (f *horizontalPodAutoscalerInformer) Lister() v2beta1.HorizontalPodAutoscalerLister { func (f *horizontalPodAutoscalerInformer) Lister() v2beta1.HorizontalPodAutoscalerLister {

12
staging/src/k8s.io/client-go/informers/batch/v1/job.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
batch_v1 "k8s.io/api/batch/v1" batchv1 "k8s.io/api/batch/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewJobInformer(client kubernetes.Interface, namespace string, resyncPeriod
func NewFilteredJobInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredJobInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.BatchV1().Jobs(namespace).List(options) return client.BatchV1().Jobs(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.BatchV1().Jobs(namespace).Watch(options) return client.BatchV1().Jobs(namespace).Watch(options)
}, },
}, },
&batch_v1.Job{}, &batchv1.Job{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *jobInformer) defaultInformer(client kubernetes.Interface, resyncPeriod
} }
func (f *jobInformer) Informer() cache.SharedIndexInformer { func (f *jobInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&batch_v1.Job{}, f.defaultInformer) return f.factory.InformerFor(&batchv1.Job{}, f.defaultInformer)
} }
func (f *jobInformer) Lister() v1.JobLister { func (f *jobInformer) Lister() v1.JobLister {

6
staging/src/k8s.io/client-go/informers/batch/v1beta1/cronjob.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
batch_v1beta1 "k8s.io/api/batch/v1beta1" batchv1beta1 "k8s.io/api/batch/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredCronJobInformer(client kubernetes.Interface, namespace string, r
return client.BatchV1beta1().CronJobs(namespace).Watch(options) return client.BatchV1beta1().CronJobs(namespace).Watch(options)
}, },
}, },
&batch_v1beta1.CronJob{}, &batchv1beta1.CronJob{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *cronJobInformer) defaultInformer(client kubernetes.Interface, resyncPer
} }
func (f *cronJobInformer) Informer() cache.SharedIndexInformer { func (f *cronJobInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&batch_v1beta1.CronJob{}, f.defaultInformer) return f.factory.InformerFor(&batchv1beta1.CronJob{}, f.defaultInformer)
} }
func (f *cronJobInformer) Lister() v1beta1.CronJobLister { func (f *cronJobInformer) Lister() v1beta1.CronJobLister {

6
staging/src/k8s.io/client-go/informers/batch/v2alpha1/cronjob.go
View File

@@ -21,7 +21,7 @@ package v2alpha1
import ( import (
time "time" time "time"
batch_v2alpha1 "k8s.io/api/batch/v2alpha1" batchv2alpha1 "k8s.io/api/batch/v2alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredCronJobInformer(client kubernetes.Interface, namespace string, r
return client.BatchV2alpha1().CronJobs(namespace).Watch(options) return client.BatchV2alpha1().CronJobs(namespace).Watch(options)
}, },
}, },
&batch_v2alpha1.CronJob{}, &batchv2alpha1.CronJob{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *cronJobInformer) defaultInformer(client kubernetes.Interface, resyncPer
} }
func (f *cronJobInformer) Informer() cache.SharedIndexInformer { func (f *cronJobInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&batch_v2alpha1.CronJob{}, f.defaultInformer) return f.factory.InformerFor(&batchv2alpha1.CronJob{}, f.defaultInformer)
} }
func (f *cronJobInformer) Lister() v2alpha1.CronJobLister { func (f *cronJobInformer) Lister() v2alpha1.CronJobLister {

6
staging/src/k8s.io/client-go/informers/certificates/v1beta1/certificatesigningrequest.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
certificates_v1beta1 "k8s.io/api/certificates/v1beta1" certificatesv1beta1 "k8s.io/api/certificates/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -69,7 +69,7 @@ func NewFilteredCertificateSigningRequestInformer(client kubernetes.Interface, r
return client.CertificatesV1beta1().CertificateSigningRequests().Watch(options) return client.CertificatesV1beta1().CertificateSigningRequests().Watch(options)
}, },
}, },
&certificates_v1beta1.CertificateSigningRequest{}, &certificatesv1beta1.CertificateSigningRequest{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -80,7 +80,7 @@ func (f *certificateSigningRequestInformer) defaultInformer(client kubernetes.In
} }
func (f *certificateSigningRequestInformer) Informer() cache.SharedIndexInformer { func (f *certificateSigningRequestInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&certificates_v1beta1.CertificateSigningRequest{}, f.defaultInformer) return f.factory.InformerFor(&certificatesv1beta1.CertificateSigningRequest{}, f.defaultInformer)
} }
func (f *certificateSigningRequestInformer) Lister() v1beta1.CertificateSigningRequestLister { func (f *certificateSigningRequestInformer) Lister() v1beta1.CertificateSigningRequestLister {

6
staging/src/k8s.io/client-go/informers/coordination/v1beta1/lease.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
coordination_v1beta1 "k8s.io/api/coordination/v1beta1" coordinationv1beta1 "k8s.io/api/coordination/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredLeaseInformer(client kubernetes.Interface, namespace string, res
return client.CoordinationV1beta1().Leases(namespace).Watch(options) return client.CoordinationV1beta1().Leases(namespace).Watch(options)
}, },
}, },
&coordination_v1beta1.Lease{}, &coordinationv1beta1.Lease{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *leaseInformer) defaultInformer(client kubernetes.Interface, resyncPerio
} }
func (f *leaseInformer) Informer() cache.SharedIndexInformer { func (f *leaseInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&coordination_v1beta1.Lease{}, f.defaultInformer) return f.factory.InformerFor(&coordinationv1beta1.Lease{}, f.defaultInformer)
} }
func (f *leaseInformer) Lister() v1beta1.LeaseLister { func (f *leaseInformer) Lister() v1beta1.LeaseLister {

12
staging/src/k8s.io/client-go/informers/core/v1/componentstatus.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -56,20 +56,20 @@ func NewComponentStatusInformer(client kubernetes.Interface, resyncPeriod time.D
func NewFilteredComponentStatusInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredComponentStatusInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ComponentStatuses().List(options) return client.CoreV1().ComponentStatuses().List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ComponentStatuses().Watch(options) return client.CoreV1().ComponentStatuses().Watch(options)
}, },
}, },
&core_v1.ComponentStatus{}, &corev1.ComponentStatus{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -80,7 +80,7 @@ func (f *componentStatusInformer) defaultInformer(client kubernetes.Interface, r
} }
func (f *componentStatusInformer) Informer() cache.SharedIndexInformer { func (f *componentStatusInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.ComponentStatus{}, f.defaultInformer) return f.factory.InformerFor(&corev1.ComponentStatus{}, f.defaultInformer)
} }
func (f *componentStatusInformer) Lister() v1.ComponentStatusLister { func (f *componentStatusInformer) Lister() v1.ComponentStatusLister {

12
staging/src/k8s.io/client-go/informers/core/v1/configmap.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewConfigMapInformer(client kubernetes.Interface, namespace string, resyncP
func NewFilteredConfigMapInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredConfigMapInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ConfigMaps(namespace).List(options) return client.CoreV1().ConfigMaps(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ConfigMaps(namespace).Watch(options) return client.CoreV1().ConfigMaps(namespace).Watch(options)
}, },
}, },
&core_v1.ConfigMap{}, &corev1.ConfigMap{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *configMapInformer) defaultInformer(client kubernetes.Interface, resyncP
} }
func (f *configMapInformer) Informer() cache.SharedIndexInformer { func (f *configMapInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.ConfigMap{}, f.defaultInformer) return f.factory.InformerFor(&corev1.ConfigMap{}, f.defaultInformer)
} }
func (f *configMapInformer) Lister() v1.ConfigMapLister { func (f *configMapInformer) Lister() v1.ConfigMapLister {

12
staging/src/k8s.io/client-go/informers/core/v1/endpoints.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewEndpointsInformer(client kubernetes.Interface, namespace string, resyncP
func NewFilteredEndpointsInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredEndpointsInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Endpoints(namespace).List(options) return client.CoreV1().Endpoints(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Endpoints(namespace).Watch(options) return client.CoreV1().Endpoints(namespace).Watch(options)
}, },
}, },
&core_v1.Endpoints{}, &corev1.Endpoints{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *endpointsInformer) defaultInformer(client kubernetes.Interface, resyncP
} }
func (f *endpointsInformer) Informer() cache.SharedIndexInformer { func (f *endpointsInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.Endpoints{}, f.defaultInformer) return f.factory.InformerFor(&corev1.Endpoints{}, f.defaultInformer)
} }
func (f *endpointsInformer) Lister() v1.EndpointsLister { func (f *endpointsInformer) Lister() v1.EndpointsLister {

12
staging/src/k8s.io/client-go/informers/core/v1/event.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewEventInformer(client kubernetes.Interface, namespace string, resyncPerio
func NewFilteredEventInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredEventInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Events(namespace).List(options) return client.CoreV1().Events(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Events(namespace).Watch(options) return client.CoreV1().Events(namespace).Watch(options)
}, },
}, },
&core_v1.Event{}, &corev1.Event{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *eventInformer) defaultInformer(client kubernetes.Interface, resyncPerio
} }
func (f *eventInformer) Informer() cache.SharedIndexInformer { func (f *eventInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.Event{}, f.defaultInformer) return f.factory.InformerFor(&corev1.Event{}, f.defaultInformer)
} }
func (f *eventInformer) Lister() v1.EventLister { func (f *eventInformer) Lister() v1.EventLister {

12
staging/src/k8s.io/client-go/informers/core/v1/limitrange.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewLimitRangeInformer(client kubernetes.Interface, namespace string, resync
func NewFilteredLimitRangeInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredLimitRangeInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().LimitRanges(namespace).List(options) return client.CoreV1().LimitRanges(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().LimitRanges(namespace).Watch(options) return client.CoreV1().LimitRanges(namespace).Watch(options)
}, },
}, },
&core_v1.LimitRange{}, &corev1.LimitRange{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *limitRangeInformer) defaultInformer(client kubernetes.Interface, resync
} }
func (f *limitRangeInformer) Informer() cache.SharedIndexInformer { func (f *limitRangeInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.LimitRange{}, f.defaultInformer) return f.factory.InformerFor(&corev1.LimitRange{}, f.defaultInformer)
} }
func (f *limitRangeInformer) Lister() v1.LimitRangeLister { func (f *limitRangeInformer) Lister() v1.LimitRangeLister {

12
staging/src/k8s.io/client-go/informers/core/v1/namespace.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -56,20 +56,20 @@ func NewNamespaceInformer(client kubernetes.Interface, resyncPeriod time.Duratio
func NewFilteredNamespaceInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredNamespaceInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Namespaces().List(options) return client.CoreV1().Namespaces().List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Namespaces().Watch(options) return client.CoreV1().Namespaces().Watch(options)
}, },
}, },
&core_v1.Namespace{}, &corev1.Namespace{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -80,7 +80,7 @@ func (f *namespaceInformer) defaultInformer(client kubernetes.Interface, resyncP
} }
func (f *namespaceInformer) Informer() cache.SharedIndexInformer { func (f *namespaceInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.Namespace{}, f.defaultInformer) return f.factory.InformerFor(&corev1.Namespace{}, f.defaultInformer)
} }
func (f *namespaceInformer) Lister() v1.NamespaceLister { func (f *namespaceInformer) Lister() v1.NamespaceLister {

12
staging/src/k8s.io/client-go/informers/core/v1/node.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -56,20 +56,20 @@ func NewNodeInformer(client kubernetes.Interface, resyncPeriod time.Duration, in
func NewFilteredNodeInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredNodeInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Nodes().List(options) return client.CoreV1().Nodes().List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Nodes().Watch(options) return client.CoreV1().Nodes().Watch(options)
}, },
}, },
&core_v1.Node{}, &corev1.Node{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -80,7 +80,7 @@ func (f *nodeInformer) defaultInformer(client kubernetes.Interface, resyncPeriod
} }
func (f *nodeInformer) Informer() cache.SharedIndexInformer { func (f *nodeInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.Node{}, f.defaultInformer) return f.factory.InformerFor(&corev1.Node{}, f.defaultInformer)
} }
func (f *nodeInformer) Lister() v1.NodeLister { func (f *nodeInformer) Lister() v1.NodeLister {

12
staging/src/k8s.io/client-go/informers/core/v1/persistentvolume.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -56,20 +56,20 @@ func NewPersistentVolumeInformer(client kubernetes.Interface, resyncPeriod time.
func NewFilteredPersistentVolumeInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredPersistentVolumeInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().PersistentVolumes().List(options) return client.CoreV1().PersistentVolumes().List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().PersistentVolumes().Watch(options) return client.CoreV1().PersistentVolumes().Watch(options)
}, },
}, },
&core_v1.PersistentVolume{}, &corev1.PersistentVolume{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -80,7 +80,7 @@ func (f *persistentVolumeInformer) defaultInformer(client kubernetes.Interface,
} }
func (f *persistentVolumeInformer) Informer() cache.SharedIndexInformer { func (f *persistentVolumeInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.PersistentVolume{}, f.defaultInformer) return f.factory.InformerFor(&corev1.PersistentVolume{}, f.defaultInformer)
} }
func (f *persistentVolumeInformer) Lister() v1.PersistentVolumeLister { func (f *persistentVolumeInformer) Lister() v1.PersistentVolumeLister {

12
staging/src/k8s.io/client-go/informers/core/v1/persistentvolumeclaim.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewPersistentVolumeClaimInformer(client kubernetes.Interface, namespace str
func NewFilteredPersistentVolumeClaimInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredPersistentVolumeClaimInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().PersistentVolumeClaims(namespace).List(options) return client.CoreV1().PersistentVolumeClaims(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().PersistentVolumeClaims(namespace).Watch(options) return client.CoreV1().PersistentVolumeClaims(namespace).Watch(options)
}, },
}, },
&core_v1.PersistentVolumeClaim{}, &corev1.PersistentVolumeClaim{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *persistentVolumeClaimInformer) defaultInformer(client kubernetes.Interf
} }
func (f *persistentVolumeClaimInformer) Informer() cache.SharedIndexInformer { func (f *persistentVolumeClaimInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.PersistentVolumeClaim{}, f.defaultInformer) return f.factory.InformerFor(&corev1.PersistentVolumeClaim{}, f.defaultInformer)
} }
func (f *persistentVolumeClaimInformer) Lister() v1.PersistentVolumeClaimLister { func (f *persistentVolumeClaimInformer) Lister() v1.PersistentVolumeClaimLister {

12
staging/src/k8s.io/client-go/informers/core/v1/pod.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewPodInformer(client kubernetes.Interface, namespace string, resyncPeriod
func NewFilteredPodInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredPodInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Pods(namespace).List(options) return client.CoreV1().Pods(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Pods(namespace).Watch(options) return client.CoreV1().Pods(namespace).Watch(options)
}, },
}, },
&core_v1.Pod{}, &corev1.Pod{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *podInformer) defaultInformer(client kubernetes.Interface, resyncPeriod
} }
func (f *podInformer) Informer() cache.SharedIndexInformer { func (f *podInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.Pod{}, f.defaultInformer) return f.factory.InformerFor(&corev1.Pod{}, f.defaultInformer)
} }
func (f *podInformer) Lister() v1.PodLister { func (f *podInformer) Lister() v1.PodLister {

12
staging/src/k8s.io/client-go/informers/core/v1/podtemplate.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewPodTemplateInformer(client kubernetes.Interface, namespace string, resyn
func NewFilteredPodTemplateInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredPodTemplateInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().PodTemplates(namespace).List(options) return client.CoreV1().PodTemplates(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().PodTemplates(namespace).Watch(options) return client.CoreV1().PodTemplates(namespace).Watch(options)
}, },
}, },
&core_v1.PodTemplate{}, &corev1.PodTemplate{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *podTemplateInformer) defaultInformer(client kubernetes.Interface, resyn
} }
func (f *podTemplateInformer) Informer() cache.SharedIndexInformer { func (f *podTemplateInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.PodTemplate{}, f.defaultInformer) return f.factory.InformerFor(&corev1.PodTemplate{}, f.defaultInformer)
} }
func (f *podTemplateInformer) Lister() v1.PodTemplateLister { func (f *podTemplateInformer) Lister() v1.PodTemplateLister {

12
staging/src/k8s.io/client-go/informers/core/v1/replicationcontroller.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewReplicationControllerInformer(client kubernetes.Interface, namespace str
func NewFilteredReplicationControllerInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredReplicationControllerInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ReplicationControllers(namespace).List(options) return client.CoreV1().ReplicationControllers(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ReplicationControllers(namespace).Watch(options) return client.CoreV1().ReplicationControllers(namespace).Watch(options)
}, },
}, },
&core_v1.ReplicationController{}, &corev1.ReplicationController{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *replicationControllerInformer) defaultInformer(client kubernetes.Interf
} }
func (f *replicationControllerInformer) Informer() cache.SharedIndexInformer { func (f *replicationControllerInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.ReplicationController{}, f.defaultInformer) return f.factory.InformerFor(&corev1.ReplicationController{}, f.defaultInformer)
} }
func (f *replicationControllerInformer) Lister() v1.ReplicationControllerLister { func (f *replicationControllerInformer) Lister() v1.ReplicationControllerLister {

12
staging/src/k8s.io/client-go/informers/core/v1/resourcequota.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewResourceQuotaInformer(client kubernetes.Interface, namespace string, res
func NewFilteredResourceQuotaInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredResourceQuotaInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ResourceQuotas(namespace).List(options) return client.CoreV1().ResourceQuotas(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ResourceQuotas(namespace).Watch(options) return client.CoreV1().ResourceQuotas(namespace).Watch(options)
}, },
}, },
&core_v1.ResourceQuota{}, &corev1.ResourceQuota{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *resourceQuotaInformer) defaultInformer(client kubernetes.Interface, res
} }
func (f *resourceQuotaInformer) Informer() cache.SharedIndexInformer { func (f *resourceQuotaInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.ResourceQuota{}, f.defaultInformer) return f.factory.InformerFor(&corev1.ResourceQuota{}, f.defaultInformer)
} }
func (f *resourceQuotaInformer) Lister() v1.ResourceQuotaLister { func (f *resourceQuotaInformer) Lister() v1.ResourceQuotaLister {

12
staging/src/k8s.io/client-go/informers/core/v1/secret.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewSecretInformer(client kubernetes.Interface, namespace string, resyncPeri
func NewFilteredSecretInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredSecretInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Secrets(namespace).List(options) return client.CoreV1().Secrets(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Secrets(namespace).Watch(options) return client.CoreV1().Secrets(namespace).Watch(options)
}, },
}, },
&core_v1.Secret{}, &corev1.Secret{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *secretInformer) defaultInformer(client kubernetes.Interface, resyncPeri
} }
func (f *secretInformer) Informer() cache.SharedIndexInformer { func (f *secretInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.Secret{}, f.defaultInformer) return f.factory.InformerFor(&corev1.Secret{}, f.defaultInformer)
} }
func (f *secretInformer) Lister() v1.SecretLister { func (f *secretInformer) Lister() v1.SecretLister {

12
staging/src/k8s.io/client-go/informers/core/v1/service.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewServiceInformer(client kubernetes.Interface, namespace string, resyncPer
func NewFilteredServiceInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredServiceInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Services(namespace).List(options) return client.CoreV1().Services(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().Services(namespace).Watch(options) return client.CoreV1().Services(namespace).Watch(options)
}, },
}, },
&core_v1.Service{}, &corev1.Service{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *serviceInformer) defaultInformer(client kubernetes.Interface, resyncPer
} }
func (f *serviceInformer) Informer() cache.SharedIndexInformer { func (f *serviceInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.Service{}, f.defaultInformer) return f.factory.InformerFor(&corev1.Service{}, f.defaultInformer)
} }
func (f *serviceInformer) Lister() v1.ServiceLister { func (f *serviceInformer) Lister() v1.ServiceLister {

12
staging/src/k8s.io/client-go/informers/core/v1/serviceaccount.go
View File

@@ -21,8 +21,8 @@ package v1
import ( import (
time "time" time "time"
core_v1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces" internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -57,20 +57,20 @@ func NewServiceAccountInformer(client kubernetes.Interface, namespace string, re
func NewFilteredServiceAccountInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { func NewFilteredServiceAccountInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
return cache.NewSharedIndexInformer( return cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ServiceAccounts(namespace).List(options) return client.CoreV1().ServiceAccounts(namespace).List(options)
}, },
WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil { if tweakListOptions != nil {
tweakListOptions(&options) tweakListOptions(&options)
} }
return client.CoreV1().ServiceAccounts(namespace).Watch(options) return client.CoreV1().ServiceAccounts(namespace).Watch(options)
}, },
}, },
&core_v1.ServiceAccount{}, &corev1.ServiceAccount{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *serviceAccountInformer) defaultInformer(client kubernetes.Interface, re
} }
func (f *serviceAccountInformer) Informer() cache.SharedIndexInformer { func (f *serviceAccountInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&core_v1.ServiceAccount{}, f.defaultInformer) return f.factory.InformerFor(&corev1.ServiceAccount{}, f.defaultInformer)
} }
func (f *serviceAccountInformer) Lister() v1.ServiceAccountLister { func (f *serviceAccountInformer) Lister() v1.ServiceAccountLister {

6
staging/src/k8s.io/client-go/informers/events/v1beta1/event.go
View File

@@ -21,7 +21,7 @@ package v1beta1
import ( import (
time "time" time "time"
events_v1beta1 "k8s.io/api/events/v1beta1" eventsv1beta1 "k8s.io/api/events/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch" watch "k8s.io/apimachinery/pkg/watch"
@@ -70,7 +70,7 @@ func NewFilteredEventInformer(client kubernetes.Interface, namespace string, res
return client.EventsV1beta1().Events(namespace).Watch(options) return client.EventsV1beta1().Events(namespace).Watch(options)
}, },
}, },
&events_v1beta1.Event{}, &eventsv1beta1.Event{},
resyncPeriod, resyncPeriod,
indexers, indexers,
) )
@@ -81,7 +81,7 @@ func (f *eventInformer) defaultInformer(client kubernetes.Interface, resyncPerio
} }
func (f *eventInformer) Informer() cache.SharedIndexInformer { func (f *eventInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&events_v1beta1.Event{}, f.defaultInformer) return f.factory.InformerFor(&eventsv1beta1.Event{}, f.defaultInformer)
} }
func (f *eventInformer) Lister() v1beta1.EventLister { func (f *eventInformer) Lister() v1beta1.EventLister {

Some files were not shown because too many files have changed in this diff Show More