Bug 1766287: Use httpd in workload YAML templates#8459

Merged

openshift-merge-robot merged 1 commit into

openshift:masterfrom

spadgett:httpd-sample-image

Mar 26, 2021

spadgett commented Mar 24, 2021

Member

Use the httpd sample image in place of hello-openshift in our YAML templates. This requires that the sample images are imported on the cluster to run successfully.

This is a better example as it runs a real web server and will show the Apache test page if exposed by a route.

/cc @smarterclayton

openshift-ci-robot requested a review from smarterclayton

March 24, 2021 18:51

openshift-ci-robot added the bugzilla/severity-high label

openshift-ci-robot commented Mar 24, 2021

Contributor

@spadgett: This pull request references Bugzilla bug 1766287, 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.8.0) matches configured target release for branch (4.8.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @djslavens

Details

In response to this:

Bug 1766287: Use httpd in workload YAML templates

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-robot added the bugzilla/valid-bug label

openshift-ci-robot requested a review from djslavens

March 24, 2021 18:51

openshift-ci-robot added component/core approved labels

spadgett commented Mar 24, 2021

Member Author

/hold

openshift-ci-robot added the do-not-merge/hold label

spadgett commented Mar 24, 2021

Member Author

/hold cancel

openshift-ci-robot removed the do-not-merge/hold label

spadgett commented Mar 24, 2021

Member Author

/assign @rhamilto @jcaianirh

openshift-ci-robot assigned jcaianirh and rhamilto

rhamilto commented Mar 24, 2021

Member

It looks like quite a few tests are using openshift/hello-openshift. Do we want to update those, too?

smarterclayton mentioned this pull request

hello-openshift: fix build with 1.16 openshift/origin#26014

Closed

yselkowitz commented Mar 24, 2021

Contributor

It looks like quite a few tests are using openshift/hello-openshift. Do we want to update those, too?

Yes, we need to purge all usage of hello-openshift, but that may be okay for a separate PR.

spadgett commented Mar 24, 2021

Member Author

It looks like quite a few tests are using openshift/hello-openshift. Do we want to update those, too?

I believe it's almost all mock data. There is one test for Deploy Image that deploys hello-openshift from quay. I'll look more closely tomorrow.

spadgett force-pushed the httpd-sample-image branch from 4366ec7 to 92e851d Compare

March 24, 2021 23:29


          Bug 1766287: Use httpd in workload YAML templates

f53efe3

Use the httpd sample image in place of hello-openshift in our YAML
templates. This requires that the sample images are imported on the
cluster to run successfully.

spadgett force-pushed the httpd-sample-image branch from 92e851d to f53efe3 Compare

March 25, 2021 14:50

spadgett commented Mar 25, 2021

Member Author

@rhamilto @yselkowitz OK, I removed references to hello-openshift from the core console integration tests. I also updated the YAML sample for ConsoleQuickStart to no longer reference it. Hopefully this passes CI.

I'll work with the plugin teams to remove references from plugin integration tests. There are many references in mock data as well, but those should be OK. I think any additional changes will need to be in follow up PRs given the number of references.

@rhamilto Another look?

rhamilto approved these changes

View reviewed changes

rhamilto left a comment

Member

/lgtm

openshift-ci-robot added the lgtm label

openshift-ci-robot commented Mar 25, 2021

Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhamilto, spadgett

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:

~~frontend/OWNERS~~ [rhamilto,spadgett]

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

openshift-bot commented Mar 25, 2021

Contributor

/retest

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

4 similar comments

openshift-bot commented Mar 25, 2021

Contributor

/retest

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

openshift-bot commented Mar 25, 2021

Contributor

/retest

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

openshift-bot commented Mar 25, 2021

Contributor

/retest

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

openshift-bot commented Mar 25, 2021

Contributor

/retest

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

openshift-merge-robot merged commit 9a4bb71 into openshift:master

openshift-ci-robot commented Mar 26, 2021

Contributor

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

Bugzilla bug 1766287 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1766287: Use httpd in workload YAML templates

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.

yselkowitz added a commit to yselkowitz/cluster-samples-operator that referenced this pull request


          Remove hello-openshift imagestream

86fd0f8

All consumers have been moved to other images:

openshift/cluster-ingress-operator#561
openshift/console#8459

spadgett deleted the httpd-sample-image branch

March 26, 2021 14:15

spadgett added this to the v4.8 milestone

gabemontero commented Sep 16, 2021

hey @spadgett - would you be amenable to backporting this and the other related PRs for this BZ to 4.7?

On the samples side, we've had some tricky edge cases come up with the CVO creating the in payload hello-openshift imagestream during 4.6 to 4.7 upgrades when other features like disconnected, mirroring, and global image config for allowed / blocked registries.

To help minimize the impact of ^^, I'd like to backport the removal of the hello-openshift imagestream to 4.7 (where it was introduced) with openshift/cluster-samples-operator#393 since its introduction was already marked as a mistake so to speak.

But certainly I don't want to break the 4.7 console where it still references that imagestream.

spadgett commented Sep 16, 2021

Member Author

/cherry-pick relase-4.7

openshift-cherrypick-robot commented Sep 16, 2021

@spadgett: cannot checkout relase-4.7: error checking out relase-4.7: exit status 1. output: error: pathspec 'relase-4.7' did not match any file(s) known to git

Details

In response to this:

/cherry-pick relase-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.

spadgett commented Sep 16, 2021

Member Author

/cherry-pick release-4.7

openshift-cherrypick-robot mentioned this pull request

[release-4.7] Bug 2004946: Use httpd in workload YAML templates #10089

Merged

openshift-cherrypick-robot commented Sep 16, 2021

@spadgett: new pull request created: #10089

Details

In response to this:

/cherry-pick 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved bugzilla/severity-high bugzilla/valid-bug component/core lgtm