Changing --use-kubernetes-version to --kubernetes-version as it was

agreed on SIG-Cluster-Lifecycle meeting.
This commit is contained in:
Alexander Kanevskiy 2017-02-21 20:09:53 +02:00
parent 17375fc59f
commit 1bd8bf6c5b
4 changed files with 29 additions and 25 deletions

View File

@ -106,7 +106,7 @@ func NewCmdInit(out io.Writer) *cobra.Command {
`Use alternative domain for services, e.g. "myorg.internal"`, `Use alternative domain for services, e.g. "myorg.internal"`,
) )
cmd.PersistentFlags().StringVar( 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`, `Choose a specific Kubernetes version for the control plane`,
) )

View File

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

View File

@ -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": "cluster1-kubernetes",
federation/deploy/config.json.sample: "cluster_name": "cluster2-kubernetes", federation/deploy/config.json.sample: "cluster_name": "cluster2-kubernetes",
federation/deploy/config.json.sample: "cluster_name": "cluster3-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, federation/deploy/config.json.sample: "num_nodes": 3,
federation/deploy/config.json.sample: "num_nodes": 3, federation/deploy/config.json.sample: "num_nodes": 3,

View File

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