diff --git a/roles/openshift-apps/librariesio2fedmsg/files/buildconfig.yml b/roles/openshift-apps/librariesio2fedmsg/files/buildconfig.yml index 272e6bec66..66347b9b52 100644 --- a/roles/openshift-apps/librariesio2fedmsg/files/buildconfig.yml +++ b/roles/openshift-apps/librariesio2fedmsg/files/buildconfig.yml @@ -1,35 +1,5 @@ apiVersion: v1 items: -- apiVersion: v1 - kind: BuildConfig - metadata: - labels: - build: fedmsg-relay - name: fedmsg-relay-docker-build - spec: - runPolicy: Serial - source: - dockerfile: |- - FROM fedora:27 - LABEL \ - name="fedmsg-relay" \ - vendor="Fedora Infrastructure" \ - license="MIT" - RUN dnf -y --enablerepo updates-testing update && \ - dnf -y --enablerepo updates-testing install --setopt=tsflags=nodocs python3-fedmsg && \ - dnf clean all - RUN rm /etc/fedmsg.d/*.py - ENV USER=fedmsg-relay - EXPOSE 9940 - EXPOSE 4001 - ENTRYPOINT fedmsg-relay-3 - type: Dockerfile - strategy: - type: Docker - output: - to: - kind: ImageStreamTag - name: fedmsg-relay:latest - apiVersion: v1 kind: BuildConfig metadata: @@ -46,7 +16,7 @@ items: vendor="Fedora Infrastructure" \ license="MIT" RUN dnf -y --enablerepo updates-testing update && \ - dnf -y --enablerepo updates-testing install --setopt=tsflags=nodocs \ + dnf -y --enablerepo updates-testing install \ git \ python3-pip \ python3-fedmsg \ diff --git a/roles/openshift-apps/librariesio2fedmsg/files/deploymentconfig.yml b/roles/openshift-apps/librariesio2fedmsg/files/deploymentconfig.yml index 0a298f7690..bd8a34ed17 100644 --- a/roles/openshift-apps/librariesio2fedmsg/files/deploymentconfig.yml +++ b/roles/openshift-apps/librariesio2fedmsg/files/deploymentconfig.yml @@ -43,33 +43,6 @@ items: - name: fedmsg-crt-volume mountPath: /etc/pki/fedmsg/crt readOnly: true - - name: fedmsg-relay - image: librariesio2fedmsg/fedmsg-relay:latest - livenessProbe: - failureThreshold: 3 - periodSeconds: 10 - successThreshold: 1 - tcpSocket: - port: 9940 - timeoutSeconds: 3 - ports: - - containerPort: 9940 - protocol: TCP - - containerPort: 4001 - protocol: TCP - readinessProbe: - failureThreshold: 3 - initialDelaySeconds: 1 - periodSeconds: 10 - successThreshold: 1 - tcpSocket: - port: 9940 - timeoutSeconds: 5 - resources: {} - volumeMounts: - - name: fedmsg-config-volume - mountPath: /etc/fedmsg.d/ - readOnly: true volumes: - name: fedmsg-config-volume configMap: diff --git a/roles/openshift-apps/librariesio2fedmsg/files/imagestream.yml b/roles/openshift-apps/librariesio2fedmsg/files/imagestream.yml index 8f9925de4c..ee14e0098d 100644 --- a/roles/openshift-apps/librariesio2fedmsg/files/imagestream.yml +++ b/roles/openshift-apps/librariesio2fedmsg/files/imagestream.yml @@ -1,11 +1,5 @@ apiVersion: v1 items: -- apiVersion: v1 - kind: ImageStream - metadata: - name: fedmsg-relay - labels: - build: fedmsg-relay - apiVersion: v1 kind: ImageStream metadata: