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

coreos-cincinnati: remove legacy conditional bits from templates

Browse source
This commit is contained in:
Luca BRUNO 2022-05-17 08:41:29 +00:00
parent e600040304
commit 5ae24a905c
No known key found for this signature in database
GPG key ID: A9834A2252078E4E
2 changed files with 0 additions and 31 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,11 +2,7 @@
apiVersion: v1 apiVersion: v1
kind: BuildConfig kind: BuildConfig
metadata: metadata:
{% if ocp4 %}
name: "coreos-cincinnati" name: "coreos-cincinnati"
{% else %}
name: "coreos-cincinnati-stub"
{% endif %}
labels: labels:
app: "coreos-cincinnati" app: "coreos-cincinnati"
spec: spec:
@ -31,8 +27,4 @@ spec:
output: output:
to: to:
kind: "ImageStreamTag" kind: "ImageStreamTag"
{% if ocp4 %}
name: "fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_build_git_sha}}" name: "fedora-coreos-cincinnati:gitref-{{fcos_cincinnati_build_git_sha}}"
{% else %}
name: "fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_build_git_sha}}"
{% endif %}

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

@ -2,11 +2,7 @@
apiVersion: v1 apiVersion: v1
kind: DeploymentConfig kind: DeploymentConfig
metadata: metadata:
{% if ocp4 %}
name: coreos-cincinnati name: coreos-cincinnati
{% else %}
name: coreos-cincinnati-stub
{% endif %}
labels: labels:
app: coreos-cincinnati app: coreos-cincinnati
spec: spec:
@ -32,11 +28,7 @@ spec:
spec: spec:
containers: containers:
- name: "fcos-graph-builder" - 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}}" 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: [ args: [
"/usr/local/bin/fcos-graph-builder", "/usr/local/bin/fcos-graph-builder",
"-v", "-v",
@ -47,11 +39,7 @@ spec:
mountPath: "/etc/cincinnati/" mountPath: "/etc/cincinnati/"
readOnly: true readOnly: true
- name: "fcos-policy-engine" - 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}}" 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: [ args: [
"/usr/local/bin/fcos-policy-engine", "/usr/local/bin/fcos-policy-engine",
"-v", "-v",
@ -66,15 +54,4 @@ spec:
configMap: configMap:
name: "coreos-cincinnati-config-stub" name: "coreos-cincinnati-config-stub"
triggers: triggers:
{% if ocp4 %}
- type: "ConfigChange" - type: "ConfigChange"
{% else %}
- imageChangeParams:
automatic: true
containerNames:
- "dumnati"
from:
kind: ImageStreamTag
name: "fedora-coreos-cincinnati:dumnati-{{fcos_cincinnati_deploy_git_sha}}"
type: ImageChange
{% endif %}