Bug 2050466: Not allow empty string in icsp&image CR by QiWang19 · Pull Request #2969 · openshift/machine-config-operator

QiWang19 · 2022-02-25T18:41:06Z

Fix: https://bugzilla.redhat.com/show_bug.cgi?id=2050466

vendor in Bug 2050466: Not allow "" string in registriesConf entry runtime-utils#14
Add validation for image and icsp CR to not allow the empty string ("") in the CRD.
Empty string regsitries configurations will fail the machine config daemon operations
of pulling images and the nodes will stopped in NotReady state when node rebooting after node drain.

2022-02-03T23:16:02.952318066Z I0203 23:16:02.952259    2590 run.go:18] Running: podman pull -q --authfile /var/lib/kubelet/config.json quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d4ff6bb5494c55c24f9a322b1a5faffb8a92ea0f572f1078db55f3f1abaa588
2022-02-03T23:16:03.033231339Z Error: error loading registries configuration "/etc/containers/registries.conf": invalid condition: mirror location is unset

Signed-off-by: Qi Wang qiwan@redhat.com

- What I did

- How to verify it

Apply the following icsp to the cluster:
it should logs error about the icsp is invalid and do not update the registries.conf.

apiVersion: operator.openshift.io/v1alpha1
kind: ImageContentSourcePolicy
metadata:
  generation: 1
  name: sonatyperepo
spec:
  repositoryDigestMirrors:
  - mirrors:
    - sonatyperepo.test.com
    source: docker.io
  - mirrors:
    - ""
    source: sonatyperepo.test.com:18594

- Description for the changelog

Signed-off-by: Qi Wang <qiwan@redhat.com>

Fix: https://bugzilla.redhat.com/show_bug.cgi?id=2050466 Add validation for image and icsp CR to not allow the empty string ("") in the CRD. Empty string regsitries configurations will fail the machine config deamon operations of pulling images and the nodes will stopped in NotReady state when node rebooting after node drain. Signed-off-by: Qi Wang <qiwan@redhat.com>

Signed-off-by: Qi Wang <qiwan@redhat.com>

openshift-ci · 2022-02-25T18:41:22Z

@QiWang19: This pull request references Bugzilla bug 2050466, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.11.0) matches configured target release for branch (4.11.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (schoudha@redhat.com), skipping review request.

Details

In response to this:

Bug 2050466: Not allow empty string in icsp&image CR

Instructions 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.

openshift-ci · 2022-02-25T18:42:07Z

@QiWang19: This pull request references Bugzilla bug 2050466, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.11.0) matches configured target release for branch (4.11.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (schoudha@redhat.com), skipping review request.

Details

In response to this:

Bug 2050466: Not allow empty string in icsp&image CR

Instructions 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.

QiWang19 · 2022-02-25T18:44:15Z

@mtrmac PTAL. vendor in openshift/runtime-utils#14 to put in the validation for mirror and blocked/insecure/allowed together.

kikisdeliveryservice · 2022-02-25T18:51:21Z

/assign @mtrmac

mtrmac

/lgtm

Thanks!

QiWang19 · 2022-02-25T21:58:51Z

/retest-required

QiWang19 · 2022-02-28T16:03:37Z

/retest-required

QiWang19 · 2022-03-01T14:38:28Z

@kikisdeliveryservice @yuqi-zhang PTAL

yuqi-zhang

lgtm

openshift-bot · 2022-03-01T15:45:34Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2022-03-01T16:00:10Z

@QiWang19: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-workers-rhel8	`0fb6004`	link	false	`/test e2e-aws-workers-rhel8`
ci/prow/e2e-ovn-step-registry	`0fb6004`	link	false	`/test e2e-ovn-step-registry`
ci/prow/e2e-aws-disruptive	`0fb6004`	link	false	`/test e2e-aws-disruptive`
ci/prow/e2e-aws-workers-rhel7	`0fb6004`	link	false	`/test e2e-aws-workers-rhel7`
ci/prow/e2e-aws-upgrade-single-node	`0fb6004`	link	false	`/test e2e-aws-upgrade-single-node`
ci/prow/okd-e2e-aws	`0fb6004`	link	false	`/test okd-e2e-aws`

Full PR test history. Your PR dashboard.

Details

Instructions 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. I understand the commands that are listed here.

openshift-bot · 2022-03-01T16:09:35Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-03-01T16:21:41Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-03-01T16:45:47Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-03-01T17:09:34Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

umohnani8 · 2022-03-01T17:38:57Z

LGTM

kikisdeliveryservice · 2022-03-01T17:47:22Z

Thanks for this updated PR @mtrmac and @QiWang19 👍

/approve

openshift-ci · 2022-03-01T17:48:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kikisdeliveryservice, mtrmac, QiWang19, yuqi-zhang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [kikisdeliveryservice,yuqi-zhang]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2022-03-01T18:21:35Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2022-03-01T19:42:01Z

@QiWang19: All pull requests linked via external trackers have merged:

Bugzilla bug 2050466 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2050466: Not allow empty string in icsp&image CR

Instructions 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.

QiWang19 added 3 commits February 25, 2022 13:27

Update runtime-util

dcd3ad8

Signed-off-by: Qi Wang <qiwan@redhat.com>

remove redundent type declaration

0fb6004

Signed-off-by: Qi Wang <qiwan@redhat.com>

openshift-ci Bot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Feb 25, 2022

openshift-ci Bot requested review from cgwalters and umohnani8 February 25, 2022 18:41

openshift-ci Bot assigned mtrmac Feb 25, 2022

kikisdeliveryservice self-requested a review February 25, 2022 18:51

mtrmac reviewed Feb 25, 2022

View reviewed changes

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 25, 2022

yuqi-zhang approved these changes Mar 1, 2022

View reviewed changes

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 1, 2022

openshift-merge-robot merged commit 080919d into openshift:master Mar 1, 2022

Conversation

QiWang19 commented Feb 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Feb 25, 2022

Uh oh!

openshift-ci Bot commented Feb 25, 2022

Uh oh!

QiWang19 commented Feb 25, 2022

Uh oh!

kikisdeliveryservice commented Feb 25, 2022

Uh oh!

mtrmac left a comment

Choose a reason for hiding this comment

Uh oh!

QiWang19 commented Feb 25, 2022

Uh oh!

QiWang19 commented Feb 28, 2022

Uh oh!

QiWang19 commented Mar 1, 2022

Uh oh!

yuqi-zhang left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-bot commented Mar 1, 2022

Uh oh!

openshift-ci Bot commented Mar 1, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-bot commented Mar 1, 2022

Uh oh!

openshift-bot commented Mar 1, 2022

Uh oh!

openshift-bot commented Mar 1, 2022

Uh oh!

openshift-bot commented Mar 1, 2022

Uh oh!

umohnani8 commented Mar 1, 2022

Uh oh!

kikisdeliveryservice commented Mar 1, 2022

Uh oh!

openshift-ci Bot commented Mar 1, 2022

Uh oh!

openshift-bot commented Mar 1, 2022

Uh oh!

openshift-ci Bot commented Mar 1, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

QiWang19 commented Feb 25, 2022 •

edited

Loading

openshift-ci Bot commented Mar 1, 2022 •

edited

Loading