Skip to content

Commit

Permalink
helm: Remove default options to support upgrade
Browse files Browse the repository at this point in the history
These settings cannot be specified by default in the values.yaml file,
because otherwise it would override the upgradeCompatibility value for
the flag and hence break compatibility during upgrade from
v1.7 (no such option) -> v1.8 (should be disabled during upgrade) -> v1.9.

Signed-off-by: Joe Stringer <joe@cilium.io>
  • Loading branch information
joestringer committed Oct 22, 2020
1 parent 9de5fd6 commit ac29aa7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 0 additions & 3 deletions install/kubernetes/cilium/README.md
Expand Up @@ -24,8 +24,6 @@ Helm chart for Cilium
| bandwidthManager | bool | `false` | |
| bpf.clockProbe | bool | `false` | |
| bpf.lbMapMax | int | `65536` | |
| bpf.mapDynamicSizeRatio | float | `0.0025` | |
| bpf.masquerade | bool | `true` | |
| bpf.monitorAggregation | string | `"medium"` | |
| bpf.monitorFlags | string | `"all"` | |
| bpf.monitorInterval | string | `"5s"` | |
Expand Down Expand Up @@ -309,7 +307,6 @@ Helm chart for Cilium
| serviceAccounts.relay.create | bool | `true` | |
| serviceAccounts.ui.annotations | object | `{}` | |
| serviceAccounts.ui.create | bool | `true` | |
| sessionAffinity | bool | `true` | |
| sleepAfterInit | bool | `false` | |
| sockops.enabled | bool | `false` | |
| tls.enabled | bool | `true` | |
Expand Down
6 changes: 3 additions & 3 deletions install/kubernetes/cilium/values.yaml
Expand Up @@ -203,7 +203,7 @@ bpf:
# policyMapMax is the maximum number of entries in endpoint policy map (per endpoint)
policyMapMax: 16384

mapDynamicSizeRatio: 0.0025
#mapDynamicSizeRatio: 0.0025

# monitorAggregation is the level of aggregation for datapath trace events
monitorAggregation: medium
Expand All @@ -217,7 +217,7 @@ bpf:
monitorFlags: "all"

# TODO: Add documentation
masquerade: true
#masquerade: true

# tproxy enables the use of eBPF-based TPROXY to reduce reliance on iptables
# rules for implementing Layer 7 policy.
Expand Down Expand Up @@ -871,7 +871,7 @@ remoteNodeIdentity: true

# Need to document default
##################
sessionAffinity: true
#sessionAffinity: false

# Do not run Cilium agent when running with clean mode. Useful to completely
# uninstall Cilium as it will stop Cilium from starting and create artifacts
Expand Down

0 comments on commit ac29aa7

Please sign in to comment.