From ae0930127704584c84ffa20932f21ad48345d5ae Mon Sep 17 00:00:00 2001 From: Sirisha Gopigiri Date: Thu, 3 Jun 2021 13:01:22 +0530 Subject: [PATCH] Remove Storage Cluster from Virtual Site Deployments This PS deletes the rook-ceph storage cluster deployements from both the test-site and virtual-cloud-site. Closes: #153 Change-Id: I53490ff2191a3557695701d804964eb1ee9e1115 --- .../target/workload/kustomization.yaml | 7 ++++ .../patch-delete-storage-cluster.yaml | 41 +++++++++++++++++++ .../patch-deploy-false-storage-cluster.yaml | 15 +++++++ .../target/workload/kustomization.yaml | 7 ++++ .../patch-delete-storage-cluster.yaml | 41 +++++++++++++++++++ .../patch-deploy-false-storage-cluster.yaml | 15 +++++++ 6 files changed, 126 insertions(+) create mode 100644 manifests/site/test-site/target/workload/patch-delete-storage-cluster.yaml create mode 100644 manifests/site/test-site/target/workload/patch-deploy-false-storage-cluster.yaml create mode 100644 manifests/site/virtual-network-cloud/target/workload/patch-delete-storage-cluster.yaml create mode 100644 manifests/site/virtual-network-cloud/target/workload/patch-deploy-false-storage-cluster.yaml diff --git a/manifests/site/test-site/target/workload/kustomization.yaml b/manifests/site/test-site/target/workload/kustomization.yaml index 7117db2f5..b0f3e58ae 100644 --- a/manifests/site/test-site/target/workload/kustomization.yaml +++ b/manifests/site/test-site/target/workload/kustomization.yaml @@ -4,3 +4,10 @@ resources: transformers: - ./replacements - ../../../../type/airship-core/target/workload/replacements +# Removing rook-ceph storage cluster from test-site as the +# zuul gates seems to be failing often with timeout issues +# Comment the below patch files if you want to deploy +# storage cluster as part of test-site workload +patches: + - patch-delete-storage-cluster.yaml + - patch-deploy-false-storage-cluster.yaml diff --git a/manifests/site/test-site/target/workload/patch-delete-storage-cluster.yaml b/manifests/site/test-site/target/workload/patch-delete-storage-cluster.yaml new file mode 100644 index 000000000..7a31a13e7 --- /dev/null +++ b/manifests/site/test-site/target/workload/patch-delete-storage-cluster.yaml @@ -0,0 +1,41 @@ +--- +apiVersion: ceph.rook.io/v1 +kind: CephFilesystem +metadata: + name: cephfs + namespace: rook-ceph +$patch: delete +--- +apiVersion: ceph.rook.io/v1 +kind: CephBlockPool +metadata: + name: rbd-pool + namespace: rook-ceph +$patch: delete +--- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: block-storage-sc +$patch: delete +--- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: cephfs-storage-sc +$patch: delete +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: rook-config-override + namespace: rook-ceph +$patch: delete +--- +apiVersion: v1 +kind: Service +metadata: + name: rook-ceph-mgr-dashboard + namespace: rook-ceph +$patch: delete +--- diff --git a/manifests/site/test-site/target/workload/patch-deploy-false-storage-cluster.yaml b/manifests/site/test-site/target/workload/patch-deploy-false-storage-cluster.yaml new file mode 100644 index 000000000..73df69542 --- /dev/null +++ b/manifests/site/test-site/target/workload/patch-deploy-false-storage-cluster.yaml @@ -0,0 +1,15 @@ +apiVersion: ceph.rook.io/v1 +kind: CephCluster +metadata: + name: ceph + namespace: rook-ceph + labels: + airshipit.org/deploy-k8s: "false" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + airshipit.org/deploy-k8s: "false" + name: rook-ceph-tools + namespace: rook-ceph diff --git a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml index f89cdf4db..30e1fec08 100644 --- a/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml +++ b/manifests/site/virtual-network-cloud/target/workload/kustomization.yaml @@ -3,3 +3,10 @@ resources: - ../catalogues transformers: - ../../../../type/multi-tenant/target/workload/replacements +# Removing rook-ceph storage cluster from test-site as the +# zuul gates seems to be failing often with timeout issues +# Comment the below patch files if you want to deploy +# storage cluster as part of test-site workload +patches: + - patch-delete-storage-cluster.yaml + - patch-deploy-false-storage-cluster.yaml diff --git a/manifests/site/virtual-network-cloud/target/workload/patch-delete-storage-cluster.yaml b/manifests/site/virtual-network-cloud/target/workload/patch-delete-storage-cluster.yaml new file mode 100644 index 000000000..7a31a13e7 --- /dev/null +++ b/manifests/site/virtual-network-cloud/target/workload/patch-delete-storage-cluster.yaml @@ -0,0 +1,41 @@ +--- +apiVersion: ceph.rook.io/v1 +kind: CephFilesystem +metadata: + name: cephfs + namespace: rook-ceph +$patch: delete +--- +apiVersion: ceph.rook.io/v1 +kind: CephBlockPool +metadata: + name: rbd-pool + namespace: rook-ceph +$patch: delete +--- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: block-storage-sc +$patch: delete +--- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: cephfs-storage-sc +$patch: delete +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: rook-config-override + namespace: rook-ceph +$patch: delete +--- +apiVersion: v1 +kind: Service +metadata: + name: rook-ceph-mgr-dashboard + namespace: rook-ceph +$patch: delete +--- diff --git a/manifests/site/virtual-network-cloud/target/workload/patch-deploy-false-storage-cluster.yaml b/manifests/site/virtual-network-cloud/target/workload/patch-deploy-false-storage-cluster.yaml new file mode 100644 index 000000000..73df69542 --- /dev/null +++ b/manifests/site/virtual-network-cloud/target/workload/patch-deploy-false-storage-cluster.yaml @@ -0,0 +1,15 @@ +apiVersion: ceph.rook.io/v1 +kind: CephCluster +metadata: + name: ceph + namespace: rook-ceph + labels: + airshipit.org/deploy-k8s: "false" +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + airshipit.org/deploy-k8s: "false" + name: rook-ceph-tools + namespace: rook-ceph