Skip to content

Commit

Permalink
Adjust Kuryr CNI definitions for new Docker image
Browse files Browse the repository at this point in the history
New Kuryr CNI Docker images are using `docker exec` instead of `docker
run` to execute CNI binary. This required a few changes to CNI resources
definitions. In particular:

* host's /etc directory is no longer mounted into CNI container.
* `KURYR_CNI_POD_NAME` environment variable is added and it's supposed
  to hold CNI pod name for cni_ds_init to be able to identify the pod.
* `lock_path` option of oslo_concurrency is no longer needed to be set,
  default value is defined by OSLO_LOCK_PATH environment variable.
  • Loading branch information
dulek committed Apr 10, 2018
1 parent 1851ef2 commit f3e557c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
11 changes: 5 additions & 6 deletions roles/kuryr/templates/cni-daemonset.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: KURYR_CNI_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
securityContext:
privileged: true
volumeMounts:
Expand All @@ -41,10 +45,8 @@ spec:
- name: net-conf
mountPath: /etc/cni/net.d
- name: config-volume
mountPath: /tmp/kuryr/kuryr.conf
mountPath: /etc/kuryr/kuryr.conf
subPath: kuryr-cni.conf
- name: etc
mountPath: /etc
- name: proc
mountPath: /host_proc
- name: openvswitch
Expand All @@ -59,9 +61,6 @@ spec:
- name: config-volume
configMap:
name: kuryr-config
- name: etc
hostPath:
path: /etc
- name: proc
hostPath:
path: /proc
Expand Down
7 changes: 0 additions & 7 deletions roles/kuryr/templates/configmap.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -649,10 +649,3 @@ data:

# Minimun interval (in seconds) between pool updates (integer value)
ports_pool_update_frequency = {{ kuryr_openstack_pool_update_frequency | default(20) }}

[oslo_concurrency]

#
# From kuryr_kubernetes
#
lock_path = {{ kuryr_openstack_lock_path | default('/var/kuryr-lock') }}

0 comments on commit f3e557c

Please sign in to comment.