From 26392c0acd925f1b4b65ae57a35bdad606aa29a8 Mon Sep 17 00:00:00 2001 From: Ramya Shenoy Date: Mon, 11 Feb 2019 15:12:05 -0800 Subject: [PATCH] Move all constants to a single `const (` [#1400] --- cmd/kubeadm/app/cmd/options/constant.go | 138 ++++++++++++------------ 1 file changed, 70 insertions(+), 68 deletions(-) diff --git a/cmd/kubeadm/app/cmd/options/constant.go b/cmd/kubeadm/app/cmd/options/constant.go index dd47f66f17..9d5099aa3f 100644 --- a/cmd/kubeadm/app/cmd/options/constant.go +++ b/cmd/kubeadm/app/cmd/options/constant.go @@ -16,104 +16,106 @@ limitations under the License. package options -// APIServerAdvertiseAddress flag sets the IP address the API Server will advertise it's listening on. Specify '0.0.0.0' to use the address of the default network interface. -const APIServerAdvertiseAddress = "apiserver-advertise-address" +const ( + // APIServerAdvertiseAddress flag sets the IP address the API Server will advertise it's listening on. Specify '0.0.0.0' to use the address of the default network interface. + APIServerAdvertiseAddress = "apiserver-advertise-address" -// APIServerBindPort flag sets the port for the API Server to bind to. -const APIServerBindPort = "apiserver-bind-port" + // APIServerBindPort flag sets the port for the API Server to bind to. + APIServerBindPort = "apiserver-bind-port" -// APIServerCertSANs flag sets extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names. -const APIServerCertSANs = "apiserver-cert-extra-sans" + // APIServerCertSANs flag sets extra Subject Alternative Names (SANs) to use for the API Server serving certificate. Can be both IP addresses and DNS names. + APIServerCertSANs = "apiserver-cert-extra-sans" -// APIServerExtraArgs flag sets a extra flags to pass to the API Server or override default ones in form of =. -const APIServerExtraArgs = "apiserver-extra-args" + // APIServerExtraArgs flag sets a extra flags to pass to the API Server or override default ones in form of =. + APIServerExtraArgs = "apiserver-extra-args" -// CertificatesDir flag sets the path where to save and read the certificates. -const CertificatesDir = "cert-dir" + // CertificatesDir flag sets the path where to save and read the certificates. + CertificatesDir = "cert-dir" -// CfgPath flag sets the path to kubeadm config file. -const CfgPath = "config" + // CfgPath flag sets the path to kubeadm config file. + CfgPath = "config" -// ControllerManagerExtraArgs flag sets extra flags to pass to the Controller Manager or override default ones in form of =. -const ControllerManagerExtraArgs = "controller-manager-extra-args" + // ControllerManagerExtraArgs flag sets extra flags to pass to the Controller Manager or override default ones in form of =. + ControllerManagerExtraArgs = "controller-manager-extra-args" -// DryRun flag instruct kubeadm to don't apply any changes; just output what would be done. -const DryRun = "dry-run" + // DryRun flag instruct kubeadm to don't apply any changes; just output what would be done. + DryRun = "dry-run" -// FeatureGatesString flag sets key=value pairs that describe feature gates for various features. -const FeatureGatesString = "feature-gates" + // FeatureGatesString flag sets key=value pairs that describe feature gates for various features. + FeatureGatesString = "feature-gates" -// IgnorePreflightErrors sets the path a list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks. -const IgnorePreflightErrors = "ignore-preflight-errors" + // IgnorePreflightErrors sets the path a list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks. + IgnorePreflightErrors = "ignore-preflight-errors" -// ImageRepository sets the container registry to pull control plane images from. -const ImageRepository = "image-repository" + // ImageRepository sets the container registry to pull control plane images from. + ImageRepository = "image-repository" -// KubeconfigDir flag sets the path where to save the kubeconfig file. -const KubeconfigDir = "kubeconfig-dir" + // KubeconfigDir flag sets the path where to save the kubeconfig file. + KubeconfigDir = "kubeconfig-dir" -// KubeconfigPath flag sets the kubeconfig file to use when talking to the cluster. If the flag is not set, a set of standard locations are searched for an existing KubeConfig file. -const KubeconfigPath = "kubeconfig" + // KubeconfigPath flag sets the kubeconfig file to use when talking to the cluster. If the flag is not set, a set of standard locations are searched for an existing KubeConfig file. + KubeconfigPath = "kubeconfig" -// KubernetesVersion flag sets the Kubernetes version for the control plane. -const KubernetesVersion = "kubernetes-version" + // KubernetesVersion flag sets the Kubernetes version for the control plane. + KubernetesVersion = "kubernetes-version" -// NetworkingDNSDomain flag sets the domain for services, e.g. "myorg.internal". -const NetworkingDNSDomain = "service-dns-domain" + // NetworkingDNSDomain flag sets the domain for services, e.g. "myorg.internal". + NetworkingDNSDomain = "service-dns-domain" -// NetworkingServiceSubnet flag sets the range of IP address for service VIPs. -const NetworkingServiceSubnet = "service-cidr" + // NetworkingServiceSubnet flag sets the range of IP address for service VIPs. + NetworkingServiceSubnet = "service-cidr" -// NetworkingPodSubnet flag sets the range of IP addresses for the pod network. If set, the control plane will automatically allocate CIDRs for every node. -const NetworkingPodSubnet = "pod-network-cidr" + // NetworkingPodSubnet flag sets the range of IP addresses for the pod network. If set, the control plane will automatically allocate CIDRs for every node. + NetworkingPodSubnet = "pod-network-cidr" -// NodeCRISocket flag sets the CRI socket to connect to. -const NodeCRISocket = "cri-socket" + // NodeCRISocket flag sets the CRI socket to connect to. + NodeCRISocket = "cri-socket" -// NodeName flag sets the node name. -const NodeName = "node-name" + // NodeName flag sets the node name. + NodeName = "node-name" -// SchedulerExtraArgs flag sets extra flags to pass to the Scheduler or override default ones in form of =". -const SchedulerExtraArgs = "scheduler-extra-args" + // SchedulerExtraArgs flag sets extra flags to pass to the Scheduler or override default ones in form of =". + SchedulerExtraArgs = "scheduler-extra-args" -// SkipTokenPrint flag instruct kubeadm to skip printing of the default bootstrap token generated by 'kubeadm init'. -const SkipTokenPrint = "skip-token-print" + // SkipTokenPrint flag instruct kubeadm to skip printing of the default bootstrap token generated by 'kubeadm init'. + SkipTokenPrint = "skip-token-print" -// CSROnly flag instructs kubeadm to create CSRs instead of automatically creating or renewing certs -const CSROnly = "csr-only" + // CSROnly flag instructs kubeadm to create CSRs instead of automatically creating or renewing certs + CSROnly = "csr-only" -// CSRDir flag sets the location for CSRs and flags to be output -const CSRDir = "csr-dir" + // CSRDir flag sets the location for CSRs and flags to be output + CSRDir = "csr-dir" -// TokenStr flags sets both the discovery-token and the tls-bootstrap-token when those values are not provided -const TokenStr = "token" + // TokenStr flags sets both the discovery-token and the tls-bootstrap-token when those values are not provided + TokenStr = "token" -// TokenTTL flag sets the time to live for token -const TokenTTL = "token-ttl" + // TokenTTL flag sets the time to live for token + TokenTTL = "token-ttl" -// TokenUsages flag sets the usages of the token -const TokenUsages = "usages" + // TokenUsages flag sets the usages of the token + TokenUsages = "usages" -// TokenGroups flag sets the authentication groups of the token -const TokenGroups = "groups" + // TokenGroups flag sets the authentication groups of the token + TokenGroups = "groups" -// TokenDescription flag sets the description of the token -const TokenDescription = "description" + // TokenDescription flag sets the description of the token + TokenDescription = "description" -// TLSBootstrapToken flag sets the token used to temporarily authenticate with the Kubernetes Master to submit a certificate signing request (CSR) for a locally created key pair -const TLSBootstrapToken = "tls-bootstrap-token" + // TLSBootstrapToken flag sets the token used to temporarily authenticate with the Kubernetes Master to submit a certificate signing request (CSR) for a locally created key pair + TLSBootstrapToken = "tls-bootstrap-token" -// TokenDiscovery flag sets the token used to validate cluster information fetched from the API server (for token-based discovery) -const TokenDiscovery = "discovery-token" + // TokenDiscovery flag sets the token used to validate cluster information fetched from the API server (for token-based discovery) + TokenDiscovery = "discovery-token" -// TokenDiscoveryCAHash flag instruct kubeadm to validate that the root CA public key matches this hash (for token-based discovery) -const TokenDiscoveryCAHash = "discovery-token-ca-cert-hash" + // TokenDiscoveryCAHash flag instruct kubeadm to validate that the root CA public key matches this hash (for token-based discovery) + TokenDiscoveryCAHash = "discovery-token-ca-cert-hash" -// TokenDiscoverySkipCAHash flag instruct kubeadm to skip CA hash verification (for token-based discovery) -const TokenDiscoverySkipCAHash = "discovery-token-unsafe-skip-ca-verification" + // TokenDiscoverySkipCAHash flag instruct kubeadm to skip CA hash verification (for token-based discovery) + TokenDiscoverySkipCAHash = "discovery-token-unsafe-skip-ca-verification" -// FileDiscovery flag sets the file or URL from which to load cluster information (for file-based discovery) -const FileDiscovery = "discovery-file" + // FileDiscovery flag sets the file or URL from which to load cluster information (for file-based discovery) + FileDiscovery = "discovery-file" -// ControlPlane flag instruct kubeadm to create a new control plane instance on this node -const ControlPlane = "experimental-control-plane" + // ControlPlane flag instruct kubeadm to create a new control plane instance on this node + ControlPlane = "experimental-control-plane" +)