Skip to content

Commit e0586e0

Browse files
Removing defaults
1 parent 3c79d7a commit e0586e0

File tree

5 files changed

+10
-48
lines changed

5 files changed

+10
-48
lines changed

charts/nr-k8s-otel-collector/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ to export data to this connector which can then be connected to the New Relic ma
141141
| daemonset.nodeSelector | object | `{}` | Sets daemonset pod node selector. Overrides `nodeSelector` and `global.nodeSelector` |
142142
| daemonset.podAnnotations | object | `{}` | Annotations to be added to the daemonset. |
143143
| daemonset.podSecurityContext | object | `{}` | Sets security context (at pod level) for the daemonset. Overrides `podSecurityContext` and `global.podSecurityContext` |
144-
| daemonset.resources | object | `{"limits":{"cpu":"200m","memory":"750Mi"},"requests":{"cpu":"20m","memory":"200Mi"}}` | Sets resources for the daemonset. |
144+
| daemonset.resources | object | `{}` | Sets resources for the daemonset. |
145145
| daemonset.tolerations | list | `[]` | Sets daemonset pod tolerations. Overrides `tolerations` and `global.tolerations` |
146146
| deployment.affinity | object | `{}` | Sets deployment pod affinities. Overrides `affinity` and `global.affinity` |
147147
| deployment.configMap | object | See `values.yaml` | Settings for deployment configmap |
@@ -157,7 +157,7 @@ to export data to this connector which can then be connected to the New Relic ma
157157
| deployment.nodeSelector | object | `{}` | Sets deployment pod node selector. Overrides `nodeSelector` and `global.nodeSelector` |
158158
| deployment.podAnnotations | object | `{}` | Annotations to be added to the deployment. |
159159
| deployment.podSecurityContext | object | `{}` | Sets security context (at pod level) for the deployment. Overrides `podSecurityContext` and `global.podSecurityContext` |
160-
| deployment.resources | object | `{"limits":{"cpu":"200m","memory":"750Mi"},"requests":{"cpu":"20m","memory":"200Mi"}}` | Sets resources for the deployment. |
160+
| deployment.resources | object | `{}` | Sets resources for the deployment. |
161161
| deployment.tolerations | list | `[]` | Sets deployment pod tolerations. Overrides `tolerations` and `global.tolerations` |
162162
| dnsConfig | object | `{}` | Sets pod's dnsConfig. Can be configured also with `global.dnsConfig` |
163163
| exporters | string | `nil` | Define custom exporters here. See: https://opentelemetry.io/docs/collector/configuration/#exporters |
@@ -169,7 +169,7 @@ to export data to this connector which can then be connected to the New Relic ma
169169
| kube-state-metrics.metricAnnotationsAllowList | list | `["pods=[*]", "namespaces=[*]", "deployments=[*]"]` | List of Kubernetes annotation keys that will be used in the resources' annotations metric. By default, kube-state-metrics v2+ does not expose annotations as metric labels. This option allows you to specify which annotations should be exposed as metric dimensions. Each entry is formatted as "resource=[annotation1,annotation2,...]". Use "*" to include all annotations for a resource type. Example: ["pods=[description,owner]", "namespaces=[description]", "deployments=[change-id,jira-ticket]"] |
170170
| kube-state-metrics.metricLabelsAllowlist | list | `["pods=[*]", "namespaces=[*]", "deployments=[*]"]` | List of Kubernetes label keys that will be used in the resources' labels metric. By default, kube-state-metrics v2+ does not expose labels as metric labels. This option allows you to specify which labels should be exposed as metric dimensions. Each entry is formatted as "resource=[label1,label2,...]". Use "*" to include all labels for a resource type. Example: ["pods=[app,environment,team]", "namespaces=[environment]", "deployments=[app,version]"] |
171171
| kube-state-metrics.prometheusScrape | bool | `false` | Disable prometheus from auto-discovering KSM and potentially scraping duplicated data |
172-
| kube-state-metrics.resources | object | `{"limits":{"cpu":"200m","memory":"64Mi"},"requests":{"cpu":"50m","memory":"32Mi"}}` | Sets resources for kube-state-metrics. |
172+
| kube-state-metrics.resources | object | `{}` | Sets resources for kube-state-metrics. |
173173
| labels | object | `{}` | Additional labels for chart objects |
174174
| licenseKey | string | `""` | This set this license key to use. Can be configured also with `global.licenseKey` |
175175
| logsPipeline | object | `{"collectorEgress":{"exporters":null,"processors":null},"collectorIngress":{"exporters":null,"processors":null}}` | Edit how the NR Logs pipeline handles your Logs |

