Skip to content

K
k3s
Commit 708d30a8 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #44444 from fabriziopandini/kubeadm-certs-1

Automatic merge from submit-queue Add --apiserver-advertise-address option to kubeadm alpha phase certs… **What this PR does / why we need it**: `kubeadm alpha phase certs` command currently does not support `--apiserver-advertise-address` options, and certificates by default are linked to the bind address of the machine where the kubeadm command is run. This behaviour is not adequate f.i. for use cases where you are using `kubeadm alpha phase certs` for an HA deployments or for use cases where you generate certificates on a machine different that the master. The PR adds support for `--apiserver-advertise-address` to `kubeadm alpha phase certs`, with the following behaviour: - if `--apiserver-advertise-address` is specified and valid, certificates are linked to the given IP - if `--apiserver-advertise-address` is specified but not valid, the given ip is not valid an error is given **Special notes for your reviewer**: Implementation follow the track already in place for other flags (with validation, but no tests).
parents 1c315c64 068ce4e3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
cmd/kubeadm/app/cmd/phases/certs.go
View file @ 708d30a8
...@@ -68,6 +68,8 @@ func NewCmdSelfSign() *cobra.Command { ...@@ -68,6 +68,8 @@ func NewCmdSelfSign() *cobra.Command {
cmd.Flags().StringVar(&cfg.CertificatesDir, "cert-dir", cfg.CertificatesDir, "The path where to save and store the certificates") cmd.Flags().StringVar(&cfg.CertificatesDir, "cert-dir", cfg.CertificatesDir, "The path where to save and store the certificates")
cmd.Flags().StringVar(&cfg.Networking.ServiceSubnet, "service-cidr", cfg.Networking.ServiceSubnet, "The subnet for the Services in the cluster.") cmd.Flags().StringVar(&cfg.Networking.ServiceSubnet, "service-cidr", cfg.Networking.ServiceSubnet, "The subnet for the Services in the cluster.")
cmd.Flags().StringSliceVar(&cfg.APIServerCertSANs, "cert-altnames", []string{}, "Optional extra altnames to use for the API Server serving cert. Can be both IP addresses and dns names.") cmd.Flags().StringSliceVar(&cfg.APIServerCertSANs, "cert-altnames", []string{}, "Optional extra altnames to use for the API Server serving cert. Can be both IP addresses and dns names.")
cmd.Flags().StringVar(&cfg.API.AdvertiseAddress, "apiserver-advertise-address", cfg.API.AdvertiseAddress, "The IP address the API Server will advertise it's listening on. 0.0.0.0 means the default network interface's address.")
return cmd return cmd
} }
...@@ -95,5 +97,7 @@ func validateArgs(config *kubeadmapi.MasterConfiguration) error { ...@@ -95,5 +97,7 @@ func validateArgs(config *kubeadmapi.MasterConfiguration) error {
allErrs = append(allErrs, validation.ValidateNetworking(&config.Networking, field.NewPath("networking"))...) allErrs = append(allErrs, validation.ValidateNetworking(&config.Networking, field.NewPath("networking"))...)
allErrs = append(allErrs, validation.ValidateAbsolutePath(config.CertificatesDir, field.NewPath("cert-dir"))...) allErrs = append(allErrs, validation.ValidateAbsolutePath(config.CertificatesDir, field.NewPath("cert-dir"))...)
allErrs = append(allErrs, validation.ValidateAPIServerCertSANs(config.APIServerCertSANs, field.NewPath("cert-altnames"))...) allErrs = append(allErrs, validation.ValidateAPIServerCertSANs(config.APIServerCertSANs, field.NewPath("cert-altnames"))...)
allErrs = append(allErrs, validation.ValidateIPFromString(config.API.AdvertiseAddress, field.NewPath("apiserver-advertise-address"))...)
return allErrs.ToAggregate() return allErrs.ToAggregate()
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment