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

fix master taint implementation - linting problems #95

Merged
merged 9 commits into from
Sep 25, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fixes undefined group['node'] if missing from hosts.ini (#2)
* fixes undefined group['node'] if missing from hosts.ini

- improves application of master taint by centralizing code

* improves molecule testing, fixes linting

* hacking at linter problems, small tweaks

- increases the metallb timeout error due to intermittent testing errors in GitHub actions
  • Loading branch information
ioagel committed Sep 20, 2022
commit 862d41910ed14daf4655b7cd05d86f188fc21de3
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
python-version: '3.x'

- name: Install test dependencies
run: pip3 install yamllint ansible-lint ansible
run: pip3 install yamllint ansible-lint ansible netaddr jmespath

- name: Run yamllint
run: yamllint .
Expand Down
5 changes: 3 additions & 2 deletions inventory/sample/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,17 @@ k3s_token: "some-SUPER-DEDEUPER-secret-password"
# it for each of your hosts, though.
k3s_node_ip: '{{ ansible_facts[flannel_iface]["ipv4"]["address"] }}'

k3s_node_exists: "{{ 'true' if groups['node'] | length >= 1 else 'false' }}"
k3s_node_exists: "{{ 'true' if groups['node'] | default([]) | length >= 1 else 'false' }}"

# these arguments are recommended for servers as well as agents:
extra_args: >-
--flannel-iface={{ flannel_iface }}
--node-ip={{ k3s_node_ip }}

# change these to your liking, the only required one is --disable servicelb
# change these to your liking, the only required are: --disable servicelb, --tls-san {{ apiserver_endpoint }}
extra_server_args: >-
{{ extra_args }}
{{ '--node-taint node-role.kubernetes.io/master=true:NoSchedule' if k3s_node_exists | bool else '' }}
--tls-san {{ apiserver_endpoint }}
ioagel marked this conversation as resolved.
Show resolved Hide resolved
--disable servicelb
--disable traefik
Expand Down
2 changes: 2 additions & 0 deletions molecule/ipv6/overrides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
# the default has IPv4 ranges only.
extra_server_args: >-
{{ extra_args }}
--tls-san {{ apiserver_endpoint }}
{{ '--node-taint node-role.kubernetes.io/master=true:NoSchedule' if k3s_node_exists | bool else '' }}
--disable servicelb
--disable traefik
--disable-network-policy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@

- name: Assert that the nginx welcome page is available
ansible.builtin.uri:
url: http:https://{{ ip | ansible.utils.ipwrap }}:{{ port }}/
# The default value here fixes ansible-lint error:
# 'jinja:Unrecognized type <<class 'ansible.template.AnsibleUndefined'>> for ipwrap filter <value>'
# If by any chanche we reach the default case, we have already failed, so it will not save the task!
url: http:https://{{ ip | default([]) | ansible.utils.ipwrap }}:{{ port }}/
return_content: yes
register: result
failed_when: "'Welcome to nginx!' not in result.content"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
success_msg: "Found nodes as expected: {{ found_nodes }}"
fail_msg: "Expected nodes {{ expected_nodes }}, but found nodes {{ found_nodes }}"
vars:
# The check if variable is 'defined' fixes linting error:
# jinja: Error in jmespath.search in json_query filter plugin: 'cluster_nodes' is undefined
found_nodes: >-
{{ cluster_nodes | json_query('resources[*].metadata.name') | unique | sort }}
{{ cluster_nodes is defined and cluster_nodes | json_query('resources[*].metadata.name') | unique | sort }}
expected_nodes: |-
{{
(
Expand Down
10 changes: 6 additions & 4 deletions roles/k3s/master/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@
cmd: "systemd-run -p RestartSec=2 \
-p Restart=on-failure \
--unit=k3s-init \
k3s server {{ server_init_args }} \
{{ '--node-taint node-role.kubernetes.io/master=true:NoSchedule' if k3s_node_exists | bool else ''}}"
k3s server {{ server_init_args }}"
creates: "{{ systemd_dir }}/k3s.service"
args:
warn: false # The ansible systemd module does not support transient units
Expand Down Expand Up @@ -153,10 +152,13 @@
owner: "{{ ansible_user }}"
mode: "u=rw,g=,o="

- name: Configure kubectl cluster to https://{{ apiserver_endpoint | ansible.utils.ipwrap }}:6443
# The default value here fixes ansible-lint error:
# 'jinja:Unrecognized type <<class 'ansible.template.AnsibleUndefined'>> for ipwrap filter <value>'
# If by any chanche we reach the default case, we have already failed, so it will not save the task!
- name: Configure kubectl cluster to https://{{ apiserver_endpoint | default([]) | ansible.utils.ipwrap }}:6443
command: >-
k3s kubectl config set-cluster default
--server=https://{{ apiserver_endpoint | ansible.utils.ipwrap }}:6443
--server=https://{{ apiserver_endpoint | default([]) | ansible.utils.ipwrap }}:6443
--kubeconfig ~{{ ansible_user }}/.kube/config
changed_when: true

Expand Down
2 changes: 1 addition & 1 deletion roles/k3s/master/templates/k3s.service.j2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ After=network-online.target
Type=notify
ExecStartPre=-/sbin/modprobe br_netfilter
ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/local/bin/k3s server {{ extra_server_args | default("") }} {{ '--node-taint node-role.kubernetes.io/master=true:NoSchedule' if k3s_node_exists | bool else ''}}
ExecStart=/usr/local/bin/k3s server {{ extra_server_args | default("") }}
KillMode=process
Delegate=yes
# Having non-zero Limit*s causes performance problems due to accounting overhead
Expand Down
2 changes: 1 addition & 1 deletion roles/k3s/post/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
# Timeout to wait for MetalLB services to come up
metal_lb_available_timeout: 60s
metal_lb_available_timeout: 120s
6 changes: 3 additions & 3 deletions roles/k3s/post/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
command: >-
k3s kubectl wait {{ item.resource }}
--namespace='metallb-system'
{% if item.name | default(False) -%} {{ item.name }} {%- endif %}
{% if item.selector | default(False) -%} --selector='{{ item.selector }}' {%- endif %}
{% if item.condition | default(False) -%} {{ item.condition }} {%- endif %}
{% if item.name | default(False) -%}{{ item.name }}{%- endif %}
{% if item.selector | default(False) -%}--selector='{{ item.selector }}'{%- endif %}
{% if item.condition | default(False) -%}{{ item.condition }}{%- endif %}
--timeout='{{ metal_lb_available_timeout }}'
changed_when: false
run_once: true
Expand Down