discourse2fedmsg / fasjson: delete old deploymentconfig and fix selector on fasjson

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

roles/openshift-apps/discourse2fedmsg/templates/deploymentconfig.yml.j2

@@ -1,98 +0,0 @@
----
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
-metadata:
-  labels:
-    app: discourse2fedmsg
-    service: discourse2fedmsg
-  name: discourse2fedmsg
-spec:
-  replicas: 1
-  selector:
-    app: discourse2fedmsg
-    deploymentconfig: discourse2fedmsg
-  strategy:
-    resources: {}
-  template:
-    metadata:
-      labels:
-        app: discourse2fedmsg
-        deploymentconfig: discourse2fedmsg
-    spec:
-      containers:
-      - image: discourse2fedmsg:latest
-        name: discourse2fedmsg
-        env:
-        - name: APP_MODULE
-          value: "deploy.wsgi"
-        - name: FLASK_CONFIG
-          value: "/etc/discourse2fedmsg/discourse2fedmsg.cfg"
-        ports:
-        - containerPort: 8080
-          protocol: TCP
-        volumeMounts:
-        - name: discourse2fedmsg-config-volume
-          mountPath: "/etc/discourse2fedmsg"
-          readOnly: true
-        - name: wsgi-script-volume
-          mountPath: "/opt/app-root/src/deploy"
-          readOnly: true
-        - name: fedora-messaging-config-volume
-          mountPath: "/etc/fedora-messaging"
-          readOnly: true
-        - name: fedora-messaging-ca-volume
-          mountPath: /etc/pki/fedora-messaging/cacert.pem
-          subPath: cacert.pem
-          readOnly: true
-        - name: fedora-messaging-crt-volume
-          mountPath: /etc/pki/fedora-messaging/discourse2fedmsg-cert.pem
-          subPath: discourse2fedmsg-cert.pem
-          readOnly: true
-        - name: fedora-messaging-key-volume
-          mountPath: /etc/pki/fedora-messaging/discourse2fedmsg-key.pem
-          subPath: discourse2fedmsg-key.pem
-          readOnly: true
-        readinessProbe:
-          timeoutSeconds: 10
-          initialDelaySeconds: 5
-          periodSeconds: 60
-          httpGet:
-            path: "/healthz/ready"
-            port: 8080
-        livenessProbe:
-          timeoutSeconds: 10
-          initialDelaySeconds: 3
-          periodSeconds: 60
-          httpGet:
-            path: "/healthz/live"
-            port: 8080
-      volumes:
-      - name: discourse2fedmsg-config-volume
-        configMap:
-          name: discourse2fedmsg-config
-      - name: wsgi-script-volume
-        configMap:
-          name: wsgi-script
-      - name: fedora-messaging-config-volume
-        configMap:
-          name: fedora-messaging-config
-      - name: fedora-messaging-ca-volume
-        secret:
-          secretName: fedora-messaging-ca
-      - name: fedora-messaging-crt-volume
-        secret:
-          secretName: fedora-messaging-crt
-      - name: fedora-messaging-key-volume
-        secret:
-          secretName: fedora-messaging-key
-
-  triggers:
-  - type: ConfigChange
-  - type: ImageChange
-    imageChangeParams:
-      automatic: true
-      containerNames:
-      - discourse2fedmsg
-      from:
-        kind: ImageStreamTag
-        name: discourse2fedmsg:latest

roles/openshift-apps/fasjson/files/service.yml

@@ -12,4 +12,3 @@ spec:
       targetPort: 8080
   selector:
     app: fasjson
-    deployment: fasjson

roles/openshift-apps/fasjson/templates/deploymentconfig.yml.j2

@@ -1,98 +0,0 @@
----
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
-metadata:
-  name: fasjson
-  labels:
-    app: fasjson
-spec:
-  replicas: 1
-  selector:
-    app: fasjson
-    deploymentconfig: fasjson
-  strategy:
-    type: Rolling
-    activeDeadlineSeconds: 21600
-    rollingParams:
-      intervalSeconds: 1
-      maxSurge: 25%
-      maxUnavailable: 25%
-      timeoutSeconds: 600
-      updatePeriodSeconds: 1
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        app: fasjson
-        deploymentconfig: fasjson
-    spec:
-      containers:
-        - name: fasjson
-          imagePullPolicy: Always
-          ports:
-            - containerPort: 8080
-          volumeMounts:
-            - name: keytab-http-volume
-              mountPath: /etc/keytabs/http
-              subPath: http
-              readOnly: true
-            - name: krb-config-volume
-              mountPath: /etc/krb5
-              readOnly: true
-            - name: fasjson-config-volume
-              mountPath: /etc/fasjson
-              readOnly: true
-            - name: ipa-config-volume
-              mountPath: /etc/ipa
-              readOnly: true
-            - name: httpdir
-              mountPath: /httpdir
-            - name: session-key
-              mountPath: /etc/fasjson-secret/session.key
-              subPath: session.key
-              readOnly: true
-          env:
-            - name: FASJSON_CONFIG_PATH
-              value: "/etc/fasjson/fasjson.conf"
-          livenessProbe:
-            timeoutSeconds: 10
-            initialDelaySeconds: 10
-            periodSeconds: 60
-            httpGet:
-              path: /healthz/live
-              port: 8080
-          readinessProbe:
-            timeoutSeconds: 10
-            initialDelaySeconds: 5
-            periodSeconds: 60
-            httpGet:
-              path: /healthz/ready
-              port: 8080
-      volumes:
-        - name: fasjson-config-volume
-          configMap:
-            name: fasjson-config
-        - name: session-key
-          secret:
-            secretName: session-key
-        - name: keytab-http-volume
-          secret:
-            secretName: fasjson-keytab-http
-        - name: krb-config-volume
-          configMap:
-            name: krb5-config
-        - name: ipa-config-volume
-          configMap:
-            name: ipa-client-config
-        - name: httpdir
-          emptyDir: {}
-  triggers:
-    - imageChangeParams:
-        automatic: true
-        containerNames:
-          - fasjson
-        from:
-          kind: ImageStreamTag
-          name: fasjson:latest
-      type: ImageChange
-    - type: ConfigChange