Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust Kuryr CNI definitions for new Docker image #7889

Merged
merged 1 commit into from
Apr 19, 2018
Merged

Adjust Kuryr CNI definitions for new Docker image #7889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions roles/kuryr/templates/cni-daemonset.yaml.j2
View file
Open in desktop
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 @@ -71,9 +73,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,13 +653,6 @@ 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') }}

[cni_health_server]
port = {{ kuryr_healthcheck_port }}

Expand Down