languages: move to ocp4

playbooks/include/proxies-reverseproxy.yml

@@ -994,11 +994,11 @@
 
   - role: httpd/reverseproxy
     website: "languages{{ env_suffix }}.fedoraproject.org"
-    destname: app.os
+    destname: languages
     balancer_name: app-os
-    balancer_members: "{{ (env == 'staging')|ternary(openshift_nodes_stg, openshift_nodes) }}"
+    balancer_members: "{{ (env == 'staging')|ternary(ocp_nodes_stg, ocp_nodes) }}"
     targettype: openshift
-    ocp4: false
+    ocp4: true
     keephost: true
     tags:
     - languages

playbooks/openshift-apps/languages.yml

@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os_masters[0]:os_masters_stg[0]
+  hosts: os_control[0]:os_control_stg[0]
   user: root
   gather_facts: False
   

roles/openshift-apps/languages/templates/buildconfig.yml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   labels:

roles/openshift-apps/languages/templates/cron.yml

@@ -1,6 +1,6 @@
 {% if env == "production" %}
 {%   for release in ("10", "20", "30") %}
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: "stats-{{ release }}"
@@ -25,7 +25,7 @@ spec:
 {%   endfor %}
 {% endif %}
 {% set release="36" %}
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: "stats-latest"
@@ -47,7 +47,7 @@ spec:
 {%     include "cron_template.yml" %}
 {% endfilter %}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: build-website
@@ -72,7 +72,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: stats
-            image: "docker-registry.default.svc:5000/languages/builder:latest"
+            image: "image-registry.openshift-image-registry.svc:5000/languages/builder:latest"
             imagePullPolicy: Always
             command: ["/bin/sh", "-c"]
             args:
@@ -93,7 +93,7 @@ spec:
                 cpu: '0'
                 memory: 4Gi
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: stats-website

roles/openshift-apps/languages/templates/cron_template.yml

@@ -5,7 +5,7 @@ volumes:
 restartPolicy: Never
 initContainers:
 - name: clean-tmp
-  image: "docker-registry.default.svc:5000/languages/builder:latest"
+  image: "image-registry.openshift-image-registry.svc:5000/languages/builder:latest"
   imagePullPolicy: Always
   env:
   - name: RELEASEVER
@@ -22,7 +22,7 @@ initContainers:
     readOnly: false
     mountPath: /src/results
 - name: extract
-  image: "docker-registry.default.svc:5000/languages/builder:latest"
+  image: "image-registry.openshift-image-registry.svc:5000/languages/builder:latest"
   imagePullPolicy: Always
   command:
   - ./build.py
@@ -54,7 +54,7 @@ initContainers:
       memory: 2Gi
 containers:
 - name: stats
-  image: "docker-registry.default.svc:5000/languages/builder:latest"
+  image: "image-registry.openshift-image-registry.svc:5000/languages/builder:latest"
   imagePullPolicy: Always
   command: ["/bin/sh", "-c"]
   args:

roles/openshift-apps/languages/templates/deploymentconfig.yml

@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   name: "web"