Skip to content

Commit

Permalink
update some stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
luxas authored and rosti committed Aug 22, 2018
1 parent 5224551 commit 0fde05a
Show file tree
Hide file tree
Showing 8 changed files with 320 additions and 263 deletions.
28 changes: 0 additions & 28 deletions cmd/kubeadm/app/apis/kubeadm/v1alpha2/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,31 +132,3 @@ func Convert_kubeadm_InitConfiguration_To_v1alpha2_InitConfiguration(in *kubeadm

return nil
}
/*
if err := Convert_v1alpha2_API_To_kubeadm_API(&in.API, &out.ClusterConfiguration.API, s); err != nil {
return err
}
if err := Convert_v1alpha2_Etcd_To_kubeadm_Etcd(&in.Etcd, &out.ClusterConfiguration.Etcd, s); err != nil {
return err
}
if err := Convert_v1alpha2_Networking_To_kubeadm_Networking(&in.Networking, &out.ClusterConfiguration.Networking, s); err != nil {
return err
}
out.ClusterConfiguration.KubernetesVersion = in.KubernetesVersion
out.ClusterConfiguration.APIServerExtraArgs = in.APIServerExtraArgs
out.ClusterConfiguration.ControllerManagerExtraArgs = in.ControllerManagerExtraArgs
out.ClusterConfiguration.SchedulerExtraArgs = in.SchedulerExtraArgs
out.ClusterConfiguration.APIServerExtraVolumes = in.APIServerExtraVolumes
out.ClusterConfiguration.ControllerManagerExtraVolumes = in.ControllerManagerExtraVolumes
out.ClusterConfiguration.SchedulerExtraVolumes = in.SchedulerExtraVolumes
out.ClusterConfiguration.APIServerCertSANs = in.APIServerCertSANs
out.ClusterConfiguration.CertificatesDir = in.CertificatesDir
out.ClusterConfiguration.ImageRepository = in.ImageRepository
out.ClusterConfiguration.UnifiedControlPlaneImage = in.UnifiedControlPlaneImage
if err := Convert_v1alpha2_AuditPolicyConfiguration_To_kubeadm_AuditPolicyConfiguration(&in.AuditPolicyConfiguration, &out.ClusterConfiguration.AuditPolicyConfiguration, s); err != nil {
return err
}
out.ClusterConfiguration.FeatureGates = in.FeatureGates
out.ClusterConfiguration.ClusterName = in.ClusterName
*/
70 changes: 18 additions & 52 deletions cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

142 changes: 88 additions & 54 deletions cmd/kubeadm/app/apis/kubeadm/v1alpha3/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0fde05a

Please sign in to comment.