From a7b22e484099cf89ccfec0dc6d5698aaae6962e9 Mon Sep 17 00:00:00 2001
From: Tomasz Baran <46519524+to-bar@users.noreply.github.com>
Date: Tue, 26 Jul 2022 09:57:58 +0200
Subject: [PATCH] Fix disabling rook in feature-mappings (#3227)

* Run rook playbook on rook group

* Move rook images under rook group
---
 .../requirements/x86_64/images.yml            |  2 +-
 ansible/playbooks/roles/rook/tasks/main.yml   |  2 --
 ansible/playbooks/rook.yml                    |  4 ++-
 .../defaults/configuration/image-registry.yml | 36 +++++++++----------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml
index 5d179eb7ba..162538c4fd 100644
--- a/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml
+++ b/ansible/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml
@@ -161,6 +161,7 @@ images:
     'calico/pod2daemon-flexvol:v3.20.3':
       sha1: 97c1b7ac90aa5a0f5c52e7f137549e598ff80f3e
 
+  rook:
     'k8s.gcr.io/sig-storage/csi-attacher:v3.4.0':
       sha1: f076bd75359c6449b965c48eb8bad96c6d40790d
 
@@ -188,6 +189,5 @@ images:
     'quay.io/csiaddons/volumereplication-operator:v0.3.0':
       sha1: d3cd17f14fcbf09fc6c8c2c5c0419f098f87a70f
 
-  rook:
     'rook/ceph:v1.8.8':
       sha1: f34039b17b18f5a855b096d48ff787b4013615e4
diff --git a/ansible/playbooks/roles/rook/tasks/main.yml b/ansible/playbooks/roles/rook/tasks/main.yml
index 74cf6d5853..acdbff636b 100644
--- a/ansible/playbooks/roles/rook/tasks/main.yml
+++ b/ansible/playbooks/roles/rook/tasks/main.yml
@@ -1,8 +1,6 @@
 ---
 - name: Prepare configuration and upgrade/install Rook Helm chart
   when: specification.enabled
-  become: true
-  run_once: true
   block:
     - name: RedHat fix | Create helm's binary symlink
       file:
diff --git a/ansible/playbooks/rook.yml b/ansible/playbooks/rook.yml
index 95b75a8a0f..3765916e0f 100644
--- a/ansible/playbooks/rook.yml
+++ b/ansible/playbooks/rook.yml
@@ -4,7 +4,9 @@
   gather_facts: true
   tasks: []
 
-- hosts: kubernetes_master[0]
+# rook is not supported when k8s_as_cloud_service == True
+- hosts: rook
+  run_once: true
   become: true
   become_method: sudo
   roles:
diff --git a/schema/common/defaults/configuration/image-registry.yml b/schema/common/defaults/configuration/image-registry.yml
index 54f448c1d6..98697c3333 100644
--- a/schema/common/defaults/configuration/image-registry.yml
+++ b/schema/common/defaults/configuration/image-registry.yml
@@ -25,6 +25,24 @@ specification:
           - name: "kubernetesui/metrics-scraper:v1.0.7"
             file_name: metrics-scraper-v1.0.7.tar
         rook:
+          - name: "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0"
+            file_name: csi-attacher-v3.4.0.tar
+          - name: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0"
+            file_name: csi-node-driver-registrar-v2.5.0.tar
+          - name: "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0"
+            file_name: csi-provisioner-v3.1.0.tar
+          - name: "k8s.gcr.io/sig-storage/csi-resizer:v1.4.0"
+            file_name: csi-resizer-v1.4.0.tar
+          - name: "k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1"
+            file_name: csi-snapshotter-v5.0.1.tar
+          - name: "quay.io/ceph/ceph:v16.2.7-20220510"
+            file_name: ceph-v16.2.7-20220510.tar
+          - name: "quay.io/cephcsi/cephcsi:v3.5.1"
+            file_name: cephcsi-v3.5.1.tar
+          - name: "quay.io/csiaddons/k8s-sidecar:v0.2.1"
+            file_name: k8s-sidecar-v0.2.1.tar
+          - name: "quay.io/csiaddons/volumereplication-operator:v0.3.0"
+            file_name: volumereplication-operator-v0.3.0.tar
           - name: "rook/ceph:v1.8.8"
             file_name: ceph-v1.8.8.tar
       current:
@@ -48,29 +66,11 @@ specification:
             file_name: etcd-3.5.0-0.tar
           - name: "k8s.gcr.io/pause:3.5"
             file_name: pause-3.5.tar
-          - name: "k8s.gcr.io/sig-storage/csi-attacher:v3.4.0"
-            file_name: csi-attacher-v3.4.0.tar
-          - name: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0"
-            file_name: csi-node-driver-registrar-v2.5.0.tar
-          - name: "k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0"
-            file_name: csi-provisioner-v3.1.0.tar
-          - name: "k8s.gcr.io/sig-storage/csi-resizer:v1.4.0"
-            file_name: csi-resizer-v1.4.0.tar
-          - name: "k8s.gcr.io/sig-storage/csi-snapshotter:v5.0.1"
-            file_name: csi-snapshotter-v5.0.1.tar
           # flannel
           - name: "quay.io/coreos/flannel:v0.14.0-amd64"
             file_name: flannel-v0.14.0-amd64.tar
           - name: "quay.io/coreos/flannel:v0.14.0"
             file_name: flannel-v0.14.0.tar
-          - name: "quay.io/ceph/ceph:v16.2.7-20220510"
-            file_name: ceph-v16.2.7-20220510.tar
-          - name: "quay.io/cephcsi/cephcsi:v3.5.1"
-            file_name: cephcsi-v3.5.1.tar
-          - name: "quay.io/csiaddons/k8s-sidecar:v0.2.1"
-            file_name: k8s-sidecar-v0.2.1.tar
-          - name: "quay.io/csiaddons/volumereplication-operator:v0.3.0"
-            file_name: volumereplication-operator-v0.3.0.tar
           # canal & calico
           - name: "calico/cni:v3.20.3"
             file_name: cni-v3.20.3.tar