Skip to content

Commit 5eb24bf

Browse files
committed
completion: remove options related to deprecated cluster-store
This removes completion for flags related to legacy overlay networks using an external k/v store. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 1fafae3 commit 5eb24bf

2 files changed

Lines changed: 0 additions & 41 deletions

File tree

contrib/completion/bash/docker

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2523,9 +2523,6 @@ _docker_daemon() {
25232523
--bip
25242524
--bridge -b
25252525
--cgroup-parent
2526-
--cluster-advertise
2527-
--cluster-store
2528-
--cluster-store-opt
25292526
--config-file
25302527
--containerd
25312528
--containerd-namespace
@@ -2574,15 +2571,6 @@ _docker_daemon() {
25742571

25752572
__docker_complete_log_driver_options && return
25762573

2577-
key=$(__docker_map_key_of_current_option '--cluster-store-opt')
2578-
case "$key" in
2579-
kv.*file)
2580-
cur=${cur##*=}
2581-
_filedir
2582-
return
2583-
;;
2584-
esac
2585-
25862574
local key=$(__docker_map_key_of_current_option '--storage-opt')
25872575
case "$key" in
25882576
dm.blkdiscard|dm.override_udev_sync_check|dm.use_deferred_removal|dm.use_deferred_deletion)
@@ -2609,16 +2597,6 @@ _docker_daemon() {
26092597
__docker_complete_plugins_bundled --type Authorization
26102598
return
26112599
;;
2612-
--cluster-store)
2613-
COMPREPLY=( $( compgen -W "consul etcd zk" -S "://" -- "$cur" ) )
2614-
__docker_nospace
2615-
return
2616-
;;
2617-
--cluster-store-opt)
2618-
COMPREPLY=( $( compgen -W "discovery.heartbeat discovery.ttl kv.cacertfile kv.certfile kv.keyfile kv.path" -S = -- "$cur" ) )
2619-
__docker_nospace
2620-
return
2621-
;;
26222600
--config-file|--containerd|--init-path|--pidfile|-p|--tlscacert|--tlscert|--tlskey|--userland-proxy-path)
26232601
_filedir
26242602
return

contrib/completion/zsh/_docker

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2731,9 +2731,6 @@ __docker_subcommand() {
27312731
"($help -b --bridge)"{-b=,--bridge=}"[Attach containers to a network bridge]:bridge:_net_interfaces" \
27322732
"($help)--bip=[Network bridge IP]:IP address: " \
27332733
"($help)--cgroup-parent=[Parent cgroup for all containers]:cgroup: " \
2734-
"($help)--cluster-advertise=[Address or interface name to advertise]:Instance to advertise (host\:port): " \
2735-
"($help)--cluster-store=[URL of the distributed storage backend]:Cluster Store:->cluster-store" \
2736-
"($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
27372734
"($help)--config-file=[Path to daemon configuration file]:Config File:_files" \
27382735
"($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \
27392736
"($help)--containerd-namespace=[Containerd namespace to use]:containerd namespace:" \
@@ -2792,22 +2789,6 @@ __docker_subcommand() {
27922789
"($help)--validate[Validate daemon configuration and exit]" && ret=0
27932790

27942791
case $state in
2795-
(cluster-store)
2796-
if compset -P '*://'; then
2797-
_message 'host:port' && ret=0
2798-
else
2799-
store=('consul' 'etcd' 'zk')
2800-
_describe -t cluster-store "Cluster Store" store -qS "://" && ret=0
2801-
fi
2802-
;;
2803-
(cluster-store-options)
2804-
if compset -P '*='; then
2805-
_files && ret=0
2806-
else
2807-
opts=('discovery.heartbeat' 'discovery.ttl' 'kv.cacertfile' 'kv.certfile' 'kv.keyfile' 'kv.path')
2808-
_describe -t cluster-store-opts "Cluster Store Options" opts -qS "=" && ret=0
2809-
fi
2810-
;;
28112792
(users-groups)
28122793
if compset -P '*:'; then
28132794
_groups && ret=0

0 commit comments

Comments
 (0)