Skip to content

Commit

Permalink
Add flag for API endpoint alternative names (#1606)
Browse files Browse the repository at this point in the history
* Add flag for API alternative names

* Fix indentation

* Use stringSlice for alternativeNames flag

* Fix unwrapping for example manifest

* Comment out apiEndpoint.alternativeNames from example manifest

* Refactored code; fix indentation issue in config.go
  • Loading branch information
ahmedwaleedmalik authored Nov 1, 2021
1 parent 34cd509 commit c1aa39c
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions pkg/cmd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ type printOpts struct {

ControlPlaneHosts string `longflag:"control-plane-hosts"`

APIEndpointHost string `longflag:"api-endpoint-host"`
APIEndpointPort int `longflag:"api-endpoint-port"`
APIEndpointHost string `longflag:"api-endpoint-host"`
APIEndpointPort int `longflag:"api-endpoint-port"`
APIEndpointAlternativeNames []string `longflag:"api-endpoint-alternative-names"`

PodSubnet string `longflag:"pod-subnet"`
ServiceSubnet string `longflag:"service-subnet"`
Expand Down Expand Up @@ -148,6 +149,7 @@ func configPrintCmd() *cobra.Command {
// API endpoint
cmd.Flags().StringVar(&opts.APIEndpointHost, longFlagName(opts, "APIEndpointHost"), "", "API endpoint hostname or address")
cmd.Flags().IntVar(&opts.APIEndpointPort, longFlagName(opts, "APIEndpointPort"), 6443, "API endpoint port")
cmd.Flags().StringSliceVar(&opts.APIEndpointAlternativeNames, longFlagName(opts, "APIEndpointAlternativeNames"), []string{}, "Comma separated list of API endpoint alternative names, example: host.com,192.16.0.100")

// Cluster networking
cmd.Flags().StringVar(&opts.PodSubnet, longFlagName(opts, "PodSubnet"), "", "Subnet to be used for pods networking")
Expand Down Expand Up @@ -331,6 +333,10 @@ func createAndPrintManifest(printOptions *printOpts) error {
cfg.Set(yamled.Path{"apiEndpoint", "port"}, printOptions.APIEndpointPort)
}

if len(printOptions.APIEndpointAlternativeNames) > 0 {
cfg.Set(yamled.Path{"apiEndpoint", "alternativeNames"}, printOptions.APIEndpointAlternativeNames)
}

// Cluster networking
if len(printOptions.PodSubnet) != 0 {
cfg.Set(yamled.Path{"clusterNetwork", "podSubnet"}, printOptions.PodSubnet)
Expand Down Expand Up @@ -874,6 +880,7 @@ addons:
# apiEndpoint:
# host: '{{ .APIEndpointHost }}'
# port: {{ .APIEndpointPort }}
# alternativeNames: {{ .APIEndpointAlternativeNames }}
# If the cluster runs on bare metal or an unsupported cloud provider,
# you can disable the machine-controller deployment entirely. In this
Expand Down

0 comments on commit c1aa39c

Please sign in to comment.