C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move cilium kvstore settings to configmap (#7462)

Browse source 
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.
This commit is contained in:
Frank Ritchie 2021-04-08 10:32:56 -04:00 committed by GitHub
parent bef1e628ac
commit 6f2abbf79c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/network_plugin/cilium/templates/cilium-config.yml.j2
View file

@ -25,6 +25,11 @@ data:
key-file: "{{ cilium_cert_dir }}/key.pem" key-file: "{{ cilium_cert_dir }}/key.pem"
cert-file: "{{ cilium_cert_dir }}/cert.crt" 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 # If you want metrics enabled in all of your Cilium agents, set the port for
# which the Cilium agents will have their metrics exposed. # which the Cilium agents will have their metrics exposed.
# This option deprecates the "prometheus-serve-addr" in the # This option deprecates the "prometheus-serve-addr" in the

2
roles/network_plugin/cilium/templates/cilium-deploy.yml.j2
View file

@ -45,8 +45,6 @@ spec:
- args: - args:
- --debug=$(CILIUM_DEBUG) - --debug=$(CILIUM_DEBUG)
- --config-dir=/tmp/cilium/config-map - --config-dir=/tmp/cilium/config-map
- --kvstore=etcd
- --kvstore-opt=etcd.config=/var/lib/etcd-config/etcd.config
command: command:
- cilium-operator - cilium-operator
env: env: