Skip to content

Commit

Permalink
ci-search: Search bugzilla
Browse files Browse the repository at this point in the history
Moves ci-search into the ci namespace to access the bugzilla token
  • Loading branch information
smarterclayton committed Mar 19, 2020
1 parent 90f6d54 commit 4c499ee
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 75 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ images:
to: ci-search
promotion:
name: ""
namespace: ci-search
namespace: ci
tag: latest
resources:
'*':
Expand Down
4 changes: 0 additions & 4 deletions core-services/ci-search/admin_01_ns.yaml

This file was deleted.

62 changes: 0 additions & 62 deletions core-services/ci-search/admin_02_rbac.yaml

This file was deleted.

19 changes: 14 additions & 5 deletions core-services/ci-search/deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
kind: ImageStream
apiVersion: image.openshift.io/v1
metadata:
namespace: ci-search
namespace: ci
name: ci-search
spec:
lookupPolicy:
Expand All @@ -12,7 +12,7 @@ spec:
kind: Service
apiVersion: v1
metadata:
namespace: ci-search
namespace: ci
name: search
spec:
selector:
Expand All @@ -25,7 +25,7 @@ spec:
kind: Route
apiVersion: v1
metadata:
namespace: ci-search
namespace: ci
name: search
spec:
host: search.svc.ci.openshift.org
Expand All @@ -40,7 +40,7 @@ spec:
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: ci-search
namespace: ci
name: search
annotations:
image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"ci-search:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"web\")].image"}]'
Expand All @@ -53,10 +53,14 @@ spec:
labels:
app: search
spec:
automountServiceAccountToken: false
volumes:
- name: bugzilla-token
secret:
secretName: bugzilla-credentials-bugzilla.redhat.com
- name: job-config
configMap:
name: job-config
name: ci-search-job-config
- name: cache
emptyDir: {}
containers:
Expand All @@ -67,6 +71,8 @@ spec:
cpu: 100m
memory: 200Mi
volumeMounts:
- name: bugzilla-token
mountPath: /etc/bugzilla/
- name: job-config
mountPath: /etc/ci-search/
- name: cache
Expand All @@ -77,3 +83,6 @@ spec:
- --interval=10m
- --path=/var/lib/ci-search/
- --deck-uri=https://prow.svc.ci.openshift.org
- --bugzilla-url=https://bugzilla.redhat.com/rest
- --bugzilla-token-file=/etc/bugzilla/api
- --bugzilla-search=OPEN version:4.7,4.6,4.5,4.4,4.3 product="OpenShift Container Platform" AND delta_ts>-8w
6 changes: 3 additions & 3 deletions core-services/prow/02_config/_plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1325,11 +1325,11 @@ config_updater:
core-services/ci-search/_config.yaml:
clusters:
app.ci:
- ci-search
- ci
default:
- ci-search
- ci
key: config.yaml
name: job-config
name: ci-search-job-config
core-services/image-mirroring/**/mapping_*:
clusters:
app.ci:
Expand Down

0 comments on commit 4c499ee

Please sign in to comment.