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.

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

up: write static pod definitions on --write-config #19338

Merged
merged 1 commit into from
Apr 17, 2018

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Apr 13, 2018

/cc @deads2k
/cc @pweil-

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 13, 2018
@mfojtik mfojtik force-pushed the up-01-write-config branch 2 times, most recently from 88d266f to 2040ac9 Compare April 13, 2018 11:19
@mfojtik
Copy link
Contributor Author

mfojtik commented Apr 13, 2018

/retest

centos mirrors...

@@ -139,6 +127,18 @@ func (c *ClusterUpConfig) StartSelfHosted(out io.Writer) error {
}
}

// if we're supposed to write the config, we'll do that and then exit
Copy link
Contributor

Choose a reason for hiding this comment

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

Rather than re-ordering here, can we move the static pod creation to the BuildConfig method, since we're treating it as config?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good idea, moved.

@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 Apr 13, 2018
substitutions["ETCD_VOLUME"] = `hostPath:
path: ` + c.HostDataDir + "\n"
}
for _, staticPodLocation := range staticPodLocations {
Copy link
Contributor

Choose a reason for hiding this comment

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

you dropped the log statement here, maybe intentionally

Copy link
Contributor Author

Choose a reason for hiding this comment

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

unintentionally, good catch, added it back.

@deads2k
Copy link
Contributor

deads2k commented Apr 16, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 16, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, mfojtik

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

@openshift-bot
Copy link
Contributor

/retest

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

@0xmichalis
Copy link
Contributor

/retest

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 221863f into openshift:master Apr 17, 2018
@mfojtik mfojtik deleted the up-01-write-config branch September 5, 2018 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants