From 1dc62f184f26c6f068cce41ce7b3353ff09a9e71 Mon Sep 17 00:00:00 2001 From: Whyeasy Date: Fri, 30 Oct 2020 09:52:23 +0100 Subject: [PATCH] Remove default resources. --- charts/distributed-loki/Chart.yaml | 2 +- charts/distributed-loki/README.md | 20 ++--- charts/distributed-loki/values.yaml | 118 ++++++++++++++-------------- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/charts/distributed-loki/Chart.yaml b/charts/distributed-loki/Chart.yaml index d6278db..f72b9d1 100644 --- a/charts/distributed-loki/Chart.yaml +++ b/charts/distributed-loki/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: loki-distributed description: A Helm chart for Kubernetes type: application -version: 0.4.9 +version: 0.5.0 appVersion: 2.0.0 diff --git a/charts/distributed-loki/README.md b/charts/distributed-loki/README.md index 327ffa1..d9351c9 100644 --- a/charts/distributed-loki/README.md +++ b/charts/distributed-loki/README.md @@ -2,7 +2,7 @@ loki-distributed ================ A Helm chart for Kubernetes -Current chart version is `0.4.9` +Current chart version is `0.5.0` @@ -26,7 +26,7 @@ Current chart version is `0.4.9` | distributor.extraVolumes | list | `[]` | Allow Extra volumes into the deployment | | distributor.nodeSelector | object | `{}` | Add Node labels for pod assignment | | distributor.replicaCount | int | `3` | Number of replicas for the Distributor deployment. | -| distributor.resources | object | `{"limits":{"cpu":1,"memory":"1Gi"},"requests":{"cpu":"500m","memory":"500Mi"}}` | Custom resources for the Distributor deployment. | +| distributor.resources | object | `{}` | Custom resources for the Distributor deployment. | | distributor.tolerations | list | `[]` | | | gateway.affinity | object | `{}` | Replace default affinity with custom affinity | | gateway.env | list | `[]` | Allow Extra env variables into the deployment | @@ -40,7 +40,7 @@ Current chart version is `0.4.9` | gateway.nodeSelector | object | `{}` | Add Node labels for pod assignment | | gateway.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the Gateway images. | | gateway.replicaCount | int | `3` | Number of replicas for the Gateway deployment. | -| gateway.resources | object | `{"requests":{"cpu":"50m","memory":"100Mi"}}` | Custom resources for the Gateway deployment. | +| gateway.resources | object | `{}` | Custom resources for the Gateway deployment. | | gateway.service.annotations | object | `{}` | | | gateway.service.type | string | `"ClusterIP"` | | | gateway.tolerations | list | `[]` | | @@ -52,7 +52,7 @@ Current chart version is `0.4.9` | ingester.persistence.size | string | `"10Gi"` | Specify disk size for Ingester persistence storage | | ingester.persistence.storageClass | string | `"standard"` | Specify custom storageClass to use. | | ingester.replicaCount | int | `3` | Number of replicas for the Ingester deployment. | -| ingester.resources | object | `{"limits":{"cpu":2,"memory":"10Gi"},"requests":{"cpu":1,"memory":"5Gi"}}` | Custom resources for the Ingester deployment. | +| ingester.resources | object | `{}` | Custom resources for the Ingester deployment. | | ingester.tolerations | list | `[]` | | | loki.config | string | `""` | Provide the config for Loki. | | loki.image | string | `"grafana/loki:2.0.0"` | Image repository for Loki images. | @@ -65,22 +65,22 @@ Current chart version is `0.4.9` | memcached.nodeSelector | object | `{}` | Add Node labels for pod assignment | | memcached.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the Memcached images. | | memcached.replicaCount | int | `3` | Number of replicas for the Memcached deployment. | -| memcached.resources | object | `{"limits":{"cpu":3,"memory":"6Gi"},"requests":{"cpu":"500m","memory":"5Gi"}}` | Custom resources for the Memcached deployment. | +| memcached.resources | object | `{}` | Custom resources for the Memcached deployment. | | memcached.tolerations | list | `[]` | | | memcachedFrontend.affinity | object | `{}` | Replace default affinity with custom affinity | | memcachedFrontend.nodeSelector | object | `{}` | Add Node labels for pod assignment | | memcachedFrontend.replicaCount | int | `3` | Number of replicas for the Memcached-frontend deployment. | -| memcachedFrontend.resources | object | `{"limits":{"cpu":3,"memory":"1546Mi"},"requests":{"cpu":"500m","memory":"1329Mi"}}` | Custom resources for the Memcached-frontend deployment. | +| memcachedFrontend.resources | object | `{}` | Custom resources for the Memcached-frontend deployment. | | memcachedFrontend.tolerations | list | `[]` | | | memcachedIndexQueries.affinity | object | `{}` | Add custom affinity to deployment | | memcachedIndexQueries.nodeSelector | object | `{}` | Add Node labels for pod assignment | | memcachedIndexQueries.replicaCount | int | `3` | Number of replicas for the Memcached-index-queries deployment. | -| memcachedIndexQueries.resources | object | `{"limits":{"cpu":3,"memory":"1536Mi"},"requests":{"cpu":"500m","memory":"1329Mi"}}` | Custom resources for the Memcached-index-queries deployment. | +| memcachedIndexQueries.resources | object | `{}` | Custom resources for the Memcached-index-queries deployment. | | memcachedIndexQueries.tolerations | list | `[]` | | | memcachedIndexWrites.affinity | object | `{}` | Replace default affinity with custom affinity | | memcachedIndexWrites.nodeSelector | object | `{}` | Add Node labels for pod assignment | | memcachedIndexWrites.replicaCount | int | `3` | Number of replicas for the Memcached-index-writes deployment. | -| memcachedIndexWrites.resources | object | `{"limits":{"cpu":3,"memory":"1536Mi"},"requests":{"cpu":"500m","memory":"1329Mi"}}` | Custom resources for the Memcached-index-writes deployment. | +| memcachedIndexWrites.resources | object | `{}` | Custom resources for the Memcached-index-writes deployment. | | memcachedIndexWrites.tolerations | list | `[]` | | | querier.affinity | object | `{}` | Replace default affinity with custom affinity | | querier.env | list | `[]` | Allow Extra env variables into the deployment | @@ -98,7 +98,7 @@ Current chart version is `0.4.9` | querierFrontend.extraVolumes | list | `[]` | Allow Extra volumes into the deployment | | querierFrontend.nodeSelector | object | `{}` | Add Node labels for pod assignment | | querierFrontend.replicaCount | int | `2` | Number of replicas for the Querier-frontend deployment. | -| querierFrontend.resources | object | `{"limits":{"memory":"1200Mi"},"requests":{"cpu":"2","memory":"600Mi"}}` | Customer resources for the Querier-frontend deployment. | +| querierFrontend.resources | object | `{}` | Customer resources for the Querier-frontend deployment. | | querierFrontend.tolerations | list | `[]` | | | serviceMonitor.additionalLabels | object | `{}` | Set additional labels for the service monitor. | | serviceMonitor.enabled | bool | `false` | Enable service monitors for Loki deployment. | @@ -110,5 +110,5 @@ Current chart version is `0.4.9` | tableManager.extraVolumes | list | `[]` | Allow Extra volumes into the deployment | | tableManager.nodeSelector | object | `{}` | Add Node labels for pod assignment | | tableManager.replicaCount | int | `1` | Number of replicas for the Table-manager deployment. | -| tableManager.resources | object | `{"limits":{"cpu":"200m","memory":"200Mi"},"requests":{"cpu":"100m","memory":"100Mi"}}` | Custom resources for the Table-manager deployment. | +| tableManager.resources | object | `{}` | Custom resources for the Table-manager deployment. | | tableManager.tolerations | list | `[]` | | diff --git a/charts/distributed-loki/values.yaml b/charts/distributed-loki/values.yaml index 075514d..22f3422 100644 --- a/charts/distributed-loki/values.yaml +++ b/charts/distributed-loki/values.yaml @@ -18,13 +18,13 @@ distributor: # distributor.replicaCount -- Number of replicas for the Distributor deployment. replicaCount: 3 # distributor.resources -- Custom resources for the Distributor deployment. - resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 500m - memory: 500Mi + resources: {} + # limits: + # cpu: 1 + # memory: 1Gi + # requests: + # cpu: 500m + # memory: 500Mi # distributor.env -- Allow Extra env variables into the deployment env: [] # distributor.extraVolumeMounts -- Allow Extra volume mounts into the deployment @@ -46,10 +46,10 @@ gateway: # gateway.pullPolicy -- Image pull policy for the Gateway images. pullPolicy: IfNotPresent # gateway.resources -- Custom resources for the Gateway deployment. - resources: - requests: - cpu: 50m - memory: 100Mi + resources: {} + # requests: + # cpu: 50m + # memory: 100Mi # gateway.env -- Allow Extra env variables into the deployment env: [] # gateway.extraVolumeMounts -- Allow Extra volume mounts into the deployment @@ -84,13 +84,13 @@ ingester: # ingester.replicaCount -- Number of replicas for the Ingester deployment. replicaCount: 3 # ingester.resources -- Custom resources for the Ingester deployment. - resources: - limits: - cpu: 2 - memory: 10Gi - requests: - cpu: 1 - memory: 5Gi + resources: {} + # limits: + # cpu: 2 + # memory: 10Gi + # requests: + # cpu: 1 + # memory: 5Gi # ingester.env -- Allow Extra env variables into the deployment env: [] # ingester.extraVolumeMounts -- Allow Extra volume mounts into the deployment @@ -119,13 +119,13 @@ memcached: # memcached.pullPolicy -- Image pull policy for the Memcached images. pullPolicy: IfNotPresent # memcached.resources -- Custom resources for the Memcached deployment. - resources: - limits: - cpu: 3 - memory: 6Gi - requests: - cpu: 500m - memory: 5Gi + resources: {} + # limits: + # cpu: 3 + # memory: 6Gi + # requests: + # cpu: 500m + # memory: 5Gi # memcached.tolartions -- Add tolartions for pod assignment tolerations: [] # memcached.nodeSelector -- Add Node labels for pod assignment @@ -137,13 +137,13 @@ memcachedFrontend: # memcachedFrontend.replicaCount -- Number of replicas for the Memcached-frontend deployment. replicaCount: 3 # memcachedFrontend.resources -- Custom resources for the Memcached-frontend deployment. - resources: - limits: - cpu: 3 - memory: 1546Mi - requests: - cpu: 500m - memory: 1329Mi + resources: {} + # limits: + # cpu: 3 + # memory: 1546Mi + # requests: + # cpu: 500m + # memory: 1329Mi # memcachedFrontend.tolartions -- Add tolartions for pod assignment tolerations: [] # memcachedFrontend.nodeSelector -- Add Node labels for pod assignment @@ -155,13 +155,13 @@ memcachedIndexQueries: # memcachedIndexQueries.replicaCount -- Number of replicas for the Memcached-index-queries deployment. replicaCount: 3 # memcachedIndexQueries.resources -- Custom resources for the Memcached-index-queries deployment. - resources: - limits: - cpu: 3 - memory: 1536Mi - requests: - cpu: 500m - memory: 1329Mi + resources: {} + # limits: + # cpu: 3 + # memory: 1536Mi + # requests: + # cpu: 500m + # memory: 1329Mi # memcachedIndexQueries.tolartions -- Add tolartions for pod assignment tolerations: [] # memcachedIndexQueries.nodeSelector -- Add Node labels for pod assignment @@ -173,13 +173,13 @@ memcachedIndexWrites: # memcachedIndexWrites.replicaCount -- Number of replicas for the Memcached-index-writes deployment. replicaCount: 3 # memcachedIndexWrites.resources -- Custom resources for the Memcached-index-writes deployment. - resources: - limits: - cpu: 3 - memory: 1536Mi - requests: - cpu: 500m - memory: 1329Mi + resources: {} + # limits: + # cpu: 3 + # memory: 1536Mi + # requests: + # cpu: 500m + # memory: 1329Mi # memcachedIndexWrites.tolartions -- Add tolartions for pod assignment tolerations: [] # memcachedIndexWrites.nodeSelector -- Add Node labels for pod assignment @@ -215,12 +215,12 @@ querierFrontend: # querierFrontend.replicaCount -- Number of replicas for the Querier-frontend deployment. replicaCount: 2 # querierFrontend.resources -- Customer resources for the Querier-frontend deployment. - resources: - limits: - memory: 1200Mi - requests: - cpu: "2" - memory: 600Mi + resources: {} + # limits: + # memory: 1200Mi + # requests: + # cpu: 2 + # memory: 600Mi # querierFrontend.env -- Allow Extra env variables into the deployment env: [] # querierFrontend.extraVolumeMounts -- Allow Extra volume mounts into the deployment @@ -240,13 +240,13 @@ tableManager: # tableManager.replicaCount -- Number of replicas for the Table-manager deployment. replicaCount: 1 # tableManager.resources -- Custom resources for the Table-manager deployment. - resources: - limits: - cpu: 200m - memory: 200Mi - requests: - cpu: 100m - memory: 100Mi + resources: {} + # limits: + # cpu: 200m + # memory: 200Mi + # requests: + # cpu: 100m + # memory: 100Mi # tableManager.env -- Allow Extra env variables into the deployment env: [] # tableManager.extraVolumeMounts -- Allow Extra volume mounts into the deployment