Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add flag for API endpoint alternative names #1606

Merged
merged 6 commits into from
Nov 1, 2021
Merged

Add flag for API endpoint alternative names #1606

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55a7a8d
Add flag for API alternative names
ahmedwaleedmalik Nov 1, 2021
90b2189
Fix indentation
ahmedwaleedmalik Nov 1, 2021
2f1f324
Use stringSlice for alternativeNames flag
ahmedwaleedmalik Nov 1, 2021
132b27d
Fix unwrapping for example manifest
ahmedwaleedmalik Nov 1, 2021
a8ba4f8
Comment out apiEndpoint.alternativeNames from example manifest
ahmedwaleedmalik Nov 1, 2021
6547a4f
Refactored code; fix indentation issue in config.go
ahmedwaleedmalik Nov 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions pkg/cmd/config.go
View file
Open in desktop
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