From e7fac18ddc5fcaeb6b04ca0a0c0e17181070ae70 Mon Sep 17 00:00:00 2001
From: Chinasubbareddy Mallavarapu <cr3938@att.com>
Date: Fri, 21 Feb 2020 11:13:50 -0600
Subject: [PATCH] [ceph-client] Fix resource limit logic with rbd_pool job
This is to fix applying resource limit logic with rbd_pool job as this
job right now taking the values from ceph-mgr pod.
Change-Id: I663ba220df1569c0bd1faca1417936b804d1dc94
---
ceph-client/templates/job-rbd-pool.yaml | 2 +-
ceph-client/values.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ceph-client/templates/job-rbd-pool.yaml b/ceph-client/templates/job-rbd-pool.yaml
index 735de44b51..7e5e2d6beb 100644
--- a/ceph-client/templates/job-rbd-pool.yaml
+++ b/ceph-client/templates/job-rbd-pool.yaml
@@ -45,7 +45,7 @@ spec:
containers:
- name: ceph-rbd-pool
{{ tuple $envAll "ceph_rbd_pool" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.mgr | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.rbd_pool | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ dict "envAll" $envAll "application" "rbd_pool" "container" "rbd_pool" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
env:
- name: CLUSTER
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index 1f51c6b1c1..0ba52e84c6 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -172,7 +172,7 @@ pod:
limits:
memory: "1024Mi"
cpu: "2000m"
- rbd-pool:
+ rbd_pool:
requests:
memory: "128Mi"
cpu: "100m"