-
Notifications
You must be signed in to change notification settings - Fork 462
[OCPNODE-553] Add CRD ImageDigestMirrorSet,ImageTagMirrorSet #3037
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.
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
[OCPNODE-553] Add CRD ImageDigestMirrorSet,ImageTagMirrorSet #3037
Conversation
|
Skipping CI for Draft Pull Request. |
9186155 to
7a3a7d7
Compare
mtrmac
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just an initial pass (I didn’t actually read the added tests).
pkg/controller/container-runtime-config/container_runtime_config_controller_test.go
Outdated
Show resolved
Hide resolved
f2890e4 to
c59bf15
Compare
|
/retest |
|
@yuqi-zhang @mtrmac This PR and dependent PR: openshift/runtime-utils#15 will update the registry.conf. And the runtime-utils PR replaced machine-config-operator/pkg/daemon/drain.go Lines 178 to 187 in be77042
Not sure how the safe conditions are defined, but looking at https://bugzilla.redhat.com/show_bug.cgi?id=1943315#c1, we could propose the following as safe? // Currently, we consider following container registry config changes as safe to skip node drain:
// 1. A new mirror is added to an existing registry that has per-mirror setting `pull-from-mirror=digest-only` or registry level setting `mirror-by-digest-only=true`
// 2. A new registry has been added that has `mirror-by-digest-only=true` or per-mirror setting `pull-from-mirror=digest-only` for all of its mirrors |
|
@QiWang19: PR needs rebase. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
mtrmac
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM overall. (FWIW the PR doesn’t currently compile).
|
Only Or did you mean you wanted me to override e2e-aws-ovn? |
|
Yes, override e2e-aws-ovn. The e2e-aws-ovn was retested several times and failed. Can we override it? |
|
The latest commit did have a passing run: https://prow.ci.openshift.org/pr-history/?org=openshift&repo=machine-config-operator&pr=3037 So I think it's most likely ok. Still, I am uncomfortable overriding a required job unless the fix is urgent or directly attributed to it. Let's wait until the end of today, and, if there are no passes, I can look to override |
Code migration to use ImageDigestMirrorSet API. The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
According to the discussion [resolution](https://docs.google.com/document/d/13h6IJn8wlzXdiPMvCWlMEHOXXqEZ9_GYOl02Wldb3z8/edit?usp=sharing), having a tool in oc to convert icsp file is helpul to land new CRD imagedigestmirrorset. This pr propose command `oc image convert` to convert passed in icsp file to idms file. ``` $ ./oc adm migrate icsp --help Update imagecontentsourcepolicy file(s) to imagedigestmirrorset file(s). If --dest-dir is unset, the imagedigestmirrorset file(s) that can be added to a cluster will be written to file(s) under the current directory. Examples: # update the imagecontentsourcepolicy.yaml to new imagedigestmirrorset file under directory mydir oc adm migrate icsp imagecontentsourcepolicy.yaml --dest-dir mydir Options: --dest-dir='': Set a specific directory on the local machine to write imagedigestmirrorset file(s) to. Usage: oc adm migrate icsp [flags] [options] Use "oc options" for a list of global command-line options (applies to all commands). $ ./oc adm migrate icsp icsp.yml icsp1.yml --dest-dir mydir wrote ImageDigestMirrorSet to mydir/imagedigestmirrorset_ubi8repo.1498535234348096290.yaml wrote ImageDigestMirrorSet tomydir/imagedigestmirrorset_ubi8repo-1.2106923056265733512.yaml ``` - ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 - ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Code migration to use ImageDigestMirrorSet API. The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Code migration to use ImageDigestMirrorSet API. The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
According to the discussion [resolution](https://docs.google.com/document/d/13h6IJn8wlzXdiPMvCWlMEHOXXqEZ9_GYOl02Wldb3z8/edit?usp=sharing), having a tool in oc to convert icsp file is helpul to land new CRD imagedigestmirrorset. This pr propose command `oc image convert` to convert passed in icsp file to idms file. ``` $ ./oc adm migrate icsp --help Update imagecontentsourcepolicy file(s) to imagedigestmirrorset file(s). If --dest-dir is unset, the imagedigestmirrorset file(s) that can be added to a cluster will be written to file(s) under the current directory. Examples: # update the imagecontentsourcepolicy.yaml to new imagedigestmirrorset file under directory mydir oc adm migrate icsp imagecontentsourcepolicy.yaml --dest-dir mydir Options: --dest-dir='': Set a specific directory on the local machine to write imagedigestmirrorset file(s) to. Usage: oc adm migrate icsp [flags] [options] Use "oc options" for a list of global command-line options (applies to all commands). $ ./oc adm migrate icsp icsp.yml icsp1.yml --dest-dir mydir wrote ImageDigestMirrorSet to mydir/imagedigestmirrorset_ubi8repo.1498535234348096290.yaml wrote ImageDigestMirrorSet tomydir/imagedigestmirrorset_ubi8repo-1.2106923056265733512.yaml ``` - ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 - ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Follow up the PR: openshift#3037 Add the document to give examples of the new mirror configuration CRDs ImageDigestMirrorSet and ImageTagMirrorSet. Signed-off-by: Qi Wang <[email protected]>
According to the discussion [resolution](https://docs.google.com/document/d/13h6IJn8wlzXdiPMvCWlMEHOXXqEZ9_GYOl02Wldb3z8/edit?usp=sharing), having a tool in oc to convert icsp file is helpul to land new CRD imagedigestmirrorset. This pr propose command `oc image convert` to convert passed in icsp file to idms file. ``` $ ./oc adm migrate icsp --help Update imagecontentsourcepolicy file(s) to imagedigestmirrorset file(s). If --dest-dir is unset, the imagedigestmirrorset file(s) that can be added to a cluster will be written to file(s) under the current directory. Examples: # update the imagecontentsourcepolicy.yaml to new imagedigestmirrorset file under directory mydir oc adm migrate icsp imagecontentsourcepolicy.yaml --dest-dir mydir Options: --dest-dir='': Set a specific directory on the local machine to write imagedigestmirrorset file(s) to. Usage: oc adm migrate icsp [flags] [options] Use "oc options" for a list of global command-line options (applies to all commands). $ ./oc adm migrate icsp icsp.yml icsp1.yml --dest-dir mydir wrote ImageDigestMirrorSet to mydir/imagedigestmirrorset_ubi8repo.1498535234348096290.yaml wrote ImageDigestMirrorSet tomydir/imagedigestmirrorset_ubi8repo-1.2106923056265733512.yaml ``` - ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 - ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
According to the discussion [resolution](https://docs.google.com/document/d/13h6IJn8wlzXdiPMvCWlMEHOXXqEZ9_GYOl02Wldb3z8/edit?usp=sharing), having a tool in oc to convert icsp file is helpul to land new CRD imagedigestmirrorset. This pr propose command `oc image convert` to convert passed in icsp file to idms file. ``` $ ./oc adm migrate icsp --help Update imagecontentsourcepolicy file(s) to imagedigestmirrorset file(s). If --dest-dir is unset, the imagedigestmirrorset file(s) that can be added to a cluster will be written to file(s) under the current directory. Examples: # update the imagecontentsourcepolicy.yaml to new imagedigestmirrorset file under directory mydir oc adm migrate icsp imagecontentsourcepolicy.yaml --dest-dir mydir Options: --dest-dir='': Set a specific directory on the local machine to write imagedigestmirrorset file(s) to. Usage: oc adm migrate icsp [flags] [options] Use "oc options" for a list of global command-line options (applies to all commands). $ ./oc adm migrate icsp icsp.yml icsp1.yml --dest-dir mydir wrote ImageDigestMirrorSet to mydir/imagedigestmirrorset_ubi8repo.1498535234348096290.yaml wrote ImageDigestMirrorSet tomydir/imagedigestmirrorset_ubi8repo-1.2106923056265733512.yaml // example error output $ ./oc adm migrate icsp icsp.yml icsp-1.yml icsp-2.yml wrote ImageDigestMirrorSet to /home/qiwan/go/src/github.com/openshift/oc/imagedigestmirrorset_ubi8repo.748345346019788996.yaml unable to read ImageContentSourceFile /home/qiwan/test-crds/icsp-mirrir-v1alpha1-1.yml: open /home/qiwan/test-crds/icsp-mirrir-v1alpha1-1.yml: no such file or directory unable to read ImageContentSourceFile /home/qiwan/test-crds/icsp-del-mirrir-v1alpha1-2.yml: open /home/qiwan/test-crds/icsp-del-mirrir-v1alpha1-2.yml: no such file or directory ``` - ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 - ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
According to the discussion [resolution](https://docs.google.com/document/d/13h6IJn8wlzXdiPMvCWlMEHOXXqEZ9_GYOl02Wldb3z8/edit?usp=sharing), having a tool in oc to convert icsp file is helpul to land new CRD imagedigestmirrorset. This pr propose command `oc image convert` to convert passed in icsp file to idms file. ``` $ ./oc adm migrate icsp --help Update imagecontentsourcepolicy file(s) to imagedigestmirrorset file(s). If --dest-dir is unset, the imagedigestmirrorset file(s) that can be added to a cluster will be written to file(s) under the current directory. Examples: # update the imagecontentsourcepolicy.yaml to new imagedigestmirrorset file under directory mydir oc adm migrate icsp imagecontentsourcepolicy.yaml --dest-dir mydir Options: --dest-dir='': Set a specific directory on the local machine to write imagedigestmirrorset file(s) to. Usage: oc adm migrate icsp [flags] [options] Use "oc options" for a list of global command-line options (applies to all commands). $ ./oc adm migrate icsp icsp.yml icsp1.yml --dest-dir mydir wrote ImageDigestMirrorSet to mydir/imagedigestmirrorset_ubi8repo.1498535234348096290.yaml wrote ImageDigestMirrorSet tomydir/imagedigestmirrorset_ubi8repo-1.2106923056265733512.yaml // example error output $ ./oc adm migrate icsp icsp.yml icsp-1.yml icsp-2.yml wrote ImageDigestMirrorSet to /home/qiwan/go/src/github.com/openshift/oc/imagedigestmirrorset_ubi8repo.748345346019788996.yaml unable to read ImageContentSourceFile icsp-1.yml: open icsp-1.yml: no such file or directory unable to read ImageContentSourceFile icsp-2.yml: open icsp-2.yml: no such file or directory ``` - ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 - ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
According to the discussion [resolution](https://docs.google.com/document/d/13h6IJn8wlzXdiPMvCWlMEHOXXqEZ9_GYOl02Wldb3z8/edit?usp=sharing), having a tool in oc to convert icsp file is helpul to land new CRD imagedigestmirrorset. This pr propose command `oc image convert` to convert passed in icsp file to idms file. ``` $ ./oc adm migrate icsp --help Update imagecontentsourcepolicy file(s) to imagedigestmirrorset file(s). If --dest-dir is unset, the imagedigestmirrorset file(s) that can be added to a cluster will be written to file(s) under the current directory. Examples: # update the imagecontentsourcepolicy.yaml to new imagedigestmirrorset file under directory mydir oc adm migrate icsp imagecontentsourcepolicy.yaml --dest-dir mydir Options: --dest-dir='': Set a specific directory on the local machine to write imagedigestmirrorset file(s) to. Usage: oc adm migrate icsp [flags] [options] Use "oc options" for a list of global command-line options (applies to all commands). $ ./oc adm migrate icsp icsp.yml icsp1.yml --dest-dir mydir wrote ImageDigestMirrorSet to mydir/imagedigestmirrorset_ubi8repo.1498535234348096290.yaml wrote ImageDigestMirrorSet tomydir/imagedigestmirrorset_ubi8repo-1.2106923056265733512.yaml // example error output $ ./oc adm migrate icsp icsp.yml icsp-1.yml icsp-2.yml wrote ImageDigestMirrorSet to /home/qiwan/go/src/github.com/openshift/oc/imagedigestmirrorset_ubi8repo.748345346019788996.yaml unable to read ImageContentSourceFile icsp-1.yml: open icsp-1.yml: no such file or directory unable to read ImageContentSourceFile icsp-2.yml: open icsp-2.yml: no such file or directory ``` - ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 - ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Update runtime-utils with idms, itms support The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Code migration to use ImageDigestMirrorSet API. The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Update runtime-utils with idms, itms support The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Code migration to use ImageDigestMirrorSet API. The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Update runtime-utils with idms, itms support The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Update runtime-utils with idms, itms support The OCPNODE-521 landed ImageDigestMirrorSet(IDMS) CRD to 4.13. This new CRDs for image mirror configurations to replace ICSP in the future release(at least from 4.17). The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Code migration to use ImageDigestMirrorSet API. The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Code migration to use ImageDigestMirrorSet API. The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
Code migration to use ImageDigestMirrorSet API. The OCPNODE-521 will land new CRDs for image mirror configurations to replace ICSP in the future release. The current components rely on ICSP should use new APIs. ImageDigestMirrorSet implemented: openshift/machine-config-operator#3037 ImageDigestMirrorSet epic: https://issues.redhat.com/browse/OCPNODE-521 Signed-off-by: Qi Wang <[email protected]>
- What I did
Close card: https://issues.redhat.com/browse/OCPNODE-553
Epic: https://issues.redhat.com/browse/OCPNODE-521
Dependent PR: openshift/runtime-utils#15
- How to verify it
Apply following CR, check the /etc/containers/registries.conf
/etc/containers/registries.conf
- Description for the changelog
Add support for ImageDigestMirrorSet,ImageDigestMirrorSet CRDs