LOG-1700: Fix ES-Proxy master to version 1.0 #87
Conversation
|
/hold |
|
/assign @igor-karpukhin |
openshift-ci
bot
added
the
do-not-merge/hold
vimalk78
force-pushed
the
es-proxy-v1.0
branch
from
9dc6568
to
d2673aa
Compare
Makefile
Outdated
| @@ -47,7 +47,15 @@ vendor: | |||
| .PHONY: vendor | |||
|
|
|||
| image: | |||
| podman build -f Dockerfile -t $(LOCAL_IMAGE_TAG) . | |||
| CI_CONTAINER_VERSION="v1.0" \ | |||
There was a problem hiding this comment.
Where do we call this target other then as a developer? CI has it's own config which calls make build. That does not seem to trace to this target. What will CPaaS do? Does this need to be moved to maybe the Dockerfile.in?
There was a problem hiding this comment.
CI does not use make build
CI uses specified Dockerfile path https://github.com/openshift/release/blob/master/ci-operator/config/openshift/elasticsearch-proxy/openshift-elasticsearch-proxy-release-5.0.yaml#L63-L70
perhaps this change should go into hack/generate-dockerfile-from-midstream , we should be able to set all variables except commit_id. does CI has a way to capture it?
There was a problem hiding this comment.
moved the change to Dockerfile generation
There was a problem hiding this comment.
CI does not use
make build
CI uses make build via the Dockerfile https://github.com/openshift/elasticsearch-proxy/blob/master/Dockerfile.in#L19 which will call the default target https://github.com/openshift/elasticsearch-proxy/blob/master/Makefile#L30
vimalk78
force-pushed
the
es-proxy-v1.0
branch
4 times, most recently
from
42af31a
to
7b1e110
Compare
Makefile
Outdated
| @@ -2,6 +2,11 @@ export GOROOT=$(shell go env GOROOT) | |||
| export GOFLAGS=-mod=vendor | |||
| export GO111MODULE=on | |||
|
|
|||
| ES_PROXY_MAJOR="1" | |||
There was a problem hiding this comment.
Is there any reason not to add these directly to the Dockerfile.in? There is nothing about the changes where we are calculating version
Parent Task: https://issues.redhat.com/browse/LOG-1635 Make operand images reusable across openshift-logging releases
vimalk78
force-pushed
the
es-proxy-v1.0
branch
from
7b1e110
to
efe83a2
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jcantrill, vimalk78 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 |
openshift-ci
bot
added
the
approved
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
Description
Parent Task: Make operand images reusable across openshift-logging releases
This PR fixes the
masterbranch of ES_Proxy to version "v1.0". Once this is merged, CPaaS Dockerfile wil be changes to reflext the same version./cc
/assign
/cherry-pick
Links