Bug 1975539: delete hello-openshift in payload imagestream via CVO annotation #380

gabemontero · 2021-06-24T14:09:37Z

@jottofar please lgtm if I have interpreted https://github.com/openshift/cluster-version-operator/blob/master/docs/dev/object-deletion.md and this bz correctly

I'm guessing I don't need to update image-references as well since this change is intended for deletion, but we'll see how the cluster install goes. If there are complaints from the CVO around samples operator then that is the most likely explanation.

@dperaza4dustbit FYI ... these "in payload" imagestreams IIRC are also discussed in the skill xfer videos.

openshift-ci · 2021-06-24T14:10:23Z

@gabemontero: This pull request references Bugzilla bug 1975539, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @xiuwang

Details

In response to this:

Bug 1975539: delete hello-openshift in payload imagestream via CVO annotation

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 · 2021-06-24T14:12:04Z

@gabemontero: An error was encountered querying GitHub for users with public email (xiuwang@redhat.com) for bug 1975539 on the Bugzilla server at https://bugzilla.redhat.com. No known errors were detected, please see the full error message for details.

Full error message.


non-200 OK status code: 403 Forbidden body: "{\n  \"documentation_url\": \"https://docs.github.com/en/free-pro-team@latest/rest/overview/resources-in-the-rest-api#abuse-rate-limits\",\n  \"message\": \"You have triggered an abuse detection mechanism. Please wait a few minutes before you try again.\"\n}\n"

Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

Details

In response to this:

Bug 1975539: delete hello-openshift in payload imagestream via CVO annotation

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.

gabemontero · 2021-06-24T14:26:36Z

upgrade failure https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-samples-operator/380/pull-ci-openshift-cluster-samples-operator-master-e2e-aws-upgrade/1408065065768194048 appears unrelated to this change ... failed due to a required secret problem

gabemontero · 2021-06-24T14:46:03Z

aws iam pain with https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-samples-operator/380/pull-ci-openshift-cluster-samples-operator-master-e2e-aws-image-ecosystem/1408065065663336448

gabemontero · 2021-06-24T18:52:49Z

ok nothing yet related to this change with some passing e2e's as well

/retest

xiuwang · 2021-06-25T05:55:01Z

/bugzilla refresh

openshift-ci · 2021-06-25T05:55:05Z

@xiuwang: This pull request references Bugzilla bug 1975539, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @jitendar-singh

Details

In response to this:

/bugzilla refresh

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.

jottofar · 2021-06-25T12:48:58Z

/lgtm

openshift-ci · 2021-06-25T12:49:12Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gabemontero, jottofar

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~~ [gabemontero]

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

openshift-bot · 2021-06-25T12:57:37Z

/retest

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

openshift-bot · 2021-06-25T13:49:36Z

/retest

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

gabemontero · 2021-06-25T14:24:26Z

/lgtm

thanks @jottofar

gabemontero · 2021-06-25T14:26:10Z

other operators besides samples are what are failing the upgrade jobs

gabemontero · 2021-06-25T15:15:54Z

/hold

@jottofar - a question: I pulled up the must-gather from one of the e2e runs and I see the hello-openshift imagestream in the openshift namespace.

That is not the desired result - I was expecting to not see that, with the imagestream getting removed because of the new annotation.

Can you explain?

Here was the must gather I pulled: https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift_cluster-samples-operator/380/pull-ci-openshift-cluster-samples-operator-master-e2e-aws-operator/1408065065743028224/artifacts/e2e-aws-operator/gather-must-gather/artifacts/must-gather.tar

the imagesream:

- apiVersion: image.openshift.io/v1
  kind: ImageStream
  metadata:
    annotations:
      include.release.openshift.io/ibm-cloud-managed: "true"
      include.release.openshift.io/self-managed-high-availability: "true"
      include.release.openshift.io/single-node-developer: "true"
      include.release.openshift.io/single-node-production-edge: "true"
      openshift.io/image.dockerRepositoryCheck: "2021-06-24T14:37:44Z"
      release.openshift.io/delete: "true"
    creationTimestamp: "2021-06-24T14:37:44Z"
    generation: 2
    name: hello-openshift
    namespace: openshift
    resourceVersion: "15123"
    uid: 9ff32845-0222-4b18-96b9-d055fadbbc00
  spec:
    lookupPolicy:
      local: true
    tags:
    - annotations: null
      from:
        kind: DockerImage
        name: quay.io/openshift/origin-hello-openshift:latest
      generation: 2
      importPolicy:
        scheduled: true
      name: latest
      referencePolicy:
        type: Source
  status:
    dockerImageRepository: image-registry.openshift-image-registry.svc:5000/openshift/hello-openshift
    tags:
    - items:
      - created: "2021-06-24T14:37:44Z"
        dockerImageReference: quay.io/openshift/origin-hello-openshift@sha256:cc8f6ac26d8b9a1a027900d3f343b5e12dea2dc8ac1a5c64c1fd8c62ff2a385c
        generation: 2
        image: sha256:cc8f6ac26d8b9a1a027900d3f343b5e12dea2dc8ac1a5c64c1fd8c62ff2a385c
      tag: latest

