languages: migrate DeploymentConfig to Deployment
This commit is contained in:
parent
8acb0b90ae
commit
3ea1ea147e
3 changed files with 10 additions and 16 deletions
|
@ -49,8 +49,8 @@
|
||||||
|
|
||||||
- role: openshift/object
|
- role: openshift/object
|
||||||
app: languages
|
app: languages
|
||||||
template: deploymentconfig.yml
|
template: deployment.yml
|
||||||
objectname: deploymentconfig.yml
|
objectname: deployment.yml
|
||||||
|
|
||||||
- role: openshift/object
|
- role: openshift/object
|
||||||
app: languages
|
app: languages
|
||||||
|
|
|
@ -24,7 +24,7 @@ spec:
|
||||||
---
|
---
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% set release="38" %}
|
{% set release="39" %}
|
||||||
apiVersion: batch/v1
|
apiVersion: batch/v1
|
||||||
kind: CronJob
|
kind: CronJob
|
||||||
metadata:
|
metadata:
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
apiVersion: apps.openshift.io/v1
|
apiVersion: apps/v1
|
||||||
kind: DeploymentConfig
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: "web"
|
name: "web"
|
||||||
labels:
|
labels:
|
||||||
app: "web"
|
app: "web"
|
||||||
|
annotations:
|
||||||
|
image.openshift.io/triggers: >-
|
||||||
|
[{"from":{"kind":"ImageStreamTag","name":"nginx:latest","namespace":"languages"},"fieldPath":"spec.template.spec.containers[?(@.name==\"nginx\")].image","pause":"false"}]
|
||||||
spec:
|
spec:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
|
matchLabels:
|
||||||
app: "web"
|
app: "web"
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -43,13 +47,3 @@ spec:
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
|
claimName: "languages-storage{{ '-stg' if env == 'staging' else '' }}"
|
||||||
restartPolicy: Always
|
restartPolicy: Always
|
||||||
triggers:
|
|
||||||
- type: ConfigChange
|
|
||||||
- type: ImageChange
|
|
||||||
imageChangeParams:
|
|
||||||
automatic: true
|
|
||||||
from:
|
|
||||||
kind: ImageStreamTag
|
|
||||||
name: nginx:latest
|
|
||||||
containerNames:
|
|
||||||
- "nginx"
|
|
Loading…
Add table
Add a link
Reference in a new issue