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

Allow setting es-operator-image #549

Merged
merged 3 commits into from
Jul 25, 2019
Merged

Allow setting es-operator-image #549

merged 3 commits into from
Jul 25, 2019

Conversation

kevinearls
Copy link
Contributor

Signed-off-by: Kevin Earls kearls@redhat.com

Allow setting the elasticsearch operator image via an environment variable. This is needed for CI for compatibility testing.

Signed-off-by: Kevin Earls <kearls@redhat.com>
Makefile Outdated
@@ -16,7 +16,8 @@ OPERATOR_VERSION ?= "$(shell git describe --tags)"
STORAGE_NAMESPACE ?= "${shell kubectl get sa default -o jsonpath='{.metadata.namespace}' || oc project -q}"
KAFKA_NAMESPACE ?= "kafka"
ES_OPERATOR_NAMESPACE = openshift-logging
ES_OPERATOR_VERSION = 4.1
ES_OPERATOR_VERSION ?= release-4.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Would it be better to rename as ES_OPERATOR_BRANCH?

@codecov
Copy link

codecov bot commented Jul 25, 2019

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #549   +/-   ##
=======================================
  Coverage   91.98%   91.98%           
=======================================
  Files          69       69           
  Lines        3504     3504           
=======================================
  Hits         3223     3223           
  Misses        196      196           
  Partials       85       85

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 70b053a...d1fb7e5. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 25, 2019

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #549   +/-   ##
=======================================
  Coverage   91.98%   91.98%           
=======================================
  Files          69       69           
  Lines        3504     3504           
=======================================
  Hits         3223     3223           
  Misses        196      196           
  Partials       85       85

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 70b053a...72abb6a. Read the comment docs.

Signed-off-by: Kevin Earls <kearls@redhat.com>
Makefile Outdated
@kubectl apply -f https://raw.githubusercontent.com/openshift/elasticsearch-operator/${ES_OPERATOR_BRANCH}/manifests/02-role.yaml
@kubectl apply -f https://raw.githubusercontent.com/openshift/elasticsearch-operator/${ES_OPERATOR_BRANCH}/manifests/03-role-bindings.yaml
@kubectl apply -f https://raw.githubusercontent.com/openshift/elasticsearch-operator/${ES_OPERATOR_BRANCH}/manifests/04-crd.yaml -n ${ES_OPERATOR_NAMESPACE}
kubectl apply -f https://raw.githubusercontent.com/openshift/elasticsearch-operator/${ES_OPERATOR_BRANCH}/manifests/05-deployment.yaml -n ${ES_OPERATOR_NAMESPACE}
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: Can the @ symbols be added back to this and next line?

Signed-off-by: Kevin Earls <kearls@redhat.com>
@objectiser objectiser merged commit c2f9dbb into jaegertracing:master Jul 25, 2019
@kevinearls kevinearls deleted the enhance-es-operator-deployment branch July 25, 2019 11:40
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