Merge "Resources: Fix erroneous resource definitions"

elasticsearch/templates/deployment-master.yaml

@@ -119,7 +119,7 @@ spec:
                 - IPC_LOCK
                 - SYS_RESOURCE
 {{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.master | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
+{{ tuple $envAll $envAll.Values.pod.resources.master | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/elasticsearch.sh
             - start

fluent-logging/values.yaml

@@ -337,8 +337,8 @@ pod:
     fluentd: 3
     prometheus_fluentd_exporter: 1
   resources:
+    enabled: false
     fluentbit:
-      enabled: false
       limits:
         memory: '400Mi'
         cpu: '400m'
@@ -346,7 +346,6 @@ pod:
         memory: '100Mi'
         cpu: '100m'
     fluentd:
-      enabled: false
       limits:
         memory: '1024Mi'
         cpu: '2000m'

prometheus-openstack-exporter/values.yaml

@@ -62,7 +62,7 @@ pod:
         timeout: 30
   resources:
     enabled: false
-    kube_state_metrics:
+    prometheus_openstack_exporter:
       requests:
         memory: "128Mi"
         cpu: "100m"