diff --git a/playbooks/openshift-apps/coreos-cincinnati.yml b/playbooks/openshift-apps/coreos-cincinnati.yml index 837581e0ae..26f80d2055 100644 --- a/playbooks/openshift-apps/coreos-cincinnati.yml +++ b/playbooks/openshift-apps/coreos-cincinnati.yml @@ -52,17 +52,10 @@ object_template: config-stub.yml object_objectname: config-stub.yml - - role: openshift/object - object_app: coreos-cincinnati - object_template: deploymentconfig.yml - object_objectname: deploymentconfig.yml - when: env == "production" - - role: openshift/object object_app: coreos-cincinnati object_template: deployment.yml.j2 object_objectname: deployment.yml - when: env == "staging" - role: openshift/rollout rollout_app: coreos-cincinnati diff --git a/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml b/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml deleted file mode 100644 index 465109e077..0000000000 --- a/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml +++ /dev/null @@ -1,67 +0,0 @@ ---- -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig -metadata: - labels: - app: coreos-cincinnati - name: coreos-cincinnati -spec: - replicas: 1 - selector: - app: coreos-cincinnati - strategy: - activeDeadlineSeconds: 21600 - recreateParams: - timeoutSeconds: 600 - resources: {} - rollingParams: - intervalSeconds: 1 - maxSurge: 25% - maxUnavailable: 25% - timeoutSeconds: 600 - updatePeriodSeconds: 1 - type: Rolling - template: - metadata: - labels: - app: coreos-cincinnati - name: coreos-cincinnati - spec: - containers: - - name: fcos-graph-builder - image: "" - args: [ - "/usr/local/bin/fcos-graph-builder", - "-v", - "-c", "/etc/cincinnati/graph-builder.toml", - ] - volumeMounts: - - name: stub-config - mountPath: /etc/cincinnati/ - readOnly: true - - name: fcos-policy-engine - image: "" - args: [ - "/usr/local/bin/fcos-policy-engine", - "-v", - "-c", "/etc/cincinnati/policy-engine.toml", - ] - volumeMounts: - - name: stub-config - mountPath: /etc/cincinnati/ - readOnly: true - volumes: - - name: stub-config - configMap: - name: coreos-cincinnati-config-stub - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - fcos-graph-builder - - fcos-policy-engine - from: - kind: ImageStreamTag - name: coreos-cincinnati-img:latest