Skip to content

Conversation

@jlebon
Copy link
Member

@jlebon jlebon commented Aug 24, 2018

Closes: #8

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 24, 2018
HACKING.md Outdated
Copy link
Member

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.

Copy link
Member

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?

Copy link
Member Author

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.

Copy link
Contributor

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.

Copy link
Member

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.

Copy link
Contributor

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.

Copy link
Member Author

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.

Copy link
Member

@wking wking left a 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
Copy link
Member

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
Copy link
Member

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
Copy link
Member

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
Copy link
Member

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.

@sdemos
Copy link
Contributor

sdemos commented Aug 29, 2018

last I checked, the installer still creates the old tectonic-node-agent daemonset on rhcos nodes. seems like it could screw up testing if we have something that doesn't understand what system it's operating on trying to stomp on stuff. maybe we should have a step for deleting those resources?

@jlebon
Copy link
Member Author

jlebon commented Sep 4, 2018

OK, updated for comments!

last I checked, the installer still creates the old tectonic-node-agent daemonset on rhcos nodes

Ahh interesting. Is that still the case in git master of the installer? git grep node_agent (or node-agent) doesn't find anything.

@sdemos
Copy link
Contributor

sdemos commented Sep 4, 2018

yeah, it's still true. it's created by the tectonic-utility-operator (https://github.com/coreos-inc/tectonic-operators/tree/master/operator/utility, deployed with this manifest in the installer).

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.

@sdemos
Copy link
Contributor

sdemos commented Sep 4, 2018

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).

@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 Sep 4, 2018
@jlebon
Copy link
Member Author

jlebon commented Sep 4, 2018

Thanks! Now updated to also delete the legacy node agent. ✔️

Copy link
Member

@ashcrow ashcrow left a comment

Choose a reason for hiding this comment

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

LGTM

@jlebon
Copy link
Member Author

jlebon commented Sep 5, 2018

/lgtm

@openshift-ci-robot
Copy link
Contributor

@jlebon: you cannot LGTM your own PR.

Details

In response to this:

/lgtm

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.

@jlebon
Copy link
Member Author

jlebon commented Sep 5, 2018

Thanks for confirming @openshift-ci-robot. Can someone get this merged?

@ashcrow
Copy link
Member

ashcrow commented Sep 5, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 5, 2018
@ashcrow
Copy link
Member

ashcrow commented Sep 5, 2018

/cc @abhinavdahiya

@ashcrow
Copy link
Member

ashcrow commented Sep 10, 2018

/cc @crawford

Copy link
Contributor

@abhinavdahiya abhinavdahiya 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
Copy link
Contributor

[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

Details 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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 10, 2018
@openshift-merge-robot openshift-merge-robot merged commit 632e8d9 into openshift:master Sep 10, 2018
osherdp pushed a commit to osherdp/machine-config-operator that referenced this pull request Apr 13, 2021
…hotloop

protect against hotloop for rhel lack of cred error; add some mutex u…
@jlebon jlebon deleted the pr/add-hacking branch May 1, 2023 15:32
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. retest-not-required-docs-only 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