charts/nr-k8s-otel-collector/examples/k8s/rendered/daemonset.yaml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,7 @@ spec:
7070
apiVersion: v1
7171
fieldPath: spec.nodeName
7272
resources:
73-
limits:
74-
cpu: 200m
75-
memory: 750Mi
76-
requests:
77-
cpu: 20m
78-
memory: 200Mi
73+
{}
7974
volumeMounts:
8075
- name: daemonset-config
8176
mountPath: /temp-config
@@ -100,12 +95,7 @@ spec:
10095
- --feature-gates
10196
- receiver.kubeletstats.enableCPUUsageMetrics,metricsgeneration.MatchAttributes
10297
resources:
103-
limits:
104-
cpu: 200m
105-
memory: 750Mi
106-
requests:
107-
cpu: 20m
108-
memory: 200Mi
98+
{}
10999
env:
110100
- name: HOST_IP
111101
valueFrom:

charts/nr-k8s-otel-collector/examples/k8s/rendered/deployment.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,7 @@ spec:
4646
- --config
4747
- /config/deployment-config.yaml
4848
resources:
49-
limits:
50-
cpu: 200m
51-
memory: 750Mi
52-
requests:
53-
cpu: 20m
54-
memory: 200Mi
49+
{}
5550
env:
5651
- name: KUBE_NODE_NAME
5752
valueFrom:

charts/nr-k8s-otel-collector/examples/k8s/rendered/kube-state-metrics/deployment.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,7 @@ spec:
7979
successThreshold: 1
8080
timeoutSeconds: 5
8181
resources:
82-
limits:
83-
cpu: 200m
84-
memory: 64Mi
85-
requests:
86-
cpu: 50m
87-
memory: 32Mi
82+
{}
8883
securityContext:
8984
allowPrivilegeEscalation: false
9085
capabilities:

charts/nr-k8s-otel-collector/values.yaml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@ kube-state-metrics:
1515
enabled: true
1616

1717
# -- Sets resources for kube-state-metrics.
18-
resources:
19-
limits:
20-
cpu: 200m
21-
memory: 64Mi
22-
requests:
23-
cpu: 50m
24-
memory: 32Mi
18+
resources: {}
2519

2620
# -- Disable prometheus from auto-discovering KSM and potentially scraping duplicated data
2721
prometheusScrape: false
@@ -140,13 +134,7 @@ daemonset:
140134
- ALL
141135

142136
# -- Sets resources for the daemonset.
143-
resources:
144-
limits:
145-
cpu: 200m
146-
memory: 750Mi
147-
requests:
148-
cpu: 20m
149-
memory: 200Mi
137+
resources: {}
150138
# -- Sets additional environment variables for the daemonset.
151139
envs: []
152140
# -- Sets additional environment variable sources for the daemonset.
@@ -207,13 +195,7 @@ deployment:
207195

208196

209197
# -- Sets resources for the deployment.
210-
resources:
211-
limits:
212-
cpu: 200m
213-
memory: 750Mi
214-
requests:
215-
cpu: 20m
216-
memory: 200Mi
198+
resources: {}
217199
# -- Sets additional environment variables for the deployment.
218200
envs: []
219201
# -- Sets additional environment variable sources for the deployment.

0 commit comments

Comments
 (0)