Fix multus missing cni and erroneous CI tests (#6051)

pull/5860/head
Florian Ruynat 2020-05-01 08:38:05 +02:00 committed by GitHub
parent 353d44a4a6
commit 361645e8b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 25 deletions

View File

@ -4,12 +4,12 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: multus
rules:
- apiGroups: ["k8s.cni.cncf.io"]
- apiGroups: ["k8s.cni.cncf.io"]
resources:
- '*'
verbs:
- '*'
- apiGroups:
- apiGroups:
- ""
resources:
- pods
@ -17,3 +17,12 @@ rules:
verbs:
- get
- update
- apiGroups:
- ""
- events.k8s.io
resources:
- events
verbs:
- create
- patch
- update

View File

@ -0,0 +1,3 @@
---
dependencies:
- role: network_plugin/cni

View File

@ -43,10 +43,10 @@ spec:
resources:
requests:
cpu: "100m"
memory: "50Mi"
memory: "90Mi"
limits:
cpu: "100m"
memory: "50Mi"
memory: "90Mi"
securityContext:
privileged: true
{% if container_manager == 'crio' %}

View File

@ -35,22 +35,20 @@
- name: Wait for netchecker server
shell: "{{ bin_dir }}/kubectl get pods -o wide --namespace {{ netcheck_namespace }} | grep ^netchecker-server"
delegate_to: "{{ groups['kube-master'][0] }}"
run_once: true
register: ncs_pod
until: ncs_pod.stdout.find('Running') != -1
retries: 3
delay: 10
when: inventory_hostname == groups['kube-master'][0]
- name: Wait for netchecker agents
shell: "{{ bin_dir }}/kubectl get pods -o wide --namespace {{ netcheck_namespace }} | grep '^netchecker-agent-.*Running'"
run_once: true
delegate_to: "{{ groups['kube-master'][0] }}"
register: nca_pod
until: nca_pod.stdout_lines|length >= groups['k8s-cluster']|intersect(ansible_play_hosts)|length * 2
retries: 3
delay: 10
failed_when: false
when: inventory_hostname == groups['kube-master'][0]
- name: Get netchecker pods
command: "{{ bin_dir }}/kubectl -n {{ netcheck_namespace }} describe pod -l app={{ item }}"
@ -115,16 +113,16 @@
- name: Get kube-proxy logs
command: "{{ bin_dir }}/kubectl -n kube-system logs -l k8s-app=kube-proxy"
run_once: true
when: not result is success
delegate_to: "{{ groups['kube-master'][0] }}"
no_log: false
when:
- inventory_hostname == groups['kube-master'][0]
- not result is success
- name: Get logs from other apps
command: "{{ bin_dir }}/kubectl -n kube-system logs -l k8s-app={{ item }} --all-containers"
run_once: true
when: not result is success
delegate_to: "{{ groups['kube-master'][0] }}"
when:
- inventory_hostname == groups['kube-master'][0]
- not result is success
no_log: false
with_items:
- kube-router
@ -189,6 +187,7 @@
}'
EOF
when:
- inventory_hostname == groups['kube-master'][0]
- kube_network_plugin_multus|default(false)
- name: Annotate pod with macvlan network
@ -212,6 +211,7 @@
image: dougbtv/centos-network
EOF
when:
- inventory_hostname == groups['kube-master'][0]
- kube_network_plugin_multus|default(false)
- name: Check secondary macvlan interface
@ -221,4 +221,5 @@
retries: 90
changed_when: false
when:
- inventory_hostname == groups['kube-master'][0]
- kube_network_plugin_multus|default(false)