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

Merge pull request #4911 from chrislovecnm/fixing-apimachinery 

Updating API Machinery
This commit is contained in:
k8s-ci-robot 2018-04-04 11:07:08 -07:00 committed by GitHub
parent 1eee3c35a1 d40b121b0b
commit aeacb88c47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2125,6 +2125,7 @@ func autoConvert_v1alpha1_KubeProxyConfig_To_kops_KubeProxyConfig(in *KubeProxyC
out.HostnameOverride = in.HostnameOverride out.HostnameOverride = in.HostnameOverride
out.Master = in.Master out.Master = in.Master
out.Enabled = in.Enabled out.Enabled = in.Enabled
out.ProxyMode = in.ProxyMode
out.FeatureGates = in.FeatureGates out.FeatureGates = in.FeatureGates
return nil return nil
} }
@ -2145,6 +2146,7 @@ func autoConvert_kops_KubeProxyConfig_To_v1alpha1_KubeProxyConfig(in *kops.KubeP
out.HostnameOverride = in.HostnameOverride out.HostnameOverride = in.HostnameOverride
out.Master = in.Master out.Master = in.Master
out.Enabled = in.Enabled out.Enabled = in.Enabled
out.ProxyMode = in.ProxyMode
out.FeatureGates = in.FeatureGates out.FeatureGates = in.FeatureGates
return nil return nil
} }

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

@ -2389,6 +2389,7 @@ func autoConvert_v1alpha2_KubeProxyConfig_To_kops_KubeProxyConfig(in *KubeProxyC
out.HostnameOverride = in.HostnameOverride out.HostnameOverride = in.HostnameOverride
out.Master = in.Master out.Master = in.Master
out.Enabled = in.Enabled out.Enabled = in.Enabled
out.ProxyMode = in.ProxyMode
out.FeatureGates = in.FeatureGates out.FeatureGates = in.FeatureGates
return nil return nil
} }
@ -2409,6 +2410,7 @@ func autoConvert_kops_KubeProxyConfig_To_v1alpha2_KubeProxyConfig(in *kops.KubeP
out.HostnameOverride = in.HostnameOverride out.HostnameOverride = in.HostnameOverride
out.Master = in.Master out.Master = in.Master
out.Enabled = in.Enabled out.Enabled = in.Enabled
out.ProxyMode = in.ProxyMode
out.FeatureGates = in.FeatureGates out.FeatureGates = in.FeatureGates
return nil return nil
} }