Merge pull request #34719 from errordeveloper/api-and-disco-ports

Automatic merge from submit-queue

Add flags for alternative API and discovery ports

**What this PR does / why we need it**:

We had many issues reported due to the fact that we are using port 443 by default, and we should allow users to override whatever defaults we pick. This doesn't touch on `localhost:8080` yet, which should just generally get rid of.

**Which issue this PR fixes**: fixes #34311 #34307 #33638

**Special notes for your reviewer**: cc @pires 

**Release note**:
```release-note
Add `kubeadm` flags `--api-port` and `--discovery-port`, change default API port to 6443
```
This commit is contained in:
Kubernetes Submit Queue
2016-10-17 05:54:38 -07:00
committed by GitHub
13 changed files with 159 additions and 108 deletions

View File

@@ -11,22 +11,26 @@ allow-privileged
allowed-not-ready-nodes
anonymous-auth
api-advertise-addresses
api-external-dns-names
api-burst
api-external-dns-names
api-port
api-prefix
api-rate
apiserver-count
api-server-port
api-servers
api-token
api-version
apiserver-count
apiserver-count
audit-log-maxage
audit-log-maxbackup
audit-log-maxsize
audit-log-path
auth-path
auth-path
auth-provider
auth-provider
auth-provider-arg
auth-provider-arg
authentication-token-webhook-cache-ttl
authentication-token-webhook-config-file
@@ -36,9 +40,6 @@ authorization-rbac-super-user
authorization-webhook-cache-authorized-ttl
authorization-webhook-cache-unauthorized-ttl
authorization-webhook-config-file
auth-path
auth-provider
auth-provider-arg
babysit-daemons
basic-auth-file
bench-pods
@@ -55,8 +56,8 @@ build-tag
cadvisor-port
cert-dir
certificate-authority
cgroup-root
cgroup-driver
cgroup-root
cgroups-per-qos
chaos-chance
clean-start
@@ -79,17 +80,17 @@ cluster-monitor-period
cluster-name
cluster-signing-cert-file
cluster-signing-key-file
cluster-tag
cni-bin-dir
cni-conf-dir
cluster-tag
concurrent-deployment-syncs
concurrent-endpoint-syncs
concurrent-gc-syncs
concurrent-namespace-syncs
concurrent-replicaset-syncs
concurrent-resource-quota-syncs
concurrent-serviceaccount-token-syncs
concurrent-service-syncs
concurrent-serviceaccount-token-syncs
config-sync-period
configure-cbr0
configure-cloud-routes
@@ -100,10 +101,10 @@ conntrack-tcp-timeout-established
consumer-port
consumer-service-name
consumer-service-namespace
contain-pod-resources
container-port
container-runtime
container-runtime-endpoint
contain-pod-resources
controller-start-interval
cors-allowed-origins
cpu-cfs-quota
@@ -129,17 +130,18 @@ deserialization-cache-size
dest-file
disable-filter
disable-kubenet
discovery-port
dns-bind-address
dns-port
dns-provider
dns-provider-config
dockercfg-path
docker-email
docker-endpoint
docker-exec-handler
docker-password
docker-server
docker-username
dockercfg-path
driver-port
drop-embedded-fields
dry-run
@@ -153,10 +155,10 @@ enable-debugging-handlers
enable-dynamic-provisioning
enable-garbage-collector
enable-garbage-collector
enable-garbage-collector
enable-hostpath-provisioner
enable-server
enable-swagger-ui
enable-garbage-collector
etcd-address
etcd-cafile
etcd-certfile
@@ -204,8 +206,8 @@ federated-api-qps
federated-kube-context
federation-name
file-check-frequency
file_content_in_loop
file-suffix
file_content_in_loop
flex-volume-plugin-dir
forward-services
framework-name
@@ -215,6 +217,7 @@ from-file
from-literal
func-dest
fuzz-iters
garbage-collector-enabled
gather-logs-sizes
gather-metrics-at-teardown
gather-resource-usage
@@ -234,10 +237,10 @@ healthz-bind-address
healthz-port
horizontal-pod-autoscaler-sync-period
host-ipc-sources
hostname-override
host-network-sources
host-pid-sources
host-port-endpoints
hostname-override
http-check-frequency
http-port
ignore-daemonsets
@@ -249,8 +252,8 @@ image-project
image-pull-policy
image-service-endpoint
include-extended-apis
included-types-overrides
include-extended-apis
included-types-overrides
input-base
input-dirs
insecure-allow-any-token
@@ -286,6 +289,10 @@ kops-zones
kube-api-burst
kube-api-content-type
kube-api-qps
kube-master
kube-master
kube-master-url
kube-reserved
kubecfg-file
kubectl-path
kubelet-address
@@ -307,10 +314,6 @@ kubelet-read-only-port
kubelet-root-dir
kubelet-sync-frequency
kubelet-timeout
kube-master
kube-master
kube-master-url
kube-reserved
kubernetes-service-node-port
label-columns
large-cluster-size-threshold
@@ -337,8 +340,6 @@ master-os-distro
master-service-namespace
max-concurrency
max-connection-bytes-per-sec
maximum-dead-containers
maximum-dead-containers-per-container
max-log-age
max-log-backups
max-log-size
@@ -347,6 +348,8 @@ max-outgoing-burst
max-outgoing-qps
max-pods
max-requests-inflight
maximum-dead-containers
maximum-dead-containers-per-container
mesos-authentication-principal
mesos-authentication-provider
mesos-authentication-secret-file
@@ -360,20 +363,22 @@ mesos-launch-grace-period
mesos-master
mesos-sandbox-overlay
mesos-user
min-pr-number
min-request-timeout
min-resync-period
minimum-container-ttl-duration
minimum-image-ttl-duration
minion-max-log-age
minion-max-log-backups
minion-max-log-size
minion-path-override
min-pr-number
min-request-timeout
min-resync-period
namespace-sync-period
network-plugin
network-plugin-dir
network-plugin-mtu
no-headers
no-headers
no-suggestions
no-suggestions
node-cidr-mask-size
node-eviction-rate
@@ -392,9 +397,7 @@ node-port
node-startup-grace-period
node-status-update-frequency
node-sync-period
no-headers
non-masquerade-cidr
no-suggestions
num-nodes
oidc-ca-file
oidc-client-id
@@ -403,6 +406,7 @@ oidc-issuer-url
oidc-username-claim
only-idl
oom-score-adj
out-version
outofdisk-transition-frequency
output-base
output-directory
@@ -410,7 +414,6 @@ output-file-base
output-package
output-print-type
output-version
out-version
path-override
pod-cidr
pod-eviction-timeout
@@ -433,7 +436,6 @@ proxy-logv
proxy-mode
proxy-port-range
public-address-override
pvclaimbinder-sync-period
pv-recycler-increment-timeout-nfs
pv-recycler-maximum-retry
pv-recycler-minimum-timeout-hostpath
@@ -441,6 +443,7 @@ pv-recycler-minimum-timeout-nfs
pv-recycler-pod-template-filepath-hostpath
pv-recycler-pod-template-filepath-nfs
pv-recycler-timeout-increment-hostpath
pvclaimbinder-sync-period
read-only-port
really-crash-for-testing
reconcile-cidr
@@ -459,8 +462,8 @@ replication-controller-lookup-cache-size
repo-root
report-dir
report-prefix
required-contexts
require-kubeconfig
required-contexts
resolv-conf
resource-container
resource-quota-sync-period
@@ -494,8 +497,8 @@ service-account-key-file
service-account-lookup
service-account-private-key-file
service-address
service-cluster-ip-range
service-cidr
service-cluster-ip-range
service-dns-domain
service-generator
service-node-port-range
@@ -545,9 +548,9 @@ test-timeout
tls-ca-file
tls-cert-file
tls-private-key-file
to-version
token-auth-file
ttl-keys-prefix
to-version
ttl-secs
type-src
udp-port
@@ -561,6 +564,7 @@ use-kubernetes-cluster-service
use-kubernetes-version
user-whitelist
verify-only
viper-config
volume-dir
volume-plugin-dir
volume-stats-agg-period