From 654998e7ef9a33fd8de4626e1f80a2131e5a9bf4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 27 Jan 2019 18:04:08 +0000 Subject: [PATCH] Start Koschei migration to OpenShift from scratch --- playbooks/openshift-apps/koschei.yml | 21 ------- .../koschei/templates/buildconfig.yml | 27 --------- .../koschei/templates/deploymentconfig.yml | 55 ------------------- .../koschei/templates/service.yml | 15 ----- 4 files changed, 118 deletions(-) delete mode 100644 roles/openshift-apps/koschei/templates/buildconfig.yml delete mode 100644 roles/openshift-apps/koschei/templates/deploymentconfig.yml delete mode 100644 roles/openshift-apps/koschei/templates/service.yml diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml index da53100241..74b516fcdc 100644 --- a/playbooks/openshift-apps/koschei.yml +++ b/playbooks/openshift-apps/koschei.yml @@ -14,24 +14,3 @@ description: koschei appowners: - mizdebsk - - role: openshift/imagestream - app: koschei - imagename: koschei-web - - role: openshift/object - app: koschei - template: buildconfig.yml - objectname: buildconfig.yml - - role: openshift/object - app: koschei - template: service.yml - objectname: service.yml - - role: openshift/object - app: koschei - template: deploymentconfig.yml - objectname: deploymentconfig.yml - - role: openshift/route - app: koschei - routename: koschei-web - host: "koschei{{ env_suffix }}.fedoraproject.org" - serviceport: web - servicename: koschei-web diff --git a/roles/openshift-apps/koschei/templates/buildconfig.yml b/roles/openshift-apps/koschei/templates/buildconfig.yml deleted file mode 100644 index 39ddfc555e..0000000000 --- a/roles/openshift-apps/koschei/templates/buildconfig.yml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -items: -- apiVersion: v1 - kind: BuildConfig - metadata: - labels: - build: koschei-web - name: koschei-web - spec: - runPolicy: Serial - source: - dockerfile: |- - FROM registry.fedoraproject.org/fedora-minimal:28 - RUN microdnf install koschei-frontend-fedora - EXPOSE 80 - CMD httpd -DFOREGROUND - type: Dockerfile - strategy: - type: Docker - dockerStrategy: - noCache: false - output: - to: - kind: ImageStreamTag - name: koschei-web:latest -kind: List -metadata: {} diff --git a/roles/openshift-apps/koschei/templates/deploymentconfig.yml b/roles/openshift-apps/koschei/templates/deploymentconfig.yml deleted file mode 100644 index 125f8fa61a..0000000000 --- a/roles/openshift-apps/koschei/templates/deploymentconfig.yml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: v1 -items: -- apiVersion: v1 - kind: DeploymentConfig - metadata: - labels: - app: koschei - service: web - name: koschei-web - spec: - replicas: 1 - selector: - deploymentconfig: koschei-web - strategy: - activeDeadlineSeconds: 21600 - recreateParams: - timeoutSeconds: 600 - resources: {} - rollingParams: - intervalSeconds: 1 - maxSurge: 25% - maxUnavailable: 25% - timeoutSeconds: 600 - updatePeriodSeconds: 1 - type: Rolling - template: - metadata: - creationTimestamp: null - labels: - app: koschei-web - deploymentconfig: koschei-web - spec: - containers: - - name: koschei-web - image: docker-registry.default.svc:5000/koschei/koschei-web:latest - ports: - - containerPort: 80 - resources: {} - volumeMounts: {} - readinessProbe: - timeoutSeconds: 10 - initialDelaySeconds: 5 - httpGet: - path: / - port: 80 - livenessProbe: - timeoutSeconds: 10 - initialDelaySeconds: 30 - httpGet: - path: / - port: 80 - volumes: {} - triggers: {} -kind: List -metadata: {} diff --git a/roles/openshift-apps/koschei/templates/service.yml b/roles/openshift-apps/koschei/templates/service.yml deleted file mode 100644 index cbb579534e..0000000000 --- a/roles/openshift-apps/koschei/templates/service.yml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: koschei-web - labels: - app: koschei - service: web - namespace: koschei -spec: - ports: - - name: web - port: 80 - targetPort: 80 - selector: - deploymentconfig: koschei-web