Skip to content
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

Jump to bottom

Remove other older and unsupported content from origin #19262

Merged
merged 7 commits into from
Apr 18, 2018
Merged

Remove other older and unsupported content from origin #19262

merged 7 commits into from
Apr 18, 2018

Conversation

smarterclayton
Copy link
Contributor

@smarterclayton smarterclayton commented Apr 7, 2018 •
edited
Loading

Federation is no longer supported. Cluster capacity is removed in the other prerequisite. Purge the base images down.

Replace origin with origin-control-plane and node with origin node.

Change --image in oc cluster up to mean image format, like ansible. --tag stays the same.

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 7, 2018
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Apr 7, 2018
@smarterclayton
Copy link
Contributor Author

Will probably wait until #19261 is merged, but required for 3.10 in order to get the renames (I can break out those changes if necessary).

Once this is merged we can change ansible to use the new names.

@smarterclayton
Copy link
Contributor Author

@sdodson @derekwaynecarr fyi

Scott, note that I am removing all of the old master services, and a bunch of unused node cruft. I'd like to fixup the node stuff so that it is correct for all deployments, but not quite there yet (it's going to be broken the moment we split out the node).

@smarterclayton
Copy link
Contributor Author

/test integration

@smarterclayton smarterclayton force-pushed the cleanup_2 branch 3 times, most recently from 0a46564 to 65e7c6a Compare April 12, 2018 16:22
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: smarterclayton

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@sdodson
Copy link
Member

sdodson commented Apr 16, 2018

/retest

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 17, 2018
@smarterclayton
Copy link
Contributor Author

@mfojtik this contains a change to oc cluster up to make --image behave like --imageformat, not like a prefix. We are dropping support for the prefix across all components because of changes in how we're going to do CI, the move to use quay, and making openshift-ansible consistent. This PR removes all non-compliant names in the origin repo, and anything that is required to be part of cluster up and tested as a unit with a cluster install must be in the standard image format. Please review your part (this is blocking OCP because we've already made the renames there).

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 17, 2018
@smarterclayton
Copy link
Contributor Author

/retest

1 similar comment
@smarterclayton
Copy link
Contributor Author

/retest

@smarterclayton
Copy link
Contributor Author

/test extended_conformance_install

@sdodson sdodson mentioned this pull request Apr 17, 2018
Merged
@smarterclayton
Copy link
Contributor Author

/retest

@smarterclayton smarterclayton added the lgtm Indicates that a PR is ready to be merged. label Apr 18, 2018
@smarterclayton
Purge old and unused examples
1dfbdf9 
All of the referenced content is no longer used

* Remove system services for master - this is not supported
* Remove unused contrib files
* Remove old examples
* Remove hello-openshift

Future changes can remove / alter the other node services.
@smarterclayton
Remove federation from origin
f00f810
@smarterclayton
Rename base origin images and remove unused content
0dd91e2 
We drop openvswitch, rename node to origin-node, and remove system
container support for anything except node.
@smarterclayton
Remove node.service from RPM content
2113900
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 18, 2018
@smarterclayton
Copy link
Contributor Author

/retest

@sdodson
Copy link
Member

sdodson commented Apr 18, 2018

/test gcp

@smarterclayton
Copy link
Contributor Author

/test all

@sdodson
Copy link
Member

sdodson commented Apr 18, 2018

GCP job looks like a flake, go ahead and get this in?

@smarterclayton
Copy link
Contributor Author

Yeah wanted one more run then will merge

@smarterclayton smarterclayton added the lgtm Indicates that a PR is ready to be merged. label Apr 18, 2018
@openshift-merge-robot openshift-merge-robot merged commit fedbc3b into openshift:master Apr 18, 2018
@nak3
Copy link
Contributor

nak3 commented Apr 19, 2018

It looks like test/cmd/newapp.sh started failing because https://raw.githubusercontent.com/openshift/origin/master/examples/wordpress/template/wordpress-mysql.json, which is deleted by this PR, is pointed by the script.

origin/test/cmd/newapp.sh

Line 516 in fedbc3b

os::cmd::expect_success 'oc new-app https://raw.githubusercontent.com/openshift/origin/master/examples/wordpress/template/wordpress-mysql.json --dry-run'

@nak3 nak3 mentioned this pull request Apr 19, 2018
Closed
@bparees
Copy link
Contributor

bparees commented Apr 19, 2018

Fun, this pr burned the bridge behind it.

@bparees
Copy link
Contributor

bparees commented Apr 19, 2018

fixing the test here: #19421

@smarterclayton
Copy link
Contributor Author

smarterclayton commented Apr 19, 2018 via email

@wozniakjan wozniakjan mentioned this pull request May 11, 2018
Closed
adammhaile pushed a commit to openshift-eng/ocp-build-data that referenced this pull request Oct 31, 2018
@jupierce
Removing federation services based on origin PR
79752c0 
openshift/origin#19262
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aveshagarwal aveshagarwal Awaiting requested review from aveshagarwal

@hodovska hodovska Awaiting requested review from hodovska

Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@smarterclayton @openshift-ci-robot @sdodson @nak3 @bparees @openshift-bot @openshift-merge-robot