Skip to content

Bug 1823143: Implement enhancement for "Add ImageContentSource awareness to oc" #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sallyom wants to merge 6 commits into from
Closed

Bug 1823143: Implement enhancement for "Add ImageContentSource awareness to oc" #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4513ce3
Bug 1823143: oc adm release - lookup images from alternative sources
sallyom Apr 20, 2020
bedec7d
oc adm release mirror: write icsp file to disk with options
sallyom Feb 14, 2021
933ddee
FAKE BUMP: go.mod
sallyom Apr 13, 2021
1ef6668
FAKE BUMP: library-go
sallyom Apr 13, 2021
d4d6e1f
add ICSP awareness
sallyom Apr 13, 2021
0535981
generated completions
sallyom Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions contrib/completions/bash/oc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,10 @@ _oc_adm_catalog_mirror()
two_word_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--icsp-scope=")
two_word_flags+=("--icsp-scope")
local_nonpersistent_flags+=("--icsp-scope")
Expand All @@ -608,6 +612,8 @@ _oc_adm_catalog_mirror()
local_nonpersistent_flags+=("--index-filter-by-os=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--manifests-only")
local_nonpersistent_flags+=("--manifests-only")
flags+=("--max-components=")
Expand Down Expand Up @@ -5781,8 +5787,14 @@ _oc_adm_release_extract()
two_word_flags+=("--git")
local_nonpersistent_flags+=("--git")
local_nonpersistent_flags+=("--git=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand Down Expand Up @@ -5893,6 +5905,10 @@ _oc_adm_release_info()
two_word_flags+=("--dir")
local_nonpersistent_flags+=("--dir")
local_nonpersistent_flags+=("--dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--image-for=")
two_word_flags+=("--image-for")
local_nonpersistent_flags+=("--image-for")
Expand All @@ -5901,6 +5917,8 @@ _oc_adm_release_info()
local_nonpersistent_flags+=("--include-images")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand Down Expand Up @@ -6003,8 +6021,14 @@ _oc_adm_release_mirror()
two_word_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand All @@ -6017,6 +6041,10 @@ _oc_adm_release_mirror()
local_nonpersistent_flags+=("--registry-config")
local_nonpersistent_flags+=("--registry-config=")
local_nonpersistent_flags+=("-a")
flags+=("--release-image-icsp-to-dir=")
two_word_flags+=("--release-image-icsp-to-dir")
local_nonpersistent_flags+=("--release-image-icsp-to-dir")
local_nonpersistent_flags+=("--release-image-icsp-to-dir=")
flags+=("--release-image-signature-to-dir=")
two_word_flags+=("--release-image-signature-to-dir")
local_nonpersistent_flags+=("--release-image-signature-to-dir")
Expand Down Expand Up @@ -6139,12 +6167,18 @@ _oc_adm_release_new()
two_word_flags+=("--from-release")
local_nonpersistent_flags+=("--from-release")
local_nonpersistent_flags+=("--from-release=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--include=")
two_word_flags+=("--include")
local_nonpersistent_flags+=("--include")
local_nonpersistent_flags+=("--include=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--mapping-file=")
two_word_flags+=("--mapping-file")
local_nonpersistent_flags+=("--mapping-file")
Expand Down Expand Up @@ -14579,12 +14613,18 @@ _oc_image_append()
two_word_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--image=")
two_word_flags+=("--image")
local_nonpersistent_flags+=("--image")
local_nonpersistent_flags+=("--image=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand Down Expand Up @@ -14681,8 +14721,14 @@ _oc_image_extract()
two_word_flags+=("--filter-by-os")
local_nonpersistent_flags+=("--filter-by-os")
local_nonpersistent_flags+=("--filter-by-os=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--only-files")
local_nonpersistent_flags+=("--only-files")
flags+=("--path=")
Expand Down Expand Up @@ -14767,8 +14813,14 @@ _oc_image_info()
two_word_flags+=("--filter-by-os")
local_nonpersistent_flags+=("--filter-by-os")
local_nonpersistent_flags+=("--filter-by-os=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--output=")
two_word_flags+=("--output")
two_word_flags+=("-o")
Expand Down Expand Up @@ -14865,10 +14917,16 @@ _oc_image_mirror()
two_word_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--keep-manifest-list")
local_nonpersistent_flags+=("--keep-manifest-list")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand Down
58 changes: 58 additions & 0 deletions contrib/completions/zsh/oc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,10 @@ _oc_adm_catalog_mirror()
two_word_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--icsp-scope=")
two_word_flags+=("--icsp-scope")
local_nonpersistent_flags+=("--icsp-scope")
Expand All @@ -708,6 +712,8 @@ _oc_adm_catalog_mirror()
local_nonpersistent_flags+=("--index-filter-by-os=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--manifests-only")
local_nonpersistent_flags+=("--manifests-only")
flags+=("--max-components=")
Expand Down Expand Up @@ -5881,8 +5887,14 @@ _oc_adm_release_extract()
two_word_flags+=("--git")
local_nonpersistent_flags+=("--git")
local_nonpersistent_flags+=("--git=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand Down Expand Up @@ -5993,6 +6005,10 @@ _oc_adm_release_info()
two_word_flags+=("--dir")
local_nonpersistent_flags+=("--dir")
local_nonpersistent_flags+=("--dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--image-for=")
two_word_flags+=("--image-for")
local_nonpersistent_flags+=("--image-for")
Expand All @@ -6001,6 +6017,8 @@ _oc_adm_release_info()
local_nonpersistent_flags+=("--include-images")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand Down Expand Up @@ -6103,8 +6121,14 @@ _oc_adm_release_mirror()
two_word_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand All @@ -6117,6 +6141,10 @@ _oc_adm_release_mirror()
local_nonpersistent_flags+=("--registry-config")
local_nonpersistent_flags+=("--registry-config=")
local_nonpersistent_flags+=("-a")
flags+=("--release-image-icsp-to-dir=")
two_word_flags+=("--release-image-icsp-to-dir")
local_nonpersistent_flags+=("--release-image-icsp-to-dir")
local_nonpersistent_flags+=("--release-image-icsp-to-dir=")
flags+=("--release-image-signature-to-dir=")
two_word_flags+=("--release-image-signature-to-dir")
local_nonpersistent_flags+=("--release-image-signature-to-dir")
Expand Down Expand Up @@ -6239,12 +6267,18 @@ _oc_adm_release_new()
two_word_flags+=("--from-release")
local_nonpersistent_flags+=("--from-release")
local_nonpersistent_flags+=("--from-release=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--include=")
two_word_flags+=("--include")
local_nonpersistent_flags+=("--include")
local_nonpersistent_flags+=("--include=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--mapping-file=")
two_word_flags+=("--mapping-file")
local_nonpersistent_flags+=("--mapping-file")
Expand Down Expand Up @@ -14679,12 +14713,18 @@ _oc_image_append()
two_word_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--image=")
two_word_flags+=("--image")
local_nonpersistent_flags+=("--image")
local_nonpersistent_flags+=("--image=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand Down Expand Up @@ -14781,8 +14821,14 @@ _oc_image_extract()
two_word_flags+=("--filter-by-os")
local_nonpersistent_flags+=("--filter-by-os")
local_nonpersistent_flags+=("--filter-by-os=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--only-files")
local_nonpersistent_flags+=("--only-files")
flags+=("--path=")
Expand Down Expand Up @@ -14867,8 +14913,14 @@ _oc_image_info()
two_word_flags+=("--filter-by-os")
local_nonpersistent_flags+=("--filter-by-os")
local_nonpersistent_flags+=("--filter-by-os=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--output=")
two_word_flags+=("--output")
two_word_flags+=("-o")
Expand Down Expand Up @@ -14965,10 +15017,16 @@ _oc_image_mirror()
two_word_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir")
local_nonpersistent_flags+=("--from-dir=")
flags+=("--icsp-file=")
two_word_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file")
local_nonpersistent_flags+=("--icsp-file=")
flags+=("--insecure")
local_nonpersistent_flags+=("--insecure")
flags+=("--keep-manifest-list")
local_nonpersistent_flags+=("--keep-manifest-list")
flags+=("--lookup-cluster-icsp")
local_nonpersistent_flags+=("--lookup-cluster-icsp")
flags+=("--max-per-registry=")
two_word_flags+=("--max-per-registry")
local_nonpersistent_flags+=("--max-per-registry")
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ require (
github.com/onsi/gomega v1.9.0 // indirect
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
github.com/openshift/api v0.0.0-20210105115604-44119421ec6b
github.com/openshift/api v0.0.0-20210331193751-3acddb19d360
github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
github.com/openshift/client-go v0.0.0-20210331195552-cf6c2669e01f
github.com/openshift/library-go v0.0.0-20210219155623-0260bfd7946b
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.9.0
Expand Down Expand Up @@ -74,7 +74,7 @@ replace (
// temporary pins to latest commit from soltysh/k8s-1.21 branches
github.com/openshift/api => github.com/soltysh/api v0.0.0-20210329125043-97dfec49c179
github.com/openshift/client-go => github.com/soltysh/client-go v0.0.0-20210329131047-e53d4b5c79d3
github.com/openshift/library-go => github.com/soltysh/library-go v0.0.0-20210329143525-072267446dd3
github.com/openshift/library-go => /home/somalley/code/gowork/src/github.com/openshift/library-go

// temporary pins to latest commit from oc-4.8-kubernetes-1.21.0-beta.1 branches
k8s.io/apimachinery => github.com/openshift/kubernetes-apimachinery v0.0.0-20210318140035-c39220d4515a
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,8 +746,6 @@ github.com/soltysh/api v0.0.0-20210329125043-97dfec49c179 h1:A9IqSWz8m9G1RbLJx2j
github.com/soltysh/api v0.0.0-20210329125043-97dfec49c179/go.mod h1:dZ4kytOo3svxJHNYd0J55hwe/6IQG5gAUHUE0F3Jkio=
github.com/soltysh/client-go v0.0.0-20210329131047-e53d4b5c79d3 h1:D0nYNGWfWlhkguMtWa8XyF8pMcZRH37zboh34bvs+Ms=
github.com/soltysh/client-go v0.0.0-20210329131047-e53d4b5c79d3/go.mod h1:khyjHEjWI0OiW5RY1M8N6YCnFAZ986nw7p2OqSufH2A=
github.com/soltysh/library-go v0.0.0-20210329143525-072267446dd3 h1:JwIGY81TlonJjYIKwK2gxbTkqg8iYOiN+udRpD3jihQ=
github.com/soltysh/library-go v0.0.0-20210329143525-072267446dd3/go.mod h1:lwiTZ+1U938RDJPWuIp5aN+eDP2rn9UV91bRvMoWfYA=
github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
Expand Down
6 changes: 3 additions & 3 deletions pkg/cli/admin/catalog/mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func NewMirrorCatalog(f kcmdutil.Factory, streams genericclioptions.IOStreams) *
Long: mirrorLong,
Example: mirrorExample,
Run: func(cmd *cobra.Command, args []string) {
kcmdutil.CheckErr(o.Complete(cmd, args))
kcmdutil.CheckErr(o.Complete(f, cmd, args))
kcmdutil.CheckErr(o.Validate())
kcmdutil.CheckErr(o.Run())
},
Expand Down Expand Up @@ -148,7 +148,7 @@ func NewMirrorCatalog(f kcmdutil.Factory, streams genericclioptions.IOStreams) *
return cmd
}

func (o *MirrorCatalogOptions) Complete(cmd *cobra.Command, args []string) error {
func (o *MirrorCatalogOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []string) error {
if len(args) < 2 {
return fmt.Errorf("must specify source and dest")
}
Expand Down Expand Up @@ -311,7 +311,7 @@ func (o *MirrorCatalogOptions) Complete(cmd *cobra.Command, args []string) error
}
e.Paths = []string{o.DatabasePath}
e.Confirm = true
if err := e.Complete(cmd, []string{o.SourceRef.String()}); err != nil {
if err := e.Complete(f, cmd, []string{o.SourceRef.String()}); err != nil {
return "", err
}
if err := e.Validate(); err != nil {
Expand Down
Loading