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(helm): add default CNI resources #6287

Merged
merged 4 commits into from
Mar 21, 2023
Merged

feat(helm): add default CNI resources #6287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a85280
feat(helm): add default CNI resources
michaelbeaumont Mar 16, 2023
d804e55
chore: golden files
michaelbeaumont Mar 16, 2023
9991269
docs(UPGRADE.md): add note about default resources values
michaelbeaumont Mar 16, 2023
a91591f
docs(helm): regenerate
michaelbeaumont Mar 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
1 change: 1 addition & 0 deletions UPGRADE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ does not have any particular instructions.

### Helm

All containers now have defaults for `resources.requests.{cpu,memory}` and `resources.limits.{memory}`.
There are new default values for `*.podSecurityContext` and `*.containerSecurityContext`, see `values.yaml`.

### Gateway API
Expand Down
6 changes: 6 additions & 0 deletions app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,12 @@ spec:
value: "false"
- name: CNI_LOG_LEVEL
value: "info"
resources:
limits:
memory: 100Mi
requests:
cpu: 100m
memory: 100Mi
volumeMounts:
- mountPath: /host/opt/cni/bin
name: cni-bin-dir
Expand Down
6 changes: 6 additions & 0 deletions app/kumactl/cmd/install/testdata/install-control-plane.cni-legacy-enabled.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,12 @@ spec:
value: "false"
- name: CNI_LOG_LEVEL
value: "info"
resources:
limits:
memory: 100Mi
requests:
cpu: 100m
memory: 100Mi
volumeMounts:
- mountPath: /host/opt/cni/bin
name: cni-bin-dir
Expand Down
7 changes: 7 additions & 0 deletions app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,13 @@ cni:
# -- CNI experimental eBPF image tag
tag: "0.8.5"

resources:
requests:
cpu: 100m
memory: 100Mi
limits:
memory: 100Mi

# -- Security context at the pod level for cni
podSecurityContext: {}
# # The values below are examples. More values can be added as needed, since the field resolves as free form.
Expand Down
6 changes: 6 additions & 0 deletions app/kumactl/cmd/install/testdata/install-cp-helm/fix4935.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,12 @@ spec:
value: "false"
- name: CNI_LOG_LEVEL
value: "info"
resources:
limits:
memory: 100Mi
requests:
cpu: 100m
memory: 100Mi
volumeMounts:
- mountPath: /host/opt/cni/bin
name: cni-bin-dir
Expand Down
3 changes: 3 additions & 0 deletions deployments/charts/kuma/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ A Helm chart for the Kuma Control Plane
| cni.experimental.imageEbpf.registry | string | `"docker.io/kumahq"` | CNI experimental eBPF image registry |
| cni.experimental.imageEbpf.repository | string | `"merbridge"` | CNI experimental eBPF image repository |
| cni.experimental.imageEbpf.tag | string | `"0.8.5"` | CNI experimental eBPF image tag |
| cni.resources.requests.cpu | string | `"100m"` | |
| cni.resources.requests.memory | string | `"100Mi"` | |
| cni.resources.limits.memory | string | `"100Mi"` | |
| cni.podSecurityContext | object | `{}` | Security context at the pod level for cni |
| cni.containerSecurityContext | object | `{}` | Security context at the container level for cni |
| dataPlane.image.repository | string | `"kuma-dp"` | The Kuma DP image repository |
Expand Down
2 changes: 2 additions & 0 deletions deployments/charts/kuma/templates/cni-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ spec:
- name: CNI_LOG_LEVEL
value: "{{ .Values.cni.logLevel }}"
{{- end }}
resources:
{{- toYaml .Values.cni.resources | trim | nindent 12 }}
volumeMounts:
- mountPath: /host/opt/cni/bin
name: cni-bin-dir
Expand Down
7 changes: 7 additions & 0 deletions deployments/charts/kuma/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,13 @@ cni:
# -- CNI experimental eBPF image tag
tag: "0.8.5"

resources:
requests:
cpu: 100m
memory: 100Mi
limits:
memory: 100Mi

# -- Security context at the pod level for cni
podSecurityContext: {}
# # The values below are examples. More values can be added as needed, since the field resolves as free form.
Expand Down