Skip to content

Commit

Permalink
Add an API storage migration
Browse files Browse the repository at this point in the history
  • Loading branch information
@smarterclayton
smarterclayton committed Jun 14, 2016
1 parent 5094248 commit c6c0e20
Show file tree
Hide file tree
Showing 9 changed files with 455 additions and 319 deletions.
58 changes: 58 additions & 0 deletions contrib/completions/bash/oadm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1939,9 +1939,66 @@ _oadm_migrate_image-references()
two_word_flags+=("-f")
flags_with_completion+=("-f")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
flags+=("--from-key=")
flags+=("--include=")
flags+=("--output=")
two_word_flags+=("-o")
flags+=("--to-key=")
flags+=("--api-version=")
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+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_flag+=("--filename=")
must_have_one_flag+=("-f")
must_have_one_noun=()
}

_oadm_migrate_storage()
{
last_command="oadm_migrate_storage"
commands=()

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

flags+=("--all-namespaces")
flags+=("--confirm")
flags+=("--filename=")
flags_with_completion+=("--filename")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
two_word_flags+=("-f")
flags_with_completion+=("-f")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
flags+=("--from-key=")
flags+=("--include=")
flags+=("--output=")
two_word_flags+=("-o")
flags+=("--to-key=")
flags+=("--api-version=")
flags+=("--as=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -1979,6 +2036,7 @@ _oadm_migrate()
last_command="oadm_migrate"
commands=()
commands+=("image-references")
commands+=("storage")

flags=()
two_word_flags=()
Expand Down
58 changes: 58 additions & 0 deletions contrib/completions/bash/oc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5102,9 +5102,66 @@ _oc_adm_migrate_image-references()
two_word_flags+=("-f")
flags_with_completion+=("-f")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
flags+=("--from-key=")
flags+=("--include=")
flags+=("--output=")
two_word_flags+=("-o")
flags+=("--to-key=")
flags+=("--api-version=")
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+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_flag+=("--filename=")
must_have_one_flag+=("-f")
must_have_one_noun=()
}

_oc_adm_migrate_storage()
{
last_command="oc_adm_migrate_storage"
commands=()

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

flags+=("--all-namespaces")
flags+=("--confirm")
flags+=("--filename=")
flags_with_completion+=("--filename")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
two_word_flags+=("-f")
flags_with_completion+=("-f")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
flags+=("--from-key=")
flags+=("--include=")
flags+=("--output=")
two_word_flags+=("-o")
flags+=("--to-key=")
flags+=("--api-version=")
flags+=("--as=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -5142,6 +5199,7 @@ _oc_adm_migrate()
last_command="oc_adm_migrate"
commands=()
commands+=("image-references")
commands+=("storage")

flags=()
two_word_flags=()
Expand Down
116 changes: 116 additions & 0 deletions contrib/completions/bash/openshift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2515,9 +2515,66 @@ _openshift_admin_migrate_image-references()
two_word_flags+=("-f")
flags_with_completion+=("-f")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
flags+=("--from-key=")
flags+=("--include=")
flags+=("--output=")
two_word_flags+=("-o")
flags+=("--to-key=")
flags+=("--api-version=")
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+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_flag+=("--filename=")
must_have_one_flag+=("-f")
must_have_one_noun=()
}

_openshift_admin_migrate_storage()
{
last_command="openshift_admin_migrate_storage"
commands=()

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

flags+=("--all-namespaces")
flags+=("--confirm")
flags+=("--filename=")
flags_with_completion+=("--filename")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
two_word_flags+=("-f")
flags_with_completion+=("-f")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
flags+=("--from-key=")
flags+=("--include=")
flags+=("--output=")
two_word_flags+=("-o")
flags+=("--to-key=")
flags+=("--api-version=")
flags+=("--as=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -2555,6 +2612,7 @@ _openshift_admin_migrate()
last_command="openshift_admin_migrate"
commands=()
commands+=("image-references")
commands+=("storage")

flags=()
two_word_flags=()
Expand Down Expand Up @@ -8785,9 +8843,66 @@ _openshift_cli_adm_migrate_image-references()
two_word_flags+=("-f")
flags_with_completion+=("-f")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
flags+=("--from-key=")
flags+=("--include=")
flags+=("--output=")
two_word_flags+=("-o")
flags+=("--to-key=")
flags+=("--api-version=")
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+=("--google-json-key=")
flags+=("--insecure-skip-tls-verify")
flags+=("--log-flush-frequency=")
flags+=("--match-server-version")
flags+=("--namespace=")
two_word_flags+=("-n")
flags+=("--server=")
flags+=("--token=")
flags+=("--user=")

must_have_one_flag=()
must_have_one_flag+=("--filename=")
must_have_one_flag+=("-f")
must_have_one_noun=()
}

_openshift_cli_adm_migrate_storage()
{
last_command="openshift_cli_adm_migrate_storage"
commands=()

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

flags+=("--all-namespaces")
flags+=("--confirm")
flags+=("--filename=")
flags_with_completion+=("--filename")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
two_word_flags+=("-f")
flags_with_completion+=("-f")
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
flags+=("--from-key=")
flags+=("--include=")
flags+=("--output=")
two_word_flags+=("-o")
flags+=("--to-key=")
flags+=("--api-version=")
flags+=("--as=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -8825,6 +8940,7 @@ _openshift_cli_adm_migrate()
last_command="openshift_cli_adm_migrate"
commands=()
commands+=("image-references")
commands+=("storage")

flags=()
two_word_flags=()
Expand Down
23 changes: 23 additions & 0 deletions docs/generated/oadm_by_example_content.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,29 @@ Update embedded Docker image references
====


== oadm migrate storage
Update the stored version of API objects

====

[options="nowrap"]
----
# Perform a dry-run of updating all objects
oadm migrate storage

# To actually perform the update, the confirm flag must be appended
oadm migrate storage --confirm

# Only migrate pods
oadm migrate storage --include=pods --confirm

# Only pods that are in namespaces starting with "bar"
oadm migrate storage --include=pods --confirm --from-key=bar/ --to-key=bar/\xFF

----
====


== oadm pod-network join-projects
Join project network

Expand Down
23 changes: 23 additions & 0 deletions docs/generated/oc_by_example_content.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,29 @@ Update embedded Docker image references
====


== oc adm migrate storage
Update the stored version of API objects

====

[options="nowrap"]
----
# Perform a dry-run of updating all objects
oc adm migrate storage

# To actually perform the update, the confirm flag must be appended
oc adm migrate storage --confirm

# Only migrate pods
oc adm migrate storage --include=pods --confirm

# Only pods that are in namespaces starting with "bar"
oc adm migrate storage --include=pods --confirm --from-key=bar/ --to-key=bar/\xFF

----
====


== oc adm pod-network join-projects
Join project network

Expand Down
2 changes: 2 additions & 0 deletions pkg/cmd/admin/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/openshift/origin/pkg/cmd/admin/groups"
"github.com/openshift/origin/pkg/cmd/admin/migrate"
migrateimages "github.com/openshift/origin/pkg/cmd/admin/migrate/images"
migratestorage "github.com/openshift/origin/pkg/cmd/admin/migrate/storage"
"github.com/openshift/origin/pkg/cmd/admin/node"
"github.com/openshift/origin/pkg/cmd/admin/policy"
"github.com/openshift/origin/pkg/cmd/admin/project"
Expand Down Expand Up @@ -73,6 +74,7 @@ func NewCommandAdmin(name, fullName string, in io.Reader, out io.Writer, errout
migrate.MigrateRecommendedName, fullName+" "+migrate.MigrateRecommendedName, f, out,
// Migration commands
migrateimages.NewCmdMigrateImageReferences("image-references", fullName+" "+migrate.MigrateRecommendedName+" image-references", f, in, out, errout),
migratestorage.NewCmdMigrateAPIStorage("storage", fullName+" "+migrate.MigrateRecommendedName+" storage", f, in, out, errout),
),
},
},
Expand Down
Loading

0 comments on commit c6c0e20

Please sign in to comment.