Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update resource assignment #852

Closed
wants to merge 3 commits into from
Closed

feat: update resource assignment #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fb98ce
feat: update resource assignment
cdobbyn Aug 16, 2023
9350e7d
chore: bump chart version
cdobbyn Aug 16, 2023
0ad9d06
chore: add entries to changelog
cdobbyn Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## Unreleased

### enhancement
- Add changelog workflow by @svetlanabrennan in [#837](https://github.com/newrelic/nri-kubernetes/pull/837)
- Update changelog workflow @svetlanabrennan in [#843](https://github.com/newrelic/nri-kubernetes/pull/843)
- make chart resources not have defaults set @cdobbyn [#852](https://github.com/newrelic/nri-kubernetes/pull/852)
- make chart have separate resource assignments @cdobbyn [#852](https://github.com/newrelic/nri-kubernetes/pull/852)
- bump chart version @cdobbyn [#852](https://github.com/newrelic/nri-kubernetes/pull/852)


## 3.15.3
## What's Changed
Expand Down
2 changes: 1 addition & 1 deletion charts/newrelic-infrastructure/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ sources:
- https://github.com/newrelic/nri-kubernetes/tree/main/charts/newrelic-infrastructure
- https://github.com/newrelic/infrastructure-agent/

version: 3.20.3
version: 3.20.4
appVersion: 3.15.3

dependencies:
Expand Down
2 changes: 1 addition & 1 deletion charts/newrelic-infrastructure/templates/controlplane/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ spec:
{{- with .Values.controlPlane.extraVolumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.controlPlane.resources }}
{{- with .Values.controlPlane.forwarder.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
volumes:
Expand Down
2 changes: 1 addition & 1 deletion charts/newrelic-infrastructure/templates/ksm/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ spec:
{{- with .Values.ksm.extraVolumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.ksm.resources }}
{{- with .Values.ksm.forwarder.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
volumes:
Expand Down
2 changes: 1 addition & 1 deletion charts/newrelic-infrastructure/templates/kubelet/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ spec:
{{- with .Values.kubelet.extraVolumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.kubelet.resources }}
{{- with .Values.kubelet.agent.resources }}
resources: {{ toYaml . | nindent 12 }}
{{- end }}
volumes:
Expand Down
57 changes: 39 additions & 18 deletions charts/newrelic-infrastructure/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,19 @@ kubelet:
# -- Defines where to mount volumes specified with `extraVolumes`
extraVolumeMounts: []
initContainers: []
resources:
limits:
memory: 300M
requests:
cpu: 100m
memory: 150M
resources: {}
# limits:
# memory: 300M
# requests:
# cpu: 100m
# memory: 150M
agent:
resources: {}
# limits:
# memory: 300M
# requests:
# cpu: 100m
# memory: 150M
config:
# -- Timeout for the kubelet APIs contacted by the integration
timeout: 10s
Expand Down Expand Up @@ -172,12 +179,19 @@ ksm:
# Keep in mind that sharding is not supported at the moment, so memory usage for this component ramps up quickly on
# large clusters.
# @default -- 100m/150M -/850M
resources:
limits:
memory: 850M # Bump me up if KSM pod shows restarts.
requests:
cpu: 100m
memory: 150M
resources: {}
# limits:
# memory: 850M # Bump me up if KSM pod shows restarts.
# requests:
# cpu: 100m
# memory: 150M
forwarder:
resources: {}
# limits:
# memory: 850M # Bump me up if KSM pod shows restarts.
# requests:
# cpu: 100m
# memory: 150M
config:
# -- Timeout for the ksm API contacted by the integration
timeout: 10s
Expand Down Expand Up @@ -241,12 +255,19 @@ controlPlane:
extraVolumes: []
extraVolumeMounts: []
initContainers: []
resources:
limits:
memory: 300M
requests:
cpu: 100m
memory: 150M
resources: {}
# limits:
# memory: 300M
# requests:
# cpu: 100m
# memory: 150M
forwarder:
resources: {}
# limits:
# memory: 300M
# requests:
# cpu: 100m
# memory: 150M
config:
# -- Timeout for the Kubernetes APIs contacted by the integration
timeout: 10s
Expand Down