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

Fix merge problems from tenancy 

I tried a manual conflict resolve in github; it went _ok_
This commit is contained in:
Justin Santa Barbara 2017-03-27 21:33:10 -04:00
parent 113b94ca05
commit 9f3d7c3636
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/kops/v1alpha1/instancegroup.go
View File

@ -81,7 +81,7 @@ type InstanceGroupSpec struct {
// Currently only applies to AWS. // Currently only applies to AWS.
Tenancy string `json:"tenancy,omitempty"` Tenancy string `json:"tenancy,omitempty"`
// Kubelet overrides kubelet config from the ClusterSpec // Kubelet overrides kubelet config from the ClusterSpec
Kubelet *KubeletConfigSpec `json:"kubelet,omitempty"` Kubelet *KubeletConfigSpec `json:"kubelet,omitempty"`
// Taints indicates the kubernetes taints for nodes in this group // Taints indicates the kubernetes taints for nodes in this group

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

@ -1040,8 +1040,8 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
out.EtcdServersOverrides = in.EtcdServersOverrides out.EtcdServersOverrides = in.EtcdServersOverrides
out.AdmissionControl = in.AdmissionControl out.AdmissionControl = in.AdmissionControl
out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceClusterIPRange = in.ServiceClusterIPRange
out.ClientCAFile = in.ClientCAFile
out.BasicAuthFile = in.BasicAuthFile out.BasicAuthFile = in.BasicAuthFile
out.ClientCAFile = in.ClientCAFile
out.TLSCertFile = in.TLSCertFile out.TLSCertFile = in.TLSCertFile
out.TLSPrivateKeyFile = in.TLSPrivateKeyFile out.TLSPrivateKeyFile = in.TLSPrivateKeyFile
out.TokenAuthFile = in.TokenAuthFile out.TokenAuthFile = in.TokenAuthFile

4
pkg/apis/kops/v1alpha2/instancegroup.go
View File

@ -84,11 +84,11 @@ type InstanceGroupSpec struct {
// NodeLabels indicates the kubernetes labels for nodes in this group // NodeLabels indicates the kubernetes labels for nodes in this group
NodeLabels map[string]string `json:"nodeLabels,omitempty"` NodeLabels map[string]string `json:"nodeLabels,omitempty"`
// Describes the tenancy of the instance group. Can be either default or dedicated. // Describes the tenancy of the instance group. Can be either default or dedicated.
// Currently only applies to AWS. // Currently only applies to AWS.
Tenancy string `json:"tenancy,omitempty"` Tenancy string `json:"tenancy,omitempty"`
// Kubelet overrides kubelet config from the ClusterSpec // Kubelet overrides kubelet config from the ClusterSpec
Kubelet *KubeletConfigSpec `json:"kubelet,omitempty"` Kubelet *KubeletConfigSpec `json:"kubelet,omitempty"`
// Taints indicates the kubernetes taints for nodes in this group // Taints indicates the kubernetes taints for nodes in this group

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

@ -1138,8 +1138,8 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
out.EtcdServersOverrides = in.EtcdServersOverrides out.EtcdServersOverrides = in.EtcdServersOverrides
out.AdmissionControl = in.AdmissionControl out.AdmissionControl = in.AdmissionControl
out.ServiceClusterIPRange = in.ServiceClusterIPRange out.ServiceClusterIPRange = in.ServiceClusterIPRange
out.ClientCAFile = in.ClientCAFile
out.BasicAuthFile = in.BasicAuthFile out.BasicAuthFile = in.BasicAuthFile
out.ClientCAFile = in.ClientCAFile
out.TLSCertFile = in.TLSCertFile out.TLSCertFile = in.TLSCertFile
out.TLSPrivateKeyFile = in.TLSPrivateKeyFile out.TLSPrivateKeyFile = in.TLSPrivateKeyFile
out.TokenAuthFile = in.TokenAuthFile out.TokenAuthFile = in.TokenAuthFile