jottofar · 2021-06-25T15:40:20Z

I was expecting to not see that, with the imagestream getting removed because of the new annotation.

Can you explain? tag: latest

The deletes only happen during an upgrade. So you would need to be upgrading to a build that includes this PR. I can't remember if the -upgrade CI Jobs upgrade to one's PR build but when I checked their CVO logs I did not see the delete occurring. When it does occur searching the CVO log for Delete will turn up relevant logs.

gabemontero · 2021-06-25T17:11:52Z

I was expecting to not see that, with the imagestream getting removed because of the new annotation.
Can you explain? tag: latest

The deletes only happen during an upgrade. So you would need to be upgrading to a build that includes this PR. I can't remember if the -upgrade CI Jobs upgrade to one's PR build but when I checked their CVO logs I did not see the delete occurring. When it does occur searching the CVO log for Delete will turn up relevant logs.

I see .... well, then I think we'll have to abandon this approach then, since we don't want to re-introduce that imagestream just so we can delete it on upgrade.

I'll have to instead add some special case logic to clean up the hello-openshift imagestream to satisfy the report you generated.

I will add a comment in the imagestream manifest that if anything is to be deleted in the future, we go with this annotation ... though there is still the use case of a fresh install at a given level vs. an upgrade.

Interesting conundrum there.

jottofar · 2021-06-25T17:29:38Z

well, then I think we'll have to abandon this approach then, since we don't want to re-introduce that imagestream just so we can delete it on upgrade

No, you're good. CVO will see the Delete annotation and does not create/reconcile the manifest contents so it will not be created on install.
If you want to test it you could use cluster-bot and do a --force upgrade to your PR build.

gabemontero · 2021-06-25T17:49:03Z

@jottofar and I have been chatting in slack and we have in fact found a CVO bug wrt imagestreams and the delete stuff

he'll be addressing that ... once that is in, I'll retest, make sure the hello world imagestream is in fact NOT created and will then unhold

gabemontero · 2021-06-26T12:18:31Z

/skip

gabemontero · 2021-06-28T12:28:22Z

/retest

jottofar · 2021-06-29T12:27:55Z

/retest

gabemontero · 2021-06-29T12:47:58Z

/test e2e-aws-operator

in case the e2e-aws-upgrade fails in such a way that I cannot check the openshift imagestreams to confirm hello-openshift is not present

thanks @jottofar

openshift-ci · 2021-06-29T13:40:34Z

@gabemontero: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/okd-e2e-aws-upgrade	`d94ad97`	link	`/test okd-e2e-aws-upgrade`

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.

gabemontero · 2021-06-29T14:32:29Z

ok hello-openshift was NOT installed in the https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-samples-operator/380/pull-ci-openshift-cluster-samples-operator-master-e2e-aws-operator/1409856204607328256 run

/hold cancel

/retest

openshift-ci · 2021-06-29T17:07:13Z

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

openshift/cluster-samples-operator#380

Bugzilla bug 1975539 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1975539: delete hello-openshift in payload imagestream via CVO annotation

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.

gabemontero · 2021-09-07T15:00:31Z

/cherrypick release-4.7

openshift-cherrypick-robot · 2021-09-07T15:01:12Z

@gabemontero: #380 failed to apply on top of branch "release-4.7":

Applying: delete hello-openshift in payload imagestream via CVO annotation
Using index info to reconstruct a base tree...
M	manifests/08-openshift-imagestreams.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/08-openshift-imagestreams.yaml
CONFLICT (content): Merge conflict in manifests/08-openshift-imagestreams.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 delete hello-openshift in payload imagestream via CVO annotation
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick release-4.7

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.

