Anitya: Finish migration to Fedora Messaging
Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
parent
5e9a3403fb
commit
062e661b35
3 changed files with 42 additions and 16 deletions
|
@ -50,15 +50,18 @@ items:
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
mountPath: /etc/anitya
|
mountPath: /etc/anitya
|
||||||
readOnly: true
|
readOnly: true
|
||||||
- name: fedmsg-config-volume
|
- name: fedora-messaging-config-volume
|
||||||
mountPath: /etc/fedmsg.d/
|
mountPath: /etc/fedora-messaging
|
||||||
readOnly: true
|
|
||||||
- name: fedmsg-key-volume
|
|
||||||
mountPath: /etc/pki/fedmsg/key
|
|
||||||
readOnly: true
|
|
||||||
- name: fedmsg-crt-volume
|
|
||||||
mountPath: /etc/pki/fedmsg/crt
|
|
||||||
readOnly: true
|
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:
|
readinessProbe:
|
||||||
timeoutSeconds: 1
|
timeoutSeconds: 1
|
||||||
initialDelaySeconds: 5
|
initialDelaySeconds: 5
|
||||||
|
@ -75,15 +78,18 @@ items:
|
||||||
- name: config-volume
|
- name: config-volume
|
||||||
configMap:
|
configMap:
|
||||||
name: release-monitoring-configmap
|
name: release-monitoring-configmap
|
||||||
- name: fedmsg-config-volume
|
- name: fedora-messaging-config-volume
|
||||||
configMap:
|
configMap:
|
||||||
name: fedmsg-configmap
|
name: fedora-messaging-configmap
|
||||||
- name: fedmsg-key-volume
|
# - name: fedmsg-config-volume
|
||||||
secret:
|
# configMap:
|
||||||
secretName: release-monitoring-fedmsg-key
|
# name: fedmsg-configmap
|
||||||
- name: fedmsg-crt-volume
|
# - name: fedmsg-key-volume
|
||||||
secret:
|
# secret:
|
||||||
secretName: release-monitoring-fedmsg-cert
|
# secretName: release-monitoring-fedmsg-key
|
||||||
|
# - name: fedmsg-crt-volume
|
||||||
|
# secret:
|
||||||
|
# secretName: release-monitoring-fedmsg-cert
|
||||||
triggers:
|
triggers:
|
||||||
- imageChangeParams:
|
- imageChangeParams:
|
||||||
automatic: true
|
automatic: true
|
||||||
|
|
|
@ -23,6 +23,8 @@ items:
|
||||||
python3-blinker \
|
python3-blinker \
|
||||||
python3-dateutil \
|
python3-dateutil \
|
||||||
python3-fedmsg \
|
python3-fedmsg \
|
||||||
|
fedora-messaging \
|
||||||
|
python3-fedora-messaging \
|
||||||
python3-flask \
|
python3-flask \
|
||||||
python3-flask-wtf \
|
python3-flask-wtf \
|
||||||
python3-flask-login \
|
python3-flask-login \
|
||||||
|
@ -62,6 +64,8 @@ items:
|
||||||
cp files/anitya_cron.py /usr/local/bin/ && \
|
cp files/anitya_cron.py /usr/local/bin/ && \
|
||||||
pip-3 install . && \
|
pip-3 install . && \
|
||||||
popd && \
|
popd && \
|
||||||
|
pushd anitya_schema && \
|
||||||
|
pip-3 install . && \
|
||||||
rm -rf anitya
|
rm -rf anitya
|
||||||
RUN rm /etc/fedmsg.d/*py
|
RUN rm /etc/fedmsg.d/*py
|
||||||
RUN mkdir /httpdir
|
RUN mkdir /httpdir
|
||||||
|
|
|
@ -214,6 +214,22 @@ items:
|
||||||
WSGIPassAuthorization On
|
WSGIPassAuthorization On
|
||||||
anitya.wsgi: |-
|
anitya.wsgi: |-
|
||||||
from anitya.wsgi import application
|
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
|
- apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue