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 hardcoded fields for parameter substitution configuration in Cluster Loader #17072

Merged
merged 2 commits into from
Dec 21, 2017
Merged

Remove hardcoded fields for parameter substitution configuration in Cluster Loader #17072

merged 2 commits into from
Dec 21, 2017

Conversation

sjug
Copy link
Contributor

@sjug sjug commented Oct 27, 2017

Fixes #17068

This should enable us to remove fatih/structs as a vendor dep as well.

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 27, 2017
@sjug sjug mentioned this pull request Oct 27, 2017
Closed
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 27, 2017
@sjug sjug force-pushed the cl_param_fix branch 2 times, most recently from ed6be30 to 16530ad Compare October 27, 2017 16:17
@danwinship danwinship removed their assignment Oct 27, 2017
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Oct 27, 2017
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 27, 2017
soltysh
soltysh approved these changes Oct 27, 2017
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2017
@sjug
Copy link
Contributor Author

sjug commented Oct 27, 2017

/test cmd

1 similar comment
@sjug
Copy link
Contributor Author

sjug commented Oct 27, 2017

/test cmd

@deads2k
Copy link
Contributor

deads2k commented Oct 30, 2017

Targeted for 3.8?

@sjug
Copy link
Contributor Author

sjug commented Oct 30, 2017 •
edited
Loading

Whenever the soonest we can get it in for ideally @deads2k
Is it too late for 3.7?

@sjug
Copy link
Contributor Author

sjug commented Nov 14, 2017 •
edited
Loading

@deads2k Can we please merge this is soon? There are follow-up PRs that have this as a dependency.

@deads2k
Copy link
Contributor

deads2k commented Nov 14, 2017

@deads2k Can we please merge this is soon? There are follow-up PRs that have this as a dependency.

Well, the queue reopened, but the rebase is in progress and this hits godeps.json.

/approve
/hold

@soltysh I've held for you. Release when you think it is safe.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 14, 2017
@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 14, 2017
@deads2k
Copy link
Contributor

deads2k commented Nov 14, 2017

discussed on irc.

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 14, 2017
@0xmichalis
Copy link
Contributor

/retest

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 27, 2017
@sjug
Copy link
Contributor Author

sjug commented Nov 30, 2017

@soltysh Is this alright?

deads2k
deads2k reviewed Nov 30, 2017
View reviewed changes
Godeps/Godeps.json Outdated
@@ -1557,11 +1557,6 @@
"ImportPath": "github.com/fatih/camelcase",
"Rev": "f6a740d52f961c60348ebb109adde9f4635d7540"
},
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't touch this file

@deads2k
Copy link
Contributor

deads2k commented Nov 30, 2017

glide looks as expected, but we're planning on branching 3.8 early tomorrow.

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 30, 2017
@soltysh soltysh added this to the 3.9.0 milestone Dec 1, 2017
@sjug
Copy link
Contributor Author

sjug commented Dec 11, 2017

Can I please get a LGTM?

@soltysh
Copy link
Contributor

soltysh commented Dec 11, 2017

@sjug this is ok, but now that we're close to landing a reabse any vendor-related changes are on-hold. Ping me after the rebase PR lands (#17576) and I'll push this forward.

@sjug
Copy link
Contributor Author

sjug commented Dec 13, 2017

@soltysh PR landed, please push

@soltysh
Copy link
Contributor

soltysh commented Dec 14, 2017

@deads2k's #17072 (comment) still applies. Drop the Godeps.json change and you're good to go.

@sjug
Copy link
Contributor Author

sjug commented Dec 14, 2017

@soltysh Dropped the Godeps.json change.

@soltysh
Copy link
Contributor

soltysh commented Dec 18, 2017

/retest
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 18, 2017
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, sjug, soltysh

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@soltysh
Copy link
Contributor

soltysh commented Dec 18, 2017

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 18, 2017
@soltysh
Copy link
Contributor

soltysh commented Dec 19, 2017

/retest

1 similar comment
@sjug
Copy link
Contributor Author

sjug commented Dec 19, 2017

/retest

@sjug
Copy link
Contributor Author

sjug commented Dec 19, 2017

[FATAL] Required go binary was not found in $PATH.

Damn I forgot to install go...

@jmencak jmencak mentioned this pull request Dec 20, 2017
Merged
@sjug
Copy link
Contributor Author

sjug commented Dec 20, 2017

/retest

1 similar comment
@soltysh
Copy link
Contributor

soltysh commented Dec 21, 2017

/retest

@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 17072, 17616).

@openshift-merge-robot openshift-merge-robot merged commit f37047b into openshift:master Dec 21, 2017
@openshift-ci-robot
Copy link

@sjug: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install 2277f3d link /test extended_conformance_install
ci/openshift-jenkins/extended_networking_minimal 2277f3d link /test extended_networking_minimal

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

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

@deads2k deads2k deads2k left review comments

@soltysh soltysh soltysh approved these changes

Assignees

@soltysh soltysh

@deads2k deads2k

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. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
v3.9
Development

Successfully merging this pull request may close these issues.
7 participants
@sjug @deads2k @0xmichalis @soltysh @openshift-ci-robot @openshift-merge-robot @danwinship