Skip to content

Commit c6c0e20

Browse files
smarterclaytonsmarterclayton
committed
Add an API storage migration
1 parent 5094248 commit c6c0e20

File tree

9 files changed

+455
-319
lines changed

9 files changed

+455
-319
lines changed

‎contrib/completions/bash/oadm

+58
Original file line numberDiff line numberDiff line change
@@ -1939,9 +1939,66 @@ _oadm_migrate_image-references()
19391939
two_word_flags+=("-f")
19401940
flags_with_completion+=("-f")
19411941
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
1942+
flags+=("--from-key=")
19421943
flags+=("--include=")
19431944
flags+=("--output=")
19441945
two_word_flags+=("-o")
1946+
flags+=("--to-key=")
1947+
flags+=("--api-version=")
1948+
flags+=("--as=")
1949+
flags+=("--certificate-authority=")
1950+
flags_with_completion+=("--certificate-authority")
1951+
flags_completion+=("_filedir")
1952+
flags+=("--client-certificate=")
1953+
flags_with_completion+=("--client-certificate")
1954+
flags_completion+=("_filedir")
1955+
flags+=("--client-key=")
1956+
flags_with_completion+=("--client-key")
1957+
flags_completion+=("_filedir")
1958+
flags+=("--cluster=")
1959+
flags+=("--config=")
1960+
flags_with_completion+=("--config")
1961+
flags_completion+=("_filedir")
1962+
flags+=("--context=")
1963+
flags+=("--google-json-key=")
1964+
flags+=("--insecure-skip-tls-verify")
1965+
flags+=("--log-flush-frequency=")
1966+
flags+=("--match-server-version")
1967+
flags+=("--namespace=")
1968+
two_word_flags+=("-n")
1969+
flags+=("--server=")
1970+
flags+=("--token=")
1971+
flags+=("--user=")
1972+
1973+
must_have_one_flag=()
1974+
must_have_one_flag+=("--filename=")
1975+
must_have_one_flag+=("-f")
1976+
must_have_one_noun=()
1977+
}
1978+
1979+
_oadm_migrate_storage()
1980+
{
1981+
last_command="oadm_migrate_storage"
1982+
commands=()
1983+
1984+
flags=()
1985+
two_word_flags=()
1986+
flags_with_completion=()
1987+
flags_completion=()
1988+
1989+
flags+=("--all-namespaces")
1990+
flags+=("--confirm")
1991+
flags+=("--filename=")
1992+
flags_with_completion+=("--filename")
1993+
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
1994+
two_word_flags+=("-f")
1995+
flags_with_completion+=("-f")
1996+
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
1997+
flags+=("--from-key=")
1998+
flags+=("--include=")
1999+
flags+=("--output=")
2000+
two_word_flags+=("-o")
2001+
flags+=("--to-key=")
19452002
flags+=("--api-version=")
19462003
flags+=("--as=")
19472004
flags+=("--certificate-authority=")
@@ -1979,6 +2036,7 @@ _oadm_migrate()
19792036
last_command="oadm_migrate"
19802037
commands=()
19812038
commands+=("image-references")
2039+
commands+=("storage")
19822040

19832041
flags=()
19842042
two_word_flags=()

‎contrib/completions/bash/oc

+58
Original file line numberDiff line numberDiff line change
@@ -5102,9 +5102,66 @@ _oc_adm_migrate_image-references()
51025102
two_word_flags+=("-f")
51035103
flags_with_completion+=("-f")
51045104
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
5105+
flags+=("--from-key=")
51055106
flags+=("--include=")
51065107
flags+=("--output=")
51075108
two_word_flags+=("-o")
5109+
flags+=("--to-key=")
5110+
flags+=("--api-version=")
5111+
flags+=("--as=")
5112+
flags+=("--certificate-authority=")
5113+
flags_with_completion+=("--certificate-authority")
5114+
flags_completion+=("_filedir")
5115+
flags+=("--client-certificate=")
5116+
flags_with_completion+=("--client-certificate")
5117+
flags_completion+=("_filedir")
5118+
flags+=("--client-key=")
5119+
flags_with_completion+=("--client-key")
5120+
flags_completion+=("_filedir")
5121+
flags+=("--cluster=")
5122+
flags+=("--config=")
5123+
flags_with_completion+=("--config")
5124+
flags_completion+=("_filedir")
5125+
flags+=("--context=")
5126+
flags+=("--google-json-key=")
5127+
flags+=("--insecure-skip-tls-verify")
5128+
flags+=("--log-flush-frequency=")
5129+
flags+=("--match-server-version")
5130+
flags+=("--namespace=")
5131+
two_word_flags+=("-n")
5132+
flags+=("--server=")
5133+
flags+=("--token=")
5134+
flags+=("--user=")
5135+
5136+
must_have_one_flag=()
5137+
must_have_one_flag+=("--filename=")
5138+
must_have_one_flag+=("-f")
5139+
must_have_one_noun=()
5140+
}
5141+
5142+
_oc_adm_migrate_storage()
5143+
{
5144+
last_command="oc_adm_migrate_storage"
5145+
commands=()
5146+
5147+
flags=()
5148+
two_word_flags=()
5149+
flags_with_completion=()
5150+
flags_completion=()
5151+
5152+
flags+=("--all-namespaces")
5153+
flags+=("--confirm")
5154+
flags+=("--filename=")
5155+
flags_with_completion+=("--filename")
5156+
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
5157+
two_word_flags+=("-f")
5158+
flags_with_completion+=("-f")
5159+
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
5160+
flags+=("--from-key=")
5161+
flags+=("--include=")
5162+
flags+=("--output=")
5163+
two_word_flags+=("-o")
5164+
flags+=("--to-key=")
51085165
flags+=("--api-version=")
51095166
flags+=("--as=")
51105167
flags+=("--certificate-authority=")
@@ -5142,6 +5199,7 @@ _oc_adm_migrate()
51425199
last_command="oc_adm_migrate"
51435200
commands=()
51445201
commands+=("image-references")
5202+
commands+=("storage")
51455203

51465204
flags=()
51475205
two_word_flags=()

‎contrib/completions/bash/openshift

+116
Original file line numberDiff line numberDiff line change
@@ -2515,9 +2515,66 @@ _openshift_admin_migrate_image-references()
25152515
two_word_flags+=("-f")
25162516
flags_with_completion+=("-f")
25172517
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
2518+
flags+=("--from-key=")
25182519
flags+=("--include=")
25192520
flags+=("--output=")
25202521
two_word_flags+=("-o")
2522+
flags+=("--to-key=")
2523+
flags+=("--api-version=")
2524+
flags+=("--as=")
2525+
flags+=("--certificate-authority=")
2526+
flags_with_completion+=("--certificate-authority")
2527+
flags_completion+=("_filedir")
2528+
flags+=("--client-certificate=")
2529+
flags_with_completion+=("--client-certificate")
2530+
flags_completion+=("_filedir")
2531+
flags+=("--client-key=")
2532+
flags_with_completion+=("--client-key")
2533+
flags_completion+=("_filedir")
2534+
flags+=("--cluster=")
2535+
flags+=("--config=")
2536+
flags_with_completion+=("--config")
2537+
flags_completion+=("_filedir")
2538+
flags+=("--context=")
2539+
flags+=("--google-json-key=")
2540+
flags+=("--insecure-skip-tls-verify")
2541+
flags+=("--log-flush-frequency=")
2542+
flags+=("--match-server-version")
2543+
flags+=("--namespace=")
2544+
two_word_flags+=("-n")
2545+
flags+=("--server=")
2546+
flags+=("--token=")
2547+
flags+=("--user=")
2548+
2549+
must_have_one_flag=()
2550+
must_have_one_flag+=("--filename=")
2551+
must_have_one_flag+=("-f")
2552+
must_have_one_noun=()
2553+
}
2554+
2555+
_openshift_admin_migrate_storage()
2556+
{
2557+
last_command="openshift_admin_migrate_storage"
2558+
commands=()
2559+
2560+
flags=()
2561+
two_word_flags=()
2562+
flags_with_completion=()
2563+
flags_completion=()
2564+
2565+
flags+=("--all-namespaces")
2566+
flags+=("--confirm")
2567+
flags+=("--filename=")
2568+
flags_with_completion+=("--filename")
2569+
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
2570+
two_word_flags+=("-f")
2571+
flags_with_completion+=("-f")
2572+
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
2573+
flags+=("--from-key=")
2574+
flags+=("--include=")
2575+
flags+=("--output=")
2576+
two_word_flags+=("-o")
2577+
flags+=("--to-key=")
25212578
flags+=("--api-version=")
25222579
flags+=("--as=")
25232580
flags+=("--certificate-authority=")
@@ -2555,6 +2612,7 @@ _openshift_admin_migrate()
25552612
last_command="openshift_admin_migrate"
25562613
commands=()
25572614
commands+=("image-references")
2615+
commands+=("storage")
25582616

25592617
flags=()
25602618
two_word_flags=()
@@ -8785,9 +8843,66 @@ _openshift_cli_adm_migrate_image-references()
87858843
two_word_flags+=("-f")
87868844
flags_with_completion+=("-f")
87878845
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
8846+
flags+=("--from-key=")
8847+
flags+=("--include=")
8848+
flags+=("--output=")
8849+
two_word_flags+=("-o")
8850+
flags+=("--to-key=")
8851+
flags+=("--api-version=")
8852+
flags+=("--as=")
8853+
flags+=("--certificate-authority=")
8854+
flags_with_completion+=("--certificate-authority")
8855+
flags_completion+=("_filedir")
8856+
flags+=("--client-certificate=")
8857+
flags_with_completion+=("--client-certificate")
8858+
flags_completion+=("_filedir")
8859+
flags+=("--client-key=")
8860+
flags_with_completion+=("--client-key")
8861+
flags_completion+=("_filedir")
8862+
flags+=("--cluster=")
8863+
flags+=("--config=")
8864+
flags_with_completion+=("--config")
8865+
flags_completion+=("_filedir")
8866+
flags+=("--context=")
8867+
flags+=("--google-json-key=")
8868+
flags+=("--insecure-skip-tls-verify")
8869+
flags+=("--log-flush-frequency=")
8870+
flags+=("--match-server-version")
8871+
flags+=("--namespace=")
8872+
two_word_flags+=("-n")
8873+
flags+=("--server=")
8874+
flags+=("--token=")
8875+
flags+=("--user=")
8876+
8877+
must_have_one_flag=()
8878+
must_have_one_flag+=("--filename=")
8879+
must_have_one_flag+=("-f")
8880+
must_have_one_noun=()
8881+
}
8882+
8883+
_openshift_cli_adm_migrate_storage()
8884+
{
8885+
last_command="openshift_cli_adm_migrate_storage"
8886+
commands=()
8887+
8888+
flags=()
8889+
two_word_flags=()
8890+
flags_with_completion=()
8891+
flags_completion=()
8892+
8893+
flags+=("--all-namespaces")
8894+
flags+=("--confirm")
8895+
flags+=("--filename=")
8896+
flags_with_completion+=("--filename")
8897+
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
8898+
two_word_flags+=("-f")
8899+
flags_with_completion+=("-f")
8900+
flags_completion+=("__handle_filename_extension_flag json|yaml|yml")
8901+
flags+=("--from-key=")
87888902
flags+=("--include=")
87898903
flags+=("--output=")
87908904
two_word_flags+=("-o")
8905+
flags+=("--to-key=")
87918906
flags+=("--api-version=")
87928907
flags+=("--as=")
87938908
flags+=("--certificate-authority=")
@@ -8825,6 +8940,7 @@ _openshift_cli_adm_migrate()
88258940
last_command="openshift_cli_adm_migrate"
88268941
commands=()
88278942
commands+=("image-references")
8943+
commands+=("storage")
88288944

88298945
flags=()
88308946
two_word_flags=()

‎docs/generated/oadm_by_example_content.adoc

+23
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,29 @@ Update embedded Docker image references
322322
====
323323

324324

325+
== oadm migrate storage
326+
Update the stored version of API objects
327+
328+
====
329+
330+
[options="nowrap"]
331+
----
332+
# Perform a dry-run of updating all objects
333+
oadm migrate storage
334+
335+
# To actually perform the update, the confirm flag must be appended
336+
oadm migrate storage --confirm
337+
338+
# Only migrate pods
339+
oadm migrate storage --include=pods --confirm
340+
341+
# Only pods that are in namespaces starting with "bar"
342+
oadm migrate storage --include=pods --confirm --from-key=bar/ --to-key=bar/\xFF
343+
344+
----
345+
====
346+
347+
325348
== oadm pod-network join-projects
326349
Join project network
327350

‎docs/generated/oc_by_example_content.adoc

+23
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,29 @@ Update embedded Docker image references
322322
====
323323

324324

325+
== oc adm migrate storage
326+
Update the stored version of API objects
327+
328+
====
329+
330+
[options="nowrap"]
331+
----
332+
# Perform a dry-run of updating all objects
333+
oc adm migrate storage
334+
335+
# To actually perform the update, the confirm flag must be appended
336+
oc adm migrate storage --confirm
337+
338+
# Only migrate pods
339+
oc adm migrate storage --include=pods --confirm
340+
341+
# Only pods that are in namespaces starting with "bar"
342+
oc adm migrate storage --include=pods --confirm --from-key=bar/ --to-key=bar/\xFF
343+
344+
----
345+
====
346+
347+
325348
== oc adm pod-network join-projects
326349
Join project network
327350

‎pkg/cmd/admin/admin.go

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/openshift/origin/pkg/cmd/admin/groups"
1313
"github.com/openshift/origin/pkg/cmd/admin/migrate"
1414
migrateimages "github.com/openshift/origin/pkg/cmd/admin/migrate/images"
15+
migratestorage "github.com/openshift/origin/pkg/cmd/admin/migrate/storage"
1516
"github.com/openshift/origin/pkg/cmd/admin/node"
1617
"github.com/openshift/origin/pkg/cmd/admin/policy"
1718
"github.com/openshift/origin/pkg/cmd/admin/project"
@@ -73,6 +74,7 @@ func NewCommandAdmin(name, fullName string, in io.Reader, out io.Writer, errout
7374
migrate.MigrateRecommendedName, fullName+" "+migrate.MigrateRecommendedName, f, out,
7475
// Migration commands
7576
migrateimages.NewCmdMigrateImageReferences("image-references", fullName+" "+migrate.MigrateRecommendedName+" image-references", f, in, out, errout),
77+
migratestorage.NewCmdMigrateAPIStorage("storage", fullName+" "+migrate.MigrateRecommendedName+" storage", f, in, out, errout),
7678
),
7779
},
7880
},

0 commit comments

Comments
 (0)