Merge pull request #41820 from kad/kv

Automatic merge from submit-queue (batch tested with PRs 41667, 41820, 40910, 41645, 41361)

Changing --use-kubernetes-version to --kubernetes-version for kubeadm beta

**What this PR does / why we need it**: to follow-up agreement on SIG-Cluster-Lifecycle on 2017-02-21, flag for `kubeadm init` should be renamed.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**: Meeting minutes for SIG-Cluster-Lifecycle 2017-02-21

**Release note**:
```release-note
Flag --use-kubernetes-version for kubeadm init renamed to --kubernetes-version
```

cmd/kubeadm/app/cmd/init.go

@@ -106,7 +106,7 @@ func NewCmdInit(out io.Writer) *cobra.Command {
 		`Use alternative domain for services, e.g. "myorg.internal"`,
 	)
 	cmd.PersistentFlags().StringVar(
-		&cfg.KubernetesVersion, "use-kubernetes-version", cfg.KubernetesVersion,
+		&cfg.KubernetesVersion, "kubernetes-version", cfg.KubernetesVersion,
 		`Choose a specific Kubernetes version for the control plane`,
 	)
 

cmd/kubeadm/test/cmd/init_test.go

@@ -63,7 +63,7 @@ func TestCmdInitKubernetesVersion(t *testing.T) {
 		args     string
 		expected bool
 	}{
-		{"--use-kubernetes-version=foobar", false},
+		{"--kubernetes-version=foobar", false},
 	}
 
 	for _, rt := range initTest {

hack/verify-flags/exceptions.txt

@@ -107,6 +107,9 @@ federation/deploy/config.json.sample:      "cluster_cidr": "10.188.0.0/14",
 federation/deploy/config.json.sample:      "cluster_name": "cluster1-kubernetes",
 federation/deploy/config.json.sample:      "cluster_name": "cluster2-kubernetes",
 federation/deploy/config.json.sample:      "cluster_name": "cluster3-kubernetes",
+federation/deploy/config.json.sample:      "kubernetes_version": "v1.4.0"
+federation/deploy/config.json.sample:      "kubernetes_version": "v1.4.0"
+federation/deploy/config.json.sample:      "kubernetes_version": "v1.4.0"
 federation/deploy/config.json.sample:      "num_nodes": 3,
 federation/deploy/config.json.sample:      "num_nodes": 3,
 federation/deploy/config.json.sample:      "num_nodes": 3,

hack/verify-flags/known-flags.txt

@@ -17,15 +17,16 @@ api-external-dns-names
 api-port
 api-prefix
 api-rate
-api-server-port
-api-servers
 api-server-advertise-address
+api-server-port
 api-server-service-type
+api-servers
 api-token
 api-version
 apiserver-arg-overrides
 apiserver-count
 apiserver-count
+attach-detach-reconcile-sync-period
 audit-log-maxage
 audit-log-maxbackup
 audit-log-maxsize
@@ -96,8 +97,8 @@ 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-map
 config-map-namespace
 config-sync-period
@@ -110,13 +111,13 @@ 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
 contention-profiling
-controllermanager-arg-overrides
 controller-start-interval
+controllermanager-arg-overrides
 core-kubeconfig
 cors-allowed-origins
 cpu-cfs-quota
@@ -139,6 +140,7 @@ deployment-controller-sync-period
 deployment-label-key
 deserialization-cache-size
 dest-file
+disable-attach-detach-reconcile-sync
 disable-filter
 disable-kubenet
 disable-log-dump
@@ -162,8 +164,6 @@ dump-logs-on-failure
 duration-sec
 e2e-output-dir
 e2e-verify-service-account
-etcd-metrics-scrape-uri
-etcd-version-scrape-uri
 enable-controller-attach-detach
 enable-cri
 enable-custom-metrics
@@ -181,14 +181,16 @@ etcd-cafile
 etcd-certfile
 etcd-config
 etcd-keyfile
+etcd-metrics-scrape-uri
 etcd-mutation-timeout
+etcd-persistent-storage
 etcd-prefix
 etcd-pv-capacity
-etcd-persistent-storage
 etcd-quorum-read
 etcd-server
 etcd-servers
 etcd-servers-overrides
+etcd-version-scrape-uri
 event-burst
 event-qps
 event-ttl
@@ -207,13 +209,15 @@ experimental-allowed-unsafe-sysctls
 experimental-bootstrap-kubeconfig
 experimental-bootstrap-token-auth
 experimental-keystone-url
+experimental-check-node-capabilities-before-mount
+experimental-cri
+experimental-fail-swap-on
+experimental-kernel-memcg-notification
 experimental-keystone-ca-file
+experimental-keystone-url
 experimental-mounter-path
 experimental-nvidia-gpus
 experimental-prefix
-experimental-cri
-experimental-check-node-capabilities-before-mount
-experimental-kernel-memcg-notification
 external-etcd-cafile
 external-etcd-certfile
 external-etcd-endpoints
@@ -222,7 +226,6 @@ external-hostname
 external-ip
 external-name
 extra-peer-dirs
-experimental-fail-swap-on
 failover-timeout
 failure-domains
 fake-clientset
@@ -245,6 +248,7 @@ from-literal
 func-dest
 fuzz-iters
 garbage-collector-enabled
+garbage-collector-enabled
 gather-logs-sizes
 gather-metrics-at-teardown
 gather-resource-usage
@@ -333,8 +337,8 @@ kube-master
 kube-master
 kube-master-url
 kube-reserved
-kubeadm-path
 kubeadm-cmd-skip
+kubeadm-path
 kubecfg-file
 kubectl-path
 kubelet-address
@@ -363,6 +367,7 @@ kubernetes-anywhere-path
 kubernetes-anywhere-phase2-provider
 kubernetes-anywhere-up-timeout
 kubernetes-service-node-port
+kubernetes-version
 label-columns
 large-cluster-size-threshold
 last-release-pr
@@ -378,6 +383,7 @@ listers-package
 load-balancer-ip
 lock-file
 log-flush-frequency
+log-lines-total
 long-running-request-regexp
 low-diskspace-threshold-mb
 make-iptables-util-chains
@@ -540,6 +546,7 @@ rkt-stage1-image
 root-ca-file
 root-dir
 route-reconciliation-period
+run-duration
 run-kubelet-mode
 run-proxy
 run-services-mode
@@ -589,8 +596,8 @@ skip-unsafe
 sort-by
 source-file
 ssh-env
-ssh-keyfile
 ssh-key
+ssh-keyfile
 ssh-options
 ssh-user
 start-services
@@ -617,8 +624,8 @@ test-timeout
 tls-ca-file
 tls-cert-file
 tls-private-key-file
-to-version
 tls-sni-cert-key
+to-version
 token-auth-file
 ttl-keys-prefix
 ttl-secs
@@ -630,14 +637,14 @@ unix-socket
 update-period
 upgrade-image
 upgrade-target
-use-service-account-credentials
 use-kubernetes-cluster-service
-use-kubernetes-version
+use-service-account-credentials
 user-whitelist
 verb
 verify-only
 versioned-clientset-package
 viper-config
+viper-config
 volume-dir
 volume-plugin-dir
 volume-stats-agg-period
@@ -649,9 +656,3 @@ windows-line-endings
 www-prefix
 zone-id
 zone-name
-garbage-collector-enabled
-viper-config
-log-lines-total
-run-duration
-attach-detach-reconcile-sync-period
-disable-attach-detach-reconcile-sync