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

Jump to bottom

Make resources in agent and operator helm chart configurable #10296

Merged
merged 1 commit into from Feb 25, 2020
Merged

Make resources in agent and operator helm chart configurable #10296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions install/kubernetes/cilium/charts/agent/templates/daemonset.yaml
View file
Open in desktop
Expand Up @@ -143,6 +143,8 @@ spec:
command:
- /cni-uninstall.sh
{{- end }}
resources:
{{- toYaml .Values.resources | trim | nindent 10 }}
name: cilium-agent
{{- if .Values.global.prometheus.enabled }}
ports:
Expand Down Expand Up @@ -222,6 +224,8 @@ spec:
volumeMounts:
- mountPath: /var/run/cilium
name: cilium-run
resources:
{{- toYaml .Values.monitor.resources | trim | nindent 10 }}
{{- end }}
{{- if .Values.global.etcd.managed }}
# In managed etcd mode, Cilium must be able to resolve the DNS name of
Expand Down Expand Up @@ -286,6 +290,8 @@ spec:
{{- end }}
- mountPath: /var/run/cilium
name: cilium-run
resources:
{{- toYaml .Values.initResources | trim | nindent 10 }}
restartPolicy: Always
{{- if and (eq .Release.Namespace "kube-system") (or (gt .Capabilities.KubeVersion.Minor "10") (gt .Capabilities.KubeVersion.Major "1"))}}
priorityClassName: system-node-critical
Expand Down
11 changes: 11 additions & 0 deletions install/kubernetes/cilium/charts/agent/values.yaml
View file
Open in desktop
Expand Up @@ -8,3 +8,14 @@ maxUnavailable: 2
monitor:
enabled: false
eventTypes: []
# Specifies the resources for the monitor sidecar container if activated
resources: {}

# Specifies the resources for the agent container
resources: {}

# Specifies the resources for the clean-cilium-state init container
initResources:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not particularly fond of this naming but also could not come up with anything better. If you have a suggestion I would happily change it.

requests:
cpu: "100m"
memory: "100Mi"
maxbischoff marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions install/kubernetes/cilium/charts/operator/templates/deployment.yaml
View file
Open in desktop
Expand Up @@ -166,6 +166,8 @@ spec:
name: kube-config
readOnly: true
{{- end}}
resources:
{{- toYaml .Values.resources | trim | nindent 10 }}
hostNetwork: true
{{- if .Values.global.etcd.managed }}
# In managed etcd mode, Cilium must be able to resolve the DNS name of
Expand Down
3 changes: 3 additions & 0 deletions install/kubernetes/cilium/charts/operator/values.yaml
View file
Open in desktop
@@ -1,2 +1,5 @@
image: operator
synchronizeK8sNodes: true

# Specifies the resources for the operator container
resources: {}