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

Add deploy clean target and rename es/cass to deploy- #149

Merged
merged 3 commits into from
Dec 4, 2018

Conversation

pavolloffay
Copy link
Member

Signed-off-by: Pavol Loffay ploffay@redhat.com

@jpkrohling
Copy link
Contributor

This change is Reviewable

Makefile Outdated
@@ -81,20 +81,26 @@ run: crd
run-openshift: crd
@bash -c 'trap "exit 0" INT; OPERATOR_NAME=${OPERATOR_NAME} KUBERNETES_CONFIG=${KUBERNETES_CONFIG} WATCH_NAMESPACE=${WATCH_NAMESPACE} go run -ldflags ${LD_FLAGS} main.go start --platform=openshift'

.PHONY: es
es:
@kubectl create -f ./test/elasticsearch.yml 2>&1 | grep -v "already exists" || true
Copy link
Member Author

Choose a reason for hiding this comment

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

This was not grepping anything.

@codecov
Copy link

codecov bot commented Dec 3, 2018

Codecov Report

Merging #149 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #149   +/-   ##
=======================================
  Coverage   96.21%   96.21%           
=======================================
  Files          28       28           
  Lines        1267     1267           
=======================================
  Hits         1219     1219           
  Misses         37       37           
  Partials       11       11

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 43bcee3...124a204. Read the comment docs.

Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

Reviewed 3 of 3 files at r1.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @pavolloffay)


CONTRIBUTING.adoc, line 130 at r1 (raw file):

[source,bash]
----
make deploy-es

Why this change? make es is so much easier to type than make deploy-es...


Makefile, line 86 at r1 (raw file):

.PHONY: es
es:
	@kubectl create -f ./test/elasticsearch.yml 2>&1 | grep -v "already exists" || true

When running make es twice, this is shown in the second time when the output isn't redirected and grep -v isn't used:

$ make es
Error from server (AlreadyExists): error when creating "./test/elasticsearch.yml": statefulsets.apps "elasticsearch" already exists
Error from server (AlreadyExists): error when creating "./test/elasticsearch.yml": services "elasticsearch" already exists
make: *** [Makefile:86: es] Error 1

With the two parts, there's no output. In pretty much all cases, I don't care about this error message, all I care is that I end up with an ES instance. In that sense, the message is distracting.

@pavolloffay
Copy link
Member Author

make deploy- makes it clear that it explicit what it does. Make es looks ambiguous to me.

@pavolloffay
Copy link
Member Author

I have reverted back grep part

Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r2.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @pavolloffay)

a discussion (no related file):
I welcome the clean target, but I don't think we need new names for the other ones. If we see people being confused about what the es/cassandra/ingress targets do, we can then consider adding a deploy- prefix. Otherwise, let's keep the simpler version.


@pavolloffay
Copy link
Member Author

. If we see people being confused about what the es/cassandra/ingress targets do, we can then consider adding a deploy- prefix. Otherwise, let's keep the simpler version.

I was the first one confused by these targets. I thought you compile Cassandra here!@ 😨

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
A
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
@pavolloffay
Copy link
Member Author

updated to your preference

Copy link
Contributor

@jpkrohling jpkrohling left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 3 files at r3.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@jpkrohling jpkrohling merged commit 96d9c20 into jaegertracing:master Dec 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants