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.

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

Dashboard unavailability, network fix for Flannel and Canal #1394 #1519

Merged
merged 5 commits into from
Aug 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG-0.7.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- [#1495](https://github.com/epiphany-platform/epiphany/issues/1495) - Offline installation is broken for CentOS 7.8 environments
- [#1347](https://github.com/epiphany-platform/epiphany/issues/1347) - Kibana config always points its elasticsearch.hosts to a "logging" VM
- [#1336](https://github.com/epiphany-platform/epiphany/issues/1336) - Deployment of version 0.7.0 failed on-prem (spec.hostname)
- [#1394](https://github.com/epiphany-platform/epiphany/issues/1394) - Cannot access Kubernetes dashboard after upgrading

### Added

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@
get_attributes: no
register: network_manager_conf_d_stat

# https://docs.projectcalico.org/maintenance/troubleshoot/troubleshooting#configure-networkmanager
- name: Copy calico.conf to /etc/NetworkManager/conf.d
copy:
src: calico-network-manager.conf
template:
src: network-manager.conf.j2
dest: /etc/NetworkManager/conf.d/calico.conf
owner: root
group: root
mode: u=rw,g=r,o=r
register: copy_calico_network_manager_conf
vars:
network_interface_prefix: cali
when:
- network_manager_conf_d_stat.stat.exists

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
---
- name: Configure NetworkManager before attempting to use Canal networking
block:
# /etc/NetworkManager/conf.d directory is created by NetworkManager(rpm)/network-manager(deb) package
- name: Check if /etc/NetworkManager/conf.d exists
stat:
path: /etc/NetworkManager/conf.d
get_attributes: no
register: network_manager_conf_d_stat

# Remove flannel.1 interface from NetworkManager managed devices to get rid of
# random network issue with missing flannel.1 IP address
- name: Copy flannel.conf to /etc/NetworkManager/conf.d
template:
src: network-manager.conf.j2
rafzei marked this conversation as resolved.
Show resolved Hide resolved
dest: /etc/NetworkManager/conf.d/flannel.conf
owner: root
group: root
mode: u=rw,g=r,o=r
register: copy_flannel_network_manager_conf
vars:
network_interface_prefix: flannel
when:
- network_manager_conf_d_stat.stat.exists

- name: Reload NetworkManager service
when: copy_flannel_network_manager_conf.changed
block:
- name: Populate service facts
service_facts:

- name: Reload if NetworkManager service is running
systemd:
name: NetworkManager
state: reloaded
rafzei marked this conversation as resolved.
Show resolved Hide resolved
when: ansible_facts.services["NetworkManager.service"].state == "running"

- name: Include Canal deployment tasks
include_tasks: deployments/deploy-template.yml
vars:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
---
- name: Include flannel deployment tasks
- name: Configure NetworkManager before attempting to use Flannel networking
block:
# /etc/NetworkManager/conf.d directory is created by NetworkManager(rpm)/network-manager(deb) package
- name: Check if /etc/NetworkManager/conf.d exists
stat:
path: /etc/NetworkManager/conf.d
get_attributes: no
register: network_manager_conf_d_stat

# Remove flannel.1 interface from NetworkManager managed devices to get rid of
# random network issue with missing flannel.1 IP address
- name: Copy flannel.conf to /etc/NetworkManager/conf.d
template:
src: network-manager.conf.j2
rafzei marked this conversation as resolved.
Show resolved Hide resolved
dest: /etc/NetworkManager/conf.d/flannel.conf
owner: root
group: root
mode: u=rw,g=r,o=r
register: copy_flannel_network_manager_conf
vars:
network_interface_prefix: flannel
when:
- network_manager_conf_d_stat.stat.exists

- name: Reload NetworkManager service
when: copy_flannel_network_manager_conf.changed
block:
- name: Populate service facts
service_facts:

- name: Reload if NetworkManager service is running
systemd:
name: NetworkManager
state: reloaded
rafzei marked this conversation as resolved.
Show resolved Hide resolved
when: ansible_facts.services["NetworkManager.service"].state == "running"

- name: Include Flannel deployment tasks
include_tasks: deployments/deploy-template.yml
vars:
file_name: kube-flannel.yml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Ansible managed
[keyfile]
unmanaged-devices=interface-name:{{ network_interface_prefix }}*;interface-name:tunl*