Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

openshift-apps/coreos-cincinnati: cleanups for ocp4

Browse source
This commit is contained in:
Luca BRUNO 2022-05-02 09:38:26 +00:00
parent 8069541edc
commit 0c1045d683
No known key found for this signature in database
GPG key ID: A9834A2252078E4E
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/openshift-apps/coreos-cincinnati/templates/buildconfig-stub.yml
View file

@ -2,7 +2,11 @@
apiVersion: v1 apiVersion: v1
kind: BuildConfig kind: BuildConfig
metadata: metadata:
{% if ocp4 %}
name: "coreos-cincinnati"
{% else %}
name: "coreos-cincinnati-stub" name: "coreos-cincinnati-stub"
{% endif %}
labels: labels:
app: "coreos-cincinnati" app: "coreos-cincinnati"
spec: spec:
@ -27,4 +31,8 @@ spec:
output: output:
to: to:
kind: "ImageStreamTag" 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}}" name: "fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_build_git_sha}}"
{% endif %}

8
roles/openshift-apps/coreos-cincinnati/templates/deploymentconfig.yml
View file

@ -2,7 +2,11 @@
apiVersion: v1 apiVersion: v1
kind: DeploymentConfig kind: DeploymentConfig
metadata: metadata:
{% if ocp4 %}
name: coreos-cincinnati
{% else %}
name: coreos-cincinnati-stub name: coreos-cincinnati-stub
{% endif %}
labels: labels:
app: coreos-cincinnati app: coreos-cincinnati
spec: spec:
@ -29,7 +33,7 @@ spec:
containers: containers:
- name: "fcos-graph-builder" - name: "fcos-graph-builder"
{% if ocp4 %} {% if ocp4 %}
image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}" image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_deploy_git_sha}}"
{% else %} {% else %}
image: "{{fcos_cincinnati_registry}}:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}" image: "{{fcos_cincinnati_registry}}:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}"
{% endif %} {% endif %}
@ -44,7 +48,7 @@ spec:
readOnly: true readOnly: true
- name: "fcos-policy-engine" - name: "fcos-policy-engine"
{% if ocp4 %} {% if ocp4 %}
image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}" image: "image-registry.openshift-image-registry.svc:5000/coreos-cincinnati/fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_deploy_git_sha}}"
{% else %} {% else %}
image: "{{fcos_cincinnati_registry}}:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}" image: "{{fcos_cincinnati_registry}}:5000/coreos-cincinnati/fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}"
{% endif %} {% endif %}