diff --git a/playbooks/openshift-apps/coreos-ostree-importer.yml b/playbooks/openshift-apps/coreos-ostree-importer.yml index 0ea4596682..24ab7829d3 100644 --- a/playbooks/openshift-apps/coreos-ostree-importer.yml +++ b/playbooks/openshift-apps/coreos-ostree-importer.yml @@ -87,17 +87,10 @@ object_template: buildconfig.yml.j2 object_objectname: buildconfig.yml - - role: openshift/object - object_app: coreos-ostree-importer - object_template: deploymentconfig.yml.j2 - object_objectname: deploymentconfig.yml - when: env == "production" - - role: openshift/object object_app: coreos-ostree-importer object_template: deployment.yml.j2 object_objectname: deployment.yml - when: env == "staging" - role: openshift/object object_app: coreos-ostree-importer diff --git a/roles/openshift-apps/coreos-ostree-importer/templates/deploymentconfig.yml.j2 b/roles/openshift-apps/coreos-ostree-importer/templates/deploymentconfig.yml.j2 deleted file mode 100644 index 9483c45158..0000000000 --- a/roles/openshift-apps/coreos-ostree-importer/templates/deploymentconfig.yml.j2 +++ /dev/null @@ -1,78 +0,0 @@ ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - labels: - app: coreos-ostree-importer - name: coreos-ostree-importer -spec: - replicas: 1 - selector: - app: coreos-ostree-importer - strategy: - resources: {} - template: - metadata: - labels: - app: coreos-ostree-importer - name: coreos-ostree-importer - spec: - containers: - - name: coreos-ostree-importer - # sleep infinity is useful for debugging environment issues - # comment out when not debugging - # args: ['/usr/bin/sleep', 'infinity'] - # command: ['/usr/bin/dumb-init'] - volumeMounts: - - name: fedora-ostree-content-volume - mountPath: /mnt/koji - - name: fedora-messaging-config-volume - mountPath: /etc/fedora-messaging - readOnly: true - - name: fedora-messaging-ca-volume - mountPath: "/etc/pki/fedora-messaging/{{ fedora_messaging_ca_file }}" - subPath: "{{ fedora_messaging_ca_file }}" - readOnly: true - - name: fedora-messaging-crt-volume - mountPath: "/etc/pki/fedora-messaging/{{ fedora_messaging_cert_file }}" - subPath: "{{ fedora_messaging_cert_file }}" - readOnly: true - - name: fedora-messaging-key-volume - mountPath: "/etc/pki/fedora-messaging/{{ fedora_messaging_key_file }}" - subPath: "{{ fedora_messaging_key_file }}" - readOnly: true - image: "" - imagePullPolicy: IfNotPresent - resources: {} - # The files in the ostree volumes are created with group ownership of 263. - # We need to have 263 in our supplemental groups. See https://pagure.io/releng/issue/8811#comment-629051 - securityContext: - supplementalGroups: [263] - volumes: - - name: fedora-ostree-content-volume - persistentVolumeClaim: - claimName: fedora-ostree-content-volume - - name: fedora-messaging-config-volume - configMap: - name: fedora-messaging-configmap - - 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 - restartPolicy: Always - test: false - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - coreos-ostree-importer - from: - kind: ImageStreamTag - name: coreos-ostree-importer-img:latest