Anitya: Finish migration to Fedora Messaging

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
Michal Konečný 2019-02-21 11:05:32 +01:00
parent 5e9a3403fb
commit 062e661b35
3 changed files with 42 additions and 16 deletions

View file

@ -50,15 +50,18 @@ items:
- name: config-volume
mountPath: /etc/anitya
readOnly: true
- name: fedmsg-config-volume
mountPath: /etc/fedmsg.d/
readOnly: true
- name: fedmsg-key-volume
mountPath: /etc/pki/fedmsg/key
readOnly: true
- name: fedmsg-crt-volume
mountPath: /etc/pki/fedmsg/crt
- name: fedora-messaging-config-volume
mountPath: /etc/fedora-messaging
readOnly: true
# - name: fedmsg-config-volume
# mountPath: /etc/fedmsg.d/
# readOnly: true
# - name: fedmsg-key-volume
# mountPath: /etc/pki/fedmsg/key
# readOnly: true
# - name: fedmsg-crt-volume
# mountPath: /etc/pki/fedmsg/crt
# readOnly: true
readinessProbe:
timeoutSeconds: 1
initialDelaySeconds: 5
@ -75,15 +78,18 @@ items:
- name: config-volume
configMap:
name: release-monitoring-configmap
- name: fedmsg-config-volume
- name: fedora-messaging-config-volume
configMap:
name: fedmsg-configmap
- name: fedmsg-key-volume
secret:
secretName: release-monitoring-fedmsg-key
- name: fedmsg-crt-volume
secret:
secretName: release-monitoring-fedmsg-cert
name: fedora-messaging-configmap
# - name: fedmsg-config-volume
# configMap:
# name: fedmsg-configmap
# - name: fedmsg-key-volume
# secret:
# secretName: release-monitoring-fedmsg-key
# - name: fedmsg-crt-volume
# secret:
# secretName: release-monitoring-fedmsg-cert
triggers:
- imageChangeParams:
automatic: true

View file

@ -23,6 +23,8 @@ items:
python3-blinker \
python3-dateutil \
python3-fedmsg \
fedora-messaging \
python3-fedora-messaging \
python3-flask \
python3-flask-wtf \
python3-flask-login \
@ -62,6 +64,8 @@ items:
cp files/anitya_cron.py /usr/local/bin/ && \
pip-3 install . && \
popd && \
pushd anitya_schema && \
pip-3 install . && \
rm -rf anitya
RUN rm /etc/fedmsg.d/*py
RUN mkdir /httpdir

View file

@ -214,6 +214,22 @@ items:
WSGIPassAuthorization On
anitya.wsgi: |-
from anitya.wsgi import application
- apiVersion: v1
kind: ConfigMap
metadata:
name: fedora-messaging-configmap
labels:
app: release-monitoring
data:
config.toml: |-
amqp_url = "amqps://messaging-bridge{{ env_suffix }}.fedoraproject.org:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub"
# Until we have certificates it is better to just comment this
#[tls]
#ca_cert = "/etc/pki/rabbitmq/ca/rabbitmq-ca.crt"
#keyfile = "/etc/pki/rabbitmq/key/rabbitmq-fedmsg-migration-tools.key"
#certfile = "/etc/pki/rabbitmq/crt/rabbitmq-fedmsg-migration-tools.crt"
- apiVersion: v1
kind: ConfigMap
metadata: