From fa7aea335980d01a73fdb916e22564846943c505 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Sun, 5 Mar 2023 18:40:36 +0100 Subject: [PATCH] Remove rook --- badhouseplants/helmfile.yaml | 13 +--- badhouseplants/values/values.gitea.yaml | 4 +- .../values/values.rook-ceph-cluster.yaml | 58 ----------------- badhouseplants/values/values.rook-ceph.yaml | 65 ------------------- releases.yaml | 25 ------- repositories.yaml | 2 - 6 files changed, 4 insertions(+), 163 deletions(-) delete mode 100644 badhouseplants/values/values.rook-ceph-cluster.yaml delete mode 100644 badhouseplants/values/values.rook-ceph.yaml diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml index 0d63ce3..8186903 100644 --- a/badhouseplants/helmfile.yaml +++ b/badhouseplants/helmfile.yaml @@ -31,7 +31,7 @@ releases: installed: true namespace: minecraft-application createNamespace: false - + - <<: *gitea installed: true namespace: gitea-service @@ -41,17 +41,6 @@ releases: installed: true namespace: funkwhale-application createNamespace: false - - - <<: *rook-ceph - installed: true - namespace: rook-ceph - createNamespace: true - - - <<: *rook-ceph-cluster - installed: true - namespace: rook-ceph - createNamespace: true - bases: - ../environments.yaml diff --git a/badhouseplants/values/values.gitea.yaml b/badhouseplants/values/values.gitea.yaml index ef846f3..6c6cf87 100644 --- a/badhouseplants/values/values.gitea.yaml +++ b/badhouseplants/values/values.gitea.yaml @@ -55,7 +55,9 @@ memcached: enabled: true service: port: 11211 - + resources: + requests: + cpu: 10mi postgresql: auth: postgresPassword: check diff --git a/badhouseplants/values/values.rook-ceph-cluster.yaml b/badhouseplants/values/values.rook-ceph-cluster.yaml deleted file mode 100644 index 53c949b..0000000 --- a/badhouseplants/values/values.rook-ceph-cluster.yaml +++ /dev/null @@ -1,58 +0,0 @@ ---- -cephClusterSpec: - mon: - count: 1 - allowMultiplePerNode: false - mgr: - count: 1 - allowMultiplePerNode: false - modules: - - name: pg_autoscaler - enabled: true - resources: - mgr: - limits: - cpu: "200m" - memory: "512Mi" - requests: - cpu: "200m" - memory: "512Mi" - mon: - limits: - cpu: "300m" - memory: "512Mi" - requests: - cpu: "300m" - memory: "512Mi" - osd: - limits: - cpu: "200m" - memory: "512Mi" - requests: - cpu: "200m" - memory: "512Mi" - prepareosd: - requests: - cpu: "100m" - memory: "50Mi" - crashcollector: - limits: - cpu: "500m" - memory: "60Mi" - requests: - cpu: "100m" - memory: "60Mi" - logcollector: - limits: - cpu: "100m" - memory: "256Mi" - requests: - cpu: "100m" - memory: "100Mi" - cleanup: - limits: - cpu: "100m" - memory: "512Mi" - requests: - cpu: "100m" - memory: "512Mi" diff --git a/badhouseplants/values/values.rook-ceph.yaml b/badhouseplants/values/values.rook-ceph.yaml deleted file mode 100644 index e87f0e8..0000000 --- a/badhouseplants/values/values.rook-ceph.yaml +++ /dev/null @@ -1,65 +0,0 @@ -resources: - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 25m - memory: 128Mi -csi: - csiRBDProvisionerResource: | - - name : csi-provisioner - resource: - requests: - memory: 128Mi - cpu: 25m - limits: - memory: 256Mi - cpu: 200m - - name : csi-resizer - resource: - requests: - memory: 128Mi - cpu: 25m - limits: - memory: 256Mi - cpu: 200m - - name : csi-attacher - resource: - requests: - memory: 128Mi - cpu: 25m - limits: - memory: 256Mi - cpu: 200m - - name : csi-snapshotter - resource: - requests: - memory: 128Mi - cpu: 25m - limits: - memory: 256Mi - cpu: 200m - - name : csi-rbdplugin - resource: - requests: - memory: 512Mi - cpu: 25m - limits: - memory: 1Gi - cpu: 500m - - name : csi-omap-generator - resource: - requests: - memory: 512Mi - cpu: 25m - limits: - memory: 1Gi - cpu: 500m - - name : liveness-prometheus - resource: - requests: - memory: 128Mi - cpu: 25m - limits: - memory: 256Mi - cpu: 100m \ No newline at end of file diff --git a/releases.yaml b/releases.yaml index 60f179b..eaff832 100644 --- a/releases.yaml +++ b/releases.yaml @@ -84,31 +84,6 @@ templates: - template: default-env-values - template: default-env-secrets # ---------------------------- - # -- Rook - # ---------------------------- - rook-common: - labels: - bundle: rook - version: v1.11.0 - - rook-ceph: &rook-ceph - name: rook-ceph - chart: rook-release/rook-ceph - version: v1.11.0 - inherit: - - template: rook-common - - template: default-env-values - - - rook-ceph-cluster: &rook-ceph-cluster - name: rook-ceph-cluster - chart: rook-release/rook-ceph-cluster - version: v1.11.0 - inherit: - - template: rook-common - - template: default-env-values - - # ---------------------------- # -- Istio # ---------------------------- istio-common: diff --git a/repositories.yaml b/repositories.yaml index b859e19..f41d930 100644 --- a/repositories.yaml +++ b/repositories.yaml @@ -26,5 +26,3 @@ repositories: url: https://argoproj.github.io/argo-helm - name: bedag url: https://bedag.github.io/helm-charts/ - - name: rook-release - url: https://charts.rook.io/release