ART hasn't been building these images since 4.8's a6286e7 (rm hello-openshift, 2021-03-29), with the router/ingress folks pivoting away in openshift/cluster-ingress-operator@8332af2f56 (NE 484: Use ingress-operator subcommand instead of hello-openshift for canary server, 2021-03-18, openshift/cluster-ingress-operator#561). Samples had been installing a hello-openshift ImageStream, but they also got away from that in 2021 with openshift/cluster-samples-operator@d94ad97e49 (delete hello-openshift in payload imagestream via CVO annotation, 2021-06-24, openshift/cluster-samples-operator#380). Origin hasn't entirely gotten out of the hello-openshift business yet [1], but regardless of whether they still have an interest, neither ART nor ingress is involved anymore, and it's been a long time since 4.7 went end-of-life: $ curl -s 'https://access.redhat.com/product-life-cycles/api/v1/products?name=Openshift+Container+Platform+4' | jq -r '.data[].versions[] | select(.name == "4.7").phases[] | .date + " " + .name' 2021-02-24T00:00:00.000Z General availability 2021-10-27T00:00:00.000Z Full support 2022-08-24T00:00:00.000Z Maintenance support N/A Extended update support N/A Extended update support Term 2 N/A Extended life phase So I'm dropping those lines from the mapping. [1]: https://github.com/openshift/origin/tree/94a4d2a6f202f64f89a1b747b44484c358f8299d/examples/hello-openshift

delete hello-openshift in payload imagestream via CVO annotation

d94ad97

openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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 Jun 24, 2021

openshift-ci bot requested a review from xiuwang June 24, 2021 14:10

openshift-ci bot assigned jottofar Jun 24, 2021

openshift-ci bot requested review from adambkaplan and coreydaley June 24, 2021 14:10

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 24, 2021

openshift-ci bot requested a review from jitendar-singh June 25, 2021 05:55

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 25, 2021

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 25, 2021

jottofar mentioned this pull request Jun 25, 2021

Bug 1976307: add ImageStreams manifest delete annotation logic openshift/cluster-version-operator#618

Merged

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 29, 2021

openshift-merge-robot merged commit a0e5d5c into openshift:master Jun 29, 2021

gabemontero deleted the redo-hello-is-removal branch June 29, 2021 21:54

This was referenced Sep 7, 2021

Bug 2001974: delete hello-openshift in payload imagestream via CVO annotation #392

Closed

Bug 2001977: delete hello-openshift in payload imagestream #393

Merged

wking mentioned this pull request May 27, 2025

product: Drop ose-hello-openshift-container mapping openshift-eng/ocp-build-data#6829

Merged

lance5890 mentioned this pull request Jun 5, 2025

OCPBUGS-57298: rm hello-openshift yaml #642

Merged

Bug 1975539: delete hello-openshift in payload imagestream via CVO annotation #380

Bug 1975539: delete hello-openshift in payload imagestream via CVO annotation #380

Uh oh!

Conversation

gabemontero commented Jun 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Jun 24, 2021

Uh oh!

openshift-ci bot commented Jun 24, 2021

Uh oh!

gabemontero commented Jun 24, 2021

Uh oh!

gabemontero commented Jun 24, 2021

Uh oh!

gabemontero commented Jun 24, 2021

Uh oh!

xiuwang commented Jun 25, 2021

Uh oh!

openshift-ci bot commented Jun 25, 2021

Uh oh!

jottofar commented Jun 25, 2021

Uh oh!

openshift-ci bot commented Jun 25, 2021

Uh oh!

openshift-bot commented Jun 25, 2021

Uh oh!

openshift-bot commented Jun 25, 2021

Uh oh!

gabemontero commented Jun 25, 2021

Uh oh!

gabemontero commented Jun 25, 2021

Uh oh!

gabemontero commented Jun 25, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jottofar commented Jun 25, 2021

Uh oh!

gabemontero commented Jun 25, 2021

Uh oh!

jottofar commented Jun 25, 2021

Uh oh!

gabemontero commented Jun 25, 2021

Uh oh!

gabemontero commented Jun 26, 2021

Uh oh!

gabemontero commented Jun 28, 2021

Uh oh!

jottofar commented Jun 29, 2021

Uh oh!

gabemontero commented Jun 29, 2021

Uh oh!

openshift-ci bot commented Jun 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gabemontero commented Jun 29, 2021

Uh oh!

openshift-ci bot commented Jun 29, 2021

Uh oh!

gabemontero commented Sep 7, 2021

Uh oh!

openshift-cherrypick-robot commented Sep 7, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

gabemontero commented Jun 24, 2021 •

edited

Loading

gabemontero commented Jun 25, 2021 •

edited

Loading

openshift-ci bot commented Jun 29, 2021 •

edited

Loading