From c5a84d0438c6c7c53789b26a42e0c8bcabd4b255 Mon Sep 17 00:00:00 2001
From: Francois Andrieu <darknao@fedoraproject.org>
Date: Sun, 24 Oct 2021 22:31:16 +0200
Subject: [PATCH] websites: move to ocp4

---
 playbooks/openshift-apps/websites.yml                      | 2 +-
 roles/openshift-apps/websites/templates/buildconfig.yml    | 2 +-
 roles/openshift-apps/websites/templates/cron-updatepot.yml | 4 ++--
 roles/openshift-apps/websites/templates/cron.yml           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/playbooks/openshift-apps/websites.yml b/playbooks/openshift-apps/websites.yml
index 68963dd7b0..603e69af09 100644
--- a/playbooks/openshift-apps/websites.yml
+++ b/playbooks/openshift-apps/websites.yml
@@ -1,5 +1,5 @@
 - name: make the app be real
-  hosts: os_masters_stg[0]:os_masters[0]
+  hosts: os_control[0]:os_control_stg[0]
   user: root
   gather_facts: False
   vars:
diff --git a/roles/openshift-apps/websites/templates/buildconfig.yml b/roles/openshift-apps/websites/templates/buildconfig.yml
index a223741365..d44bc36e06 100644
--- a/roles/openshift-apps/websites/templates/buildconfig.yml
+++ b/roles/openshift-apps/websites/templates/buildconfig.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: websites-build
diff --git a/roles/openshift-apps/websites/templates/cron-updatepot.yml b/roles/openshift-apps/websites/templates/cron-updatepot.yml
index 3b3e5e2b68..87e86fbf01 100644
--- a/roles/openshift-apps/websites/templates/cron-updatepot.yml
+++ b/roles/openshift-apps/websites/templates/cron-updatepot.yml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: updatepot
@@ -19,7 +19,7 @@ spec:
         spec:
           containers:
           - name: pushpot
-            image: docker-registry.default.svc:5000/websites/builder:latest
+            image: image-registry.openshift-image-registry.svc:5000/websites/builder:latest
             command: 
             - /bin/bash
             - /scripts/updatepot.sh
diff --git a/roles/openshift-apps/websites/templates/cron.yml b/roles/openshift-apps/websites/templates/cron.yml
index d2db8983a8..7beba663ca 100644
--- a/roles/openshift-apps/websites/templates/cron.yml
+++ b/roles/openshift-apps/websites/templates/cron.yml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: build
@@ -14,7 +14,7 @@ spec:
         spec:
           containers:
           - name: build
-            image: docker-registry.default.svc:5000/websites/builder:latest
+            image: image-registry.openshift-image-registry.svc:5000/websites/builder:latest
             env:
             - name: BUILD_ENV
               value: "{{ env_short }}"