Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix disabling rook in feature-mappings #3227

Merged
merged 2 commits into from
Jul 26, 2022
Merged

Fix disabling rook in feature-mappings #3227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e6672a
Run rook playbook on rook group
to-bar Jul 22, 2022
3cd3924
Move rook images under rook group
to-bar Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ble/playbooks/roles/repository/files/download-requirements/requirements/x86_64/images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -188,6 +189,5 @@ images:
'quay.io/csiaddons/volumereplication-operator:v0.3.0':
sha1: d3cd17f14fcbf09fc6c8c2c5c0419f098f87a70f

rook:
'rook/ceph:v1.8.8':
sha1: f34039b17b18f5a855b096d48ff787b4013615e4
2 changes: 0 additions & 2 deletions ansible/playbooks/roles/rook/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 3 additions & 1 deletion ansible/playbooks/rook.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
36 changes: 18 additions & 18 deletions schema/common/defaults/configuration/image-registry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down