diff --git a/roles/openshift-apps/koschei/templates/admin-deployment.yml b/roles/openshift-apps/koschei/templates/admin-deployment.yml index 6aa1c1f309..fef003457f 100644 --- a/roles/openshift-apps/koschei/templates/admin-deployment.yml +++ b/roles/openshift-apps/koschei/templates/admin-deployment.yml @@ -1,6 +1,6 @@ -# https://docs.openshift.com/container-platform/3.11/rest_api/oapi/v1.DeploymentConfig.html#object-schema -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig +# https://docs.openshift.com/container-platform/4.15/rest_api/workloads_apis/deployment-apps-v1.html +apiVersion: apps/v1 +kind: Deployment metadata: name: admin labels: @@ -8,7 +8,8 @@ metadata: spec: replicas: 1 selector: - service: admin + matchLabels: + service: admin strategy: type: Recreate template: @@ -44,12 +45,3 @@ spec: - name: keytab secret: secretName: keytab - triggers: - - type: ImageChange - imageChangeParams: - automatic: true - from: - kind: ImageStreamTag - name: koschei:latest - containerNames: - - admin diff --git a/roles/openshift-apps/koschei/templates/backend-deployment.yml b/roles/openshift-apps/koschei/templates/backend-deployment.yml index 774260cc50..17a1d40997 100644 --- a/roles/openshift-apps/koschei/templates/backend-deployment.yml +++ b/roles/openshift-apps/koschei/templates/backend-deployment.yml @@ -1,6 +1,6 @@ -# https://docs.openshift.com/container-platform/3.11/rest_api/oapi/v1.DeploymentConfig.html#object-schema -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig +# https://docs.openshift.com/container-platform/4.15/rest_api/workloads_apis/deployment-apps-v1.html +apiVersion: apps/v1 +kind: Deployment metadata: name: {{service}} labels: @@ -8,7 +8,8 @@ metadata: spec: replicas: 1 selector: - service: {{service}} + matchLabels: + service: {{service}} strategy: type: Recreate template: @@ -62,12 +63,3 @@ spec: - name: keytab secret: secretName: keytab - triggers: - - type: ImageChange - imageChangeParams: - automatic: true - from: - kind: ImageStreamTag - name: koschei:latest - containerNames: - - {{service}} diff --git a/roles/openshift-apps/koschei/templates/frontend-deployment.yml b/roles/openshift-apps/koschei/templates/frontend-deployment.yml index 35e111f0ce..3829e197c3 100644 --- a/roles/openshift-apps/koschei/templates/frontend-deployment.yml +++ b/roles/openshift-apps/koschei/templates/frontend-deployment.yml @@ -1,6 +1,6 @@ -# https://docs.openshift.com/container-platform/3.11/rest_api/oapi/v1.DeploymentConfig.html#object-schema -apiVersion: apps.openshift.io/v1 -kind: DeploymentConfig +# https://docs.openshift.com/container-platform/4.15/rest_api/workloads_apis/deployment-apps-v1.html +apiVersion: apps/v1 +kind: Deployment metadata: name: frontend labels: @@ -8,7 +8,8 @@ metadata: spec: replicas: {{koschei_frontend_replicas}} selector: - service: frontend + matchLabels: + service: frontend strategy: type: Rolling template: @@ -49,12 +50,3 @@ spec: - name: config secret: secretName: frontend-config - triggers: - - type: ImageChange - imageChangeParams: - automatic: true - from: - kind: ImageStreamTag - name: koschei:latest - containerNames: - - frontend