diff --git a/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml b/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml index e1fa18d852..c8a829edf4 100644 --- a/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml +++ b/roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml @@ -2,11 +2,7 @@ apiVersion: v1 kind: BuildConfig metadata: -{% if ocp4 %} name: "coreos-cincinnati" -{% else %} - name: "coreos-cincinnati-stub" -{% endif %} labels: app: "coreos-cincinnati" spec: @@ -31,8 +27,4 @@ spec: output: to: kind: "ImageStreamTag" -{% if ocp4 %} name: "fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_build_git_sha}}" -{% else %} - name: "fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_build_git_sha}}" -{% endif %} diff --git a/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml b/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml index 39fed5ff73..59814ac1de 100644 --- a/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml +++ b/roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml @@ -2,11 +2,7 @@ apiVersion: v1 kind: DeploymentConfig metadata: -{% if ocp4 %} name: coreos-cincinnati -{% else %} - name: coreos-cincinnati-stub -{% endif %} labels: app: coreos-cincinnati spec: @@ -32,11 +28,7 @@ spec: spec: containers: - name: "fcos-graph-builder" -{% if ocp4 %} image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_deploy_git_sha}}" -{% else %} - image: "{{fcos_cincinnati_registry}}:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}" -{% endif %} args: [ "/usr/local/bin/fcos-graph-builder", "-v", @@ -47,11 +39,7 @@ spec: mountPath: "/etc/cincinnati/" readOnly: true - name: "fcos-policy-engine" -{% if ocp4 %} image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_deploy_git_sha}}" -{% else %} - image: "{{fcos_cincinnati_registry}}:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}" -{% endif %} args: [ "/usr/local/bin/fcos-policy-engine", "-v", @@ -66,15 +54,4 @@ spec: configMap: name: "coreos-cincinnati-config-stub" triggers: -{% if ocp4 %} - type: "ConfigChange" -{% else %} - - imageChangeParams: - automatic: true - containerNames: - - "dumnati" - from: - kind: ImageStreamTag - name: "fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}" - type: ImageChange -{% endif %}