Skip to content

Commit 3c4cbbf

Browse files
committed
Cleanup eventrouter build task
Signed-off-by: Vitalii Parfonov <[email protected]>
1 parent 8b3363c commit 3c4cbbf

File tree

3 files changed

+2
-38
lines changed

3 files changed

+2
-38
lines changed

hack/build-images.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ if [ "${USE_IMAGE_STREAM:-false}" = true ] ; then
247247
-f hack/templates/dev-builds.yaml | \
248248
oc -n openshift create -f -
249249
# wait for is and bc
250-
names="elasticsearch${name_suf:-} kibana${name_suf:-} fluentd curator5 eventrouter"
250+
names="elasticsearch${name_suf:-} kibana${name_suf:-} fluentd curator5"
251251
for ii in $(seq 1 10) ; do
252252
notfound=
253253
for obj in $names ; do
@@ -280,7 +280,7 @@ fi
280280
# subdir, and name the image something/logging-fluentd:${tag}
281281
REPO_IMAGE_LIST="${REPO_IMAGE_LIST:-fluentd logging-fluentd elasticsearch logging-elasticsearch${name_suf:-} \
282282
kibana logging-kibana${name_suf:-} curator logging-curator${name_suf:-} \
283-
eventrouter logging-eventrouter logging-ci-test-runner logging-ci-test-runner}"
283+
logging-ci-test-runner logging-ci-test-runner}"
284284

285285
if [ "${PUSH_ONLY:-false}" = false ] ; then
286286
dir=""
@@ -340,7 +340,6 @@ login_to_registry "127.0.0.1:${LOCAL_PORT}"
340340

341341
for image in "${tag_prefix}logging-fluentd" "${tag_prefix}logging-elasticsearch${name_suf:-}" \
342342
"${tag_prefix}logging-kibana${name_suf:-}" "${tag_prefix}logging-curator${name_suf:-}" \
343-
"${tag_prefix}logging-eventrouter" \
344343
"openshift/logging-ci-test-runner" ; do
345344
remote_image="127.0.0.1:${REGISTRY_PORT}/$image"
346345

hack/push-release.sh

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ images=(
3737
${PREFIX}logging-fluentd
3838
${PREFIX}logging-elasticsearch6
3939
${PREFIX}logging-kibana6
40-
${PREFIX}logging-eventrouter
4140
)
4241

4342
PUSH_OPTS=""

hack/templates/dev-builds.yaml

-34
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ objects:
3838
build: logging-curator5
3939
name: logging-curator5
4040
spec: {}
41-
- apiVersion: v1
42-
kind: ImageStream
43-
metadata:
44-
labels:
45-
build: logging-eventrouter
46-
name: logging-eventrouter
47-
spec: {}
4841
- apiVersion: v1
4942
kind: ImageStream
5043
metadata:
@@ -150,33 +143,6 @@ objects:
150143
type: Docker
151144
triggers:
152145
- type: ConfigChange
153-
- apiVersion: v1
154-
kind: BuildConfig
155-
metadata:
156-
labels:
157-
build: logging-eventrouter
158-
name: logging-eventrouter
159-
spec:
160-
output:
161-
to:
162-
kind: ImageStreamTag
163-
name: logging-eventrouter:latest
164-
resources: {}
165-
source:
166-
git:
167-
uri: ${LOGGING_FORK_URL}
168-
ref: ${LOGGING_FORK_BRANCH}
169-
contextDir: eventrouter
170-
type: Git
171-
strategy:
172-
dockerStrategy:
173-
dockerfilePath: Dockerfile.centos7
174-
from:
175-
kind: DockerImage
176-
name: openshift/origin-release:golang-1.10
177-
type: Docker
178-
triggers:
179-
- type: ConfigChange
180146
- apiVersion: v1
181147
kind: BuildConfig
182148
metadata:

0 commit comments

Comments
 (0)