External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-18 01:17:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

Change Cilium setting identity_allocation_mode to cilium_identity_allocation_mode (#8519)

Browse Source 
* Change Cilium identity_allocation_mode to cilium_identity_allocation_mode

* Change inventory sample
This commit is contained in:
Tom Stian Berget
2022-02-08 23:04:35 +01:00
committed by GitHub
parent 5695c892d0
commit 84b93090a8
7 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/network_plugin/cilium/templates/cilium-config.yml.j2
View File

@@ -5,9 +5,9 @@ metadata:
name: cilium-config
namespace: kube-system
data:
identity-allocation-mode: {{ identity_allocation_mode }}
identity-allocation-mode: {{ cilium_identity_allocation_mode }}
{% if identity_allocation_mode == "kvstore" %}
{% if cilium_identity_allocation_mode == "kvstore" %}
# This etcd-config contains the etcd endpoints of your cluster. If you use
# TLS please make sure you follow the tutorial in https://cilium.link/etcd-config
etcd-config: |-

4
roles/network_plugin/cilium/templates/cilium-deploy.yml.j2
View File

@@ -135,7 +135,7 @@ spec:
periodSeconds: 10
timeoutSeconds: 3
volumeMounts:
{% if identity_allocation_mode == "kvstore" %}
{% if cilium_identity_allocation_mode == "kvstore" %}
- mountPath: /var/lib/etcd-config
name: etcd-config-path
readOnly: true
@@ -155,7 +155,7 @@ spec:
tolerations:
- operator: Exists
volumes:
{% if identity_allocation_mode == "kvstore" %}
{% if cilium_identity_allocation_mode == "kvstore" %}
# To read the etcd config stored in config maps
- configMap:
defaultMode: 420

4
roles/network_plugin/cilium/templates/cilium-ds.yml.j2
View File

@@ -146,7 +146,7 @@ spec:
mountPath: {{ cri_socket }}
readOnly: true
{% endif %}
{% if identity_allocation_mode == "kvstore" %}
{% if cilium_identity_allocation_mode == "kvstore" %}
- mountPath: /var/lib/etcd-config
name: etcd-config-path
readOnly: true
@@ -272,7 +272,7 @@ spec:
path: /run/xtables.lock
type: FileOrCreate
name: xtables-lock
{% if identity_allocation_mode == "kvstore" %}
{% if cilium_identity_allocation_mode == "kvstore" %}
# To read the etcd config stored in config maps
- configMap:
defaultMode: 420