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

Fix doc for operator-sdk command & make generate now must be explicit #272

Merged
merged 3 commits into from
Feb 21, 2023

Conversation

jotak
Copy link
Member

@jotak jotak commented Feb 17, 2023

When using makefile commands, operator-sdk now is downloaded to bin; not all docs were updated when this change was made, fixing it

@jotak jotak added no-qe This PR doesn't necessitate QE approval no-doc This PR doesn't require documentation change on the NetObserv operator labels Feb 17, 2023
@msherif1234
Copy link
Contributor

msherif1234 commented Feb 17, 2023

this doesn't work if operator-sdk in your path, in that case it will never get installed at ./bin

@jotak
Copy link
Member Author

jotak commented Feb 17, 2023

/hold
To make it correctly I also need to change the Makefile so that it doesn't rely on operator-sdk in path

@jotak jotak changed the title [trivial] fix doc for operator-sdsk commands Fix doc for operator-sdk command & make generate now must be explicit Feb 20, 2023
BIN_DIR := bin
TOOLS_DIR := hack/tools
TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/$(BIN_DIR))
BIN_DIR := $(abspath bin)
Copy link
Member Author

Choose a reason for hiding this comment

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

cc @msherif1234 we already had all our executable tools in ./bin (e.g. operator-sdk ...) , so this is moving conversion-gen to the same place to avoid too much fragmentation

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure make sense

Makefile Outdated
GO_INSTALL := ./scripts/go_install.sh
CONVERSION_GEN_VER := v0.25.0
CONVERSION_GEN_BIN := conversion-gen
# We are intentionally using the binary without version suffix, to avoid the version
# in generated files.
CONVERSION_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN))
CONVERSION_GEN := $(abspath $(BIN_DIR)/$(CONVERSION_GEN_BIN))
Copy link
Contributor

Choose a reason for hiding this comment

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

BIN_DIR is already made absolute on line 114 so no need to do it again here.
CONVERSION_GEN := $(BIN_DIR)/$(CONVERSION_GEN_BIN)

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@msherif1234
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Feb 21, 2023
@jotak
Copy link
Member Author

jotak commented Feb 21, 2023

thanks,
/approve

@openshift-ci
Copy link

openshift-ci bot commented Feb 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jotak

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-merge-robot openshift-merge-robot merged commit 3bce86d into netobserv:main Feb 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm no-doc This PR doesn't require documentation change on the NetObserv operator no-qe This PR doesn't necessitate QE approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants