Skip to content

Commit

Permalink
Merge pull request #14559 from smarterclayton/migrate_etcd
Browse files Browse the repository at this point in the history
Add `oadm migrate etcd-ttl` which encodes upstream TTL migration
  • Loading branch information
smarterclayton committed Jun 15, 2017
2 parents 66adcf8 + bfec1fc commit d89fcd6
Show file tree
Hide file tree
Showing 15 changed files with 661 additions and 0 deletions.
58 changes: 58 additions & 0 deletions contrib/completions/bash/oadm
Original file line number Diff line number Diff line change
Expand Up @@ -2747,6 +2747,63 @@ _oadm_migrate_authorization()
noun_aliases=()
}

_oadm_migrate_etcd-ttl()
{
last_command="oadm_migrate_etcd-ttl"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--cacert=")
local_nonpersistent_flags+=("--cacert=")
flags+=("--cert=")
local_nonpersistent_flags+=("--cert=")
flags+=("--etcd-address=")
local_nonpersistent_flags+=("--etcd-address=")
flags+=("--key=")
local_nonpersistent_flags+=("--key=")
flags+=("--lease-duration=")
local_nonpersistent_flags+=("--lease-duration=")
flags+=("--ttl-keys-prefix=")
local_nonpersistent_flags+=("--ttl-keys-prefix=")
flags+=("--as=")
flags+=("--azure-container-registry-config=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
flags+=("--context=")
flags+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--loglevel=")
flags+=("--logspec=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_oadm_migrate_image-references()
{
last_command="oadm_migrate_image-references"
Expand Down Expand Up @@ -2890,6 +2947,7 @@ _oadm_migrate()
last_command="oadm_migrate"
commands=()
commands+=("authorization")
commands+=("etcd-ttl")
commands+=("image-references")
commands+=("storage")

Expand Down
56 changes: 56 additions & 0 deletions contrib/completions/bash/oc
Original file line number Diff line number Diff line change
Expand Up @@ -2822,6 +2822,61 @@ _oc_adm_migrate_authorization()
noun_aliases=()
}

_oc_adm_migrate_etcd-ttl()
{
last_command="oc_adm_migrate_etcd-ttl"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--cacert=")
local_nonpersistent_flags+=("--cacert=")
flags+=("--cert=")
local_nonpersistent_flags+=("--cert=")
flags+=("--etcd-address=")
local_nonpersistent_flags+=("--etcd-address=")
flags+=("--key=")
local_nonpersistent_flags+=("--key=")
flags+=("--lease-duration=")
local_nonpersistent_flags+=("--lease-duration=")
flags+=("--ttl-keys-prefix=")
local_nonpersistent_flags+=("--ttl-keys-prefix=")
flags+=("--as=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
flags+=("--context=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--loglevel=")
flags+=("--logspec=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_oc_adm_migrate_image-references()
{
last_command="oc_adm_migrate_image-references"
Expand Down Expand Up @@ -2961,6 +3016,7 @@ _oc_adm_migrate()
last_command="oc_adm_migrate"
commands=()
commands+=("authorization")
commands+=("etcd-ttl")
commands+=("image-references")
commands+=("storage")

Expand Down
116 changes: 116 additions & 0 deletions contrib/completions/bash/openshift
Original file line number Diff line number Diff line change
Expand Up @@ -2747,6 +2747,63 @@ _openshift_admin_migrate_authorization()
noun_aliases=()
}

_openshift_admin_migrate_etcd-ttl()
{
last_command="openshift_admin_migrate_etcd-ttl"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--cacert=")
local_nonpersistent_flags+=("--cacert=")
flags+=("--cert=")
local_nonpersistent_flags+=("--cert=")
flags+=("--etcd-address=")
local_nonpersistent_flags+=("--etcd-address=")
flags+=("--key=")
local_nonpersistent_flags+=("--key=")
flags+=("--lease-duration=")
local_nonpersistent_flags+=("--lease-duration=")
flags+=("--ttl-keys-prefix=")
local_nonpersistent_flags+=("--ttl-keys-prefix=")
flags+=("--as=")
flags+=("--azure-container-registry-config=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
flags+=("--context=")
flags+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--loglevel=")
flags+=("--logspec=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_openshift_admin_migrate_image-references()
{
last_command="openshift_admin_migrate_image-references"
Expand Down Expand Up @@ -2890,6 +2947,7 @@ _openshift_admin_migrate()
last_command="openshift_admin_migrate"
commands=()
commands+=("authorization")
commands+=("etcd-ttl")
commands+=("image-references")
commands+=("storage")

Expand Down Expand Up @@ -7926,6 +7984,63 @@ _openshift_cli_adm_migrate_authorization()
noun_aliases=()
}

_openshift_cli_adm_migrate_etcd-ttl()
{
last_command="openshift_cli_adm_migrate_etcd-ttl"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--cacert=")
local_nonpersistent_flags+=("--cacert=")
flags+=("--cert=")
local_nonpersistent_flags+=("--cert=")
flags+=("--etcd-address=")
local_nonpersistent_flags+=("--etcd-address=")
flags+=("--key=")
local_nonpersistent_flags+=("--key=")
flags+=("--lease-duration=")
local_nonpersistent_flags+=("--lease-duration=")
flags+=("--ttl-keys-prefix=")
local_nonpersistent_flags+=("--ttl-keys-prefix=")
flags+=("--as=")
flags+=("--azure-container-registry-config=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
flags+=("--context=")
flags+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--loglevel=")
flags+=("--logspec=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_openshift_cli_adm_migrate_image-references()
{
last_command="openshift_cli_adm_migrate_image-references"
Expand Down Expand Up @@ -8069,6 +8184,7 @@ _openshift_cli_adm_migrate()
last_command="openshift_cli_adm_migrate"
commands=()
commands+=("authorization")
commands+=("etcd-ttl")
commands+=("image-references")
commands+=("storage")

Expand Down
58 changes: 58 additions & 0 deletions contrib/completions/zsh/oadm
Original file line number Diff line number Diff line change
Expand Up @@ -2896,6 +2896,63 @@ _oadm_migrate_authorization()
noun_aliases=()
}

_oadm_migrate_etcd-ttl()
{
last_command="oadm_migrate_etcd-ttl"
commands=()

flags=()
two_word_flags=()
local_nonpersistent_flags=()
flags_with_completion=()
flags_completion=()

flags+=("--cacert=")
local_nonpersistent_flags+=("--cacert=")
flags+=("--cert=")
local_nonpersistent_flags+=("--cert=")
flags+=("--etcd-address=")
local_nonpersistent_flags+=("--etcd-address=")
flags+=("--key=")
local_nonpersistent_flags+=("--key=")
flags+=("--lease-duration=")
local_nonpersistent_flags+=("--lease-duration=")
flags+=("--ttl-keys-prefix=")
local_nonpersistent_flags+=("--ttl-keys-prefix=")
flags+=("--as=")
flags+=("--azure-container-registry-config=")
flags+=("--certificate-authority=")
flags_with_completion+=("--certificate-authority")
flags_completion+=("_filedir")
flags+=("--client-certificate=")
flags_with_completion+=("--client-certificate")
flags_completion+=("_filedir")
flags+=("--client-key=")
flags_with_completion+=("--client-key")
flags_completion+=("_filedir")
flags+=("--cluster=")
flags+=("--config=")
flags_with_completion+=("--config")
flags_completion+=("_filedir")
flags+=("--context=")
flags+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--loglevel=")
flags+=("--logspec=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--request-timeout=")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_noun=()
noun_aliases=()
}

_oadm_migrate_image-references()
{
last_command="oadm_migrate_image-references"
Expand Down Expand Up @@ -3039,6 +3096,7 @@ _oadm_migrate()
last_command="oadm_migrate"
commands=()
commands+=("authorization")
commands+=("etcd-ttl")
commands+=("image-references")
commands+=("storage")

Expand Down
Loading

0 comments on commit d89fcd6

Please sign in to comment.