kubeadm: add --control-plane-endpoint flag

This commit is contained in:
SataQiu 2019-06-25 11:27:40 +08:00
parent 896c901684
commit 33b980272b
7 changed files with 13 additions and 1 deletions

View File

@ -99,7 +99,7 @@ func newCmdUserKubeConfig(out io.Writer) *cobra.Command {
// Add ClusterConfiguration backed flags to the command // Add ClusterConfiguration backed flags to the command
cmd.Flags().StringVar(&clusterCfg.CertificatesDir, options.CertificatesDir, clusterCfg.CertificatesDir, "The path where certificates are stored") cmd.Flags().StringVar(&clusterCfg.CertificatesDir, options.CertificatesDir, clusterCfg.CertificatesDir, "The path where certificates are stored")
// Add ClusterConfiguration backed flags to the command // Add InitConfiguration backed flags to the command
cmd.Flags().StringVar(&initCfg.LocalAPIEndpoint.AdvertiseAddress, options.APIServerAdvertiseAddress, initCfg.LocalAPIEndpoint.AdvertiseAddress, "The IP address the API server is accessible on") cmd.Flags().StringVar(&initCfg.LocalAPIEndpoint.AdvertiseAddress, options.APIServerAdvertiseAddress, initCfg.LocalAPIEndpoint.AdvertiseAddress, "The IP address the API server is accessible on")
cmd.Flags().Int32Var(&initCfg.LocalAPIEndpoint.BindPort, options.APIServerBindPort, initCfg.LocalAPIEndpoint.BindPort, "The port the API server is accessible on") cmd.Flags().Int32Var(&initCfg.LocalAPIEndpoint.BindPort, options.APIServerBindPort, initCfg.LocalAPIEndpoint.BindPort, "The port the API server is accessible on")

View File

@ -230,6 +230,11 @@ func AddClusterConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1beta2.Cluster
`Use alternative domain for services, e.g. "myorg.internal".`, `Use alternative domain for services, e.g. "myorg.internal".`,
) )
flagSet.StringVar(
&cfg.ControlPlaneEndpoint, options.ControlPlaneEndpoint, cfg.ControlPlaneEndpoint,
`Specify a stable IP address or DNS name for the control plane.`,
)
options.AddKubernetesVersionFlag(flagSet, &cfg.KubernetesVersion) options.AddKubernetesVersionFlag(flagSet, &cfg.KubernetesVersion)
flagSet.StringVar( flagSet.StringVar(

View File

@ -38,6 +38,9 @@ const (
// ControllerManagerExtraArgs flag sets extra flags to pass to the Controller Manager or override default ones in form of <flagname>=<value>. // ControllerManagerExtraArgs flag sets extra flags to pass to the Controller Manager or override default ones in form of <flagname>=<value>.
ControllerManagerExtraArgs = "controller-manager-extra-args" ControllerManagerExtraArgs = "controller-manager-extra-args"
// ControlPlaneEndpoint flag sets a stable IP address or DNS name for the control plane.
ControlPlaneEndpoint = "control-plane-endpoint"
// DryRun flag instruct kubeadm to don't apply any changes; just output what would be done. // DryRun flag instruct kubeadm to don't apply any changes; just output what would be done.
DryRun = "dry-run" DryRun = "dry-run"

View File

@ -111,6 +111,7 @@ func getAddonPhaseFlags(name string) []string {
if name == "all" || name == "kube-proxy" { if name == "all" || name == "kube-proxy" {
flags = append(flags, flags = append(flags,
options.APIServerAdvertiseAddress, options.APIServerAdvertiseAddress,
options.ControlPlaneEndpoint,
options.APIServerBindPort, options.APIServerBindPort,
options.NetworkingPodSubnet, options.NetworkingPodSubnet,
) )

View File

@ -140,6 +140,7 @@ func getCertPhaseFlags(name string) []string {
if name == "all" || name == "apiserver" { if name == "all" || name == "apiserver" {
flags = append(flags, flags = append(flags,
options.APIServerAdvertiseAddress, options.APIServerAdvertiseAddress,
options.ControlPlaneEndpoint,
options.APIServerCertSANs, options.APIServerCertSANs,
options.NetworkingDNSDomain, options.NetworkingDNSDomain,
options.NetworkingServiceSubnet, options.NetworkingServiceSubnet,

View File

@ -104,6 +104,7 @@ func getControlPlanePhaseFlags(name string) []string {
if name == "all" || name == kubeadmconstants.KubeAPIServer { if name == "all" || name == kubeadmconstants.KubeAPIServer {
flags = append(flags, flags = append(flags,
options.APIServerAdvertiseAddress, options.APIServerAdvertiseAddress,
options.ControlPlaneEndpoint,
options.APIServerBindPort, options.APIServerBindPort,
options.APIServerExtraArgs, options.APIServerExtraArgs,
options.FeatureGatesString, options.FeatureGatesString,

View File

@ -96,6 +96,7 @@ func NewKubeConfigFilePhase(kubeConfigFileName string) workflow.Phase {
func getKubeConfigPhaseFlags(name string) []string { func getKubeConfigPhaseFlags(name string) []string {
flags := []string{ flags := []string{
options.APIServerAdvertiseAddress, options.APIServerAdvertiseAddress,
options.ControlPlaneEndpoint,
options.APIServerBindPort, options.APIServerBindPort,
options.CertificatesDir, options.CertificatesDir,
options.CfgPath, options.CfgPath,