-
Notifications
You must be signed in to change notification settings - Fork 462
tree: add basic HACKING.md with section for MCD #28
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
Conversation
HACKING.md
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks to be still accurate even after e155824. The items at the manifest dir level no longer need a namespace, but items within subdirectories look like they still require it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@abhinavdahiya can you double check that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, that commit just removes it for the custom resources since the CRDs are now cluster scoped.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WDYT if we copy valid mcd hacking manifests into examples/** directory. don't want people changing manifests directory.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@abhinavdahiya as in providing a second set in the repo for people to modify? I worry that would cause maintenance burden when a change happened in in the manifests. However, if the instructions note to copy the manifests directory to $LOCATION before editing that would make sense to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 on copy to another location.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I left this out for now. It doesn't seem like a big deal either way? The diff will be tracked by git status, and plus not copying makes it easier to iterate on other fields in the manifests.
wking
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hooray docs :). Just a few minor suggestions...
HACKING.md
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: can you use:
```sh
here? More details on console vs sh for syntax highlighting in openshift/installer#27.
HACKING.md
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: drop "file" from this line? Folks should be able to figure out that /opt/tectonic/node-annotations.json is a file and /etc/machine-config-daemon/ is a directory on their own ;).
HACKING.md
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In fact, you can drop the "Copy /opt/tectonic/node-annotations.json to..." line entirely and use:
2. Run:
```sh
sed s/node-configuration.v1.coreos.com/machineconfiguration.openshift.io/g /opt/tectonic/node-annotations.json >/etc/machine-config-daemon/node-annotations.json
```Then the target file is never on-disk without the substitution.
The hanging indents in my suggestion will also make the command being executed part of this list entry. With your current form, it leaks out:
$ curl -s https://github.com/openshift/machine-config-operator/blob/2da5a0069cd9c72606f9a4ec0035cfeefa1b60d2/HACKING.md | grep -3 'sed -i s/node-'
<li>Create a cluster (e.g. using <a href="https://github.com/openshift/installer/blob/master/Documentation/dev/libvirt-howto.md">libvirt</a>)</li>
<li>Copy <code>/opt/tectonic/node-annotations.json</code> to <code>/etc/machine-config-daemon/</code> file on each node and pass it over this substitution:</li>
</ol>
<pre><code>sed -i s/node-configuration.v1.coreos.com/machineconfiguration.openshift.io/g /etc/machine-config-daemon/node-annotations.json
</code></pre>
<p>The install process will take care of this eventually.</p>
<ol start="3">
HACKING.md
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I'd prefer:
```sh
here too. And also four-space hanging indents for this shell block to keep it under the <li> for point four.
|
last I checked, the installer still creates the old |
2da5a00 to
b1758ea
Compare
|
OK, updated for comments!
Ahh interesting. Is that still the case in git master of the installer? |
|
yeah, it's still true. it's created by the It's probably still a good idea to get rid of it to make sure that there aren't issues, but it occurred to me later that they look for their configurations in different locations, so it will probably just sit there and do nothing since there is nothing to trigger it. |
|
also, I confirmed with the installer team that that utility operator shouldn't recreate the deployments for the node agent if the deployments are deleted manually, so it shouldn't be necessary to kill the utility operator itself (I'll probably kill it on my test cluster anyway though). |
b1758ea to
46e87f1
Compare
|
Thanks! Now updated to also delete the legacy node agent. ✔️ |
ashcrow
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
/lgtm |
|
@jlebon: you cannot LGTM your own PR. DetailsIn response to this:
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. |
|
Thanks for confirming @openshift-ci-robot. Can someone get this merged? |
|
/lgtm |
|
/cc @abhinavdahiya |
|
/cc @crawford |
abhinavdahiya
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya, ashcrow, jlebon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
…hotloop protect against hotloop for rhel lack of cred error; add some mutex u…
Closes: #8