kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

api machinery

This commit is contained in:
Rodrigo Menezes 2018-07-18 16:09:40 -07:00
parent e8476499b0
commit 218d90632c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View File

@ -2642,7 +2642,11 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha1_KubeletConfigSpec(in *kops.K
out.ExperimentalAllowedUnsafeSysctls = in.ExperimentalAllowedUnsafeSysctls
out.StreamingConnectionIdleTimeout = in.StreamingConnectionIdleTimeout
out.DockerDisableSharedPID = in.DockerDisableSharedPID
<<<<<<< HEAD
out.RootDir = in.RootDir
=======
out.BindPrimaryIP = in.BindPrimaryIP
>>>>>>> api machinery
return nil
}

4
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

@ -2906,7 +2906,11 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha2_KubeletConfigSpec(in *kops.K
out.ExperimentalAllowedUnsafeSysctls = in.ExperimentalAllowedUnsafeSysctls
out.StreamingConnectionIdleTimeout = in.StreamingConnectionIdleTimeout
out.DockerDisableSharedPID = in.DockerDisableSharedPID
<<<<<<< HEAD
out.RootDir = in.RootDir
=======
out.BindPrimaryIP = in.BindPrimaryIP
>>>>>>> api machinery
return nil
}