Skip to content

Commit

Permalink
Move cilium kvstore settings to configmap (kubernetes-sigs#7462)
Browse files Browse the repository at this point in the history
This PR is to move the cilium kvstore options to the configmap
rather than specifying them in the deployment as args. This
is not technically necessary but keeping all the options in
one place is probably not a bad idea.

Tested with cilium 1.9.5.
  • Loading branch information
fritchie authored Apr 8, 2021
1 parent bef1e62 commit 6f2abbf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 5 additions & 0 deletions roles/network_plugin/cilium/templates/cilium-config.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ data:
key-file: "{{ cilium_cert_dir }}/key.pem"
cert-file: "{{ cilium_cert_dir }}/cert.crt"

# kvstore
# https://docs.cilium.io/en/latest/cmdref/kvstore/
kvstore: etcd
kvstore-opt: '{"etcd.config": "/var/lib/etcd-config/etcd.config"}'

# If you want metrics enabled in all of your Cilium agents, set the port for
# which the Cilium agents will have their metrics exposed.
# This option deprecates the "prometheus-serve-addr" in the
Expand Down
2 changes: 0 additions & 2 deletions roles/network_plugin/cilium/templates/cilium-deploy.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ spec:
- args:
- --debug=$(CILIUM_DEBUG)
- --config-dir=/tmp/cilium/config-map
- --kvstore=etcd
- --kvstore-opt=etcd.config=/var/lib/etcd-config/etcd.config
command:
- cilium-operator
env:
Expand Down

0 comments on commit 6f2abbf

Please sign in to comment.