infra/home-cluster
2
0 Fork 0
Code Issues Pull Requests 40 Actions Packages Projects Releases Wiki Activity

feat: update kube-vip ansible playbook for k0s and k3s - ipv6 config changes (#1234)

Browse Source 
* feat: update kube-vip ansible playbook for k0s and k3s

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: update renovate

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: move ipv6 to advanced options

Signed-off-by: Devin Buhl <devin@buhl.casa>

* feat: kube-vip manifests to partials

Signed-off-by: Devin Buhl <devin@buhl.casa>

* feat: kube vip samesies

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: update config sample

Signed-off-by: Devin Buhl <devin@buhl.casa>

---------

Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
Devin Buhl authored and GitHub committed 2024-01-22 15:28:21 -05:00
1 parent 6557c255d6
commit afbf097dac
61 files changed
+244 -307
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bootstrap/templates/ansible/.ansible-lint.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution in ['k3s', 'k0s'] %#
#% if bootstrap_distribution in ['k0s', 'k3s'] %#
skip_list:
- yaml[commas]
- yaml[line-length]
bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2
+4 -7
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
# https://github.com/PyratLabs/ansible-role-k3s
# renovate: datasource=github-releases depName=k3s-io/k3s
@@ -10,10 +10,7 @@ k3s_use_unsupported_config: true
k3s_registration_address: "#{ bootstrap_kube_api_addr }#"
# /var/lib/rancher/k3s/server/manifests
k3s_server_manifests_templates:
- custom-cilium-helmchart.yaml.j2
- kube-vip-ds.yaml.j2
# /var/lib/rancher/k3s/server/manifests
k3s_server_manifests_urls:
- url: https://kube-vip.io/manifests/rbac.yaml
filename: kube-vip-rbac.yaml
- custom-cilium-helmchart.yaml
- kube-vip-ds.yaml
- kube-vip-rbac.yaml
#% endif %#
bootstrap/templates/ansible/inventory/group_vars/master/main.yaml.j2
+3 -3
View File
@@ -1,10 +1,10 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
# https://rancher.com/docs/k3s/latest/en/installation/install-options/server-config/
# https://github.com/PyratLabs/ansible-role-k3s
k3s_control_node: true
k3s_server:
#% if bootstrap_ipv6_enabled %#
#% if bootstrap_advanced_flags.dual_stack_ipv4_first|default(false) %#
node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}"
#% else %#
node-ip: "{{ ansible_host }}"
@@ -23,7 +23,7 @@ k3s_server:
write-kubeconfig-mode: "644"
pause-image: registry.k8s.io/pause:3.9
secrets-encryption: true
#% if bootstrap_ipv6_enabled %#
#% if bootstrap_advanced_flags.dual_stack_ipv4_first|default(false) %#
cluster-cidr: "#{ bootstrap_cluster_cidr.split(',')[0] }#,#{ bootstrap_cluster_cidr.split(',')[1] }#"
service-cidr: "#{ bootstrap_service_cidr.split(',')[0] }#,#{ bootstrap_service_cidr.split(',')[1] }#"
#% else %#
bootstrap/templates/ansible/inventory/group_vars/worker/main.yaml.j2
+2 -2
View File
@@ -1,10 +1,10 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
# https://rancher.com/docs/k3s/latest/en/installation/install-options/agent-config/
# https://github.com/PyratLabs/ansible-role-k3s
k3s_control_node: false
k3s_agent:
#% if bootstrap_ipv6_enabled %#
#% if bootstrap_advanced_flags.dual_stack_ipv4_first|default(false) %#
node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}"
#% else %#
node-ip: "{{ ansible_host }}"
bootstrap/templates/ansible/inventory/hosts.yaml.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution in ['k3s', 'k0s'] %#
#% if bootstrap_distribution in ['k0s', 'k3s'] %#
---
kubernetes:
children:
bootstrap/templates/ansible/playbooks/cluster-installation.yaml.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
- name: Cluster Installation
hosts: kubernetes
bootstrap/templates/ansible/playbooks/cluster-kube-vip.yaml.j2
+9 -4
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k0s', 'k3s'] %#
---
- name: Cluster kube-vip
hosts: master
@@ -11,16 +11,21 @@
ansible.builtin.pause:
seconds: 5
tasks:
#% if bootstrap_distribution in ['k3s'] %#
- name: Ensure Kubernetes is running
ansible.builtin.include_role:
name: xanmanning.k3s
public: true
vars:
k3s_state: started
#% endif %#
- name: Upgrade kube-vip
ansible.builtin.template:
src: templates/kube-vip-static-pod.yaml.j2
dest: "{{ k3s_server_pod_manifests_dir }}/kube-vip-static-pod.yaml"
src: templates/kube-vip-ds.yaml.j2
#% if bootstrap_distribution in ['k3s'] %#
dest: "{{ k3s_server_manifests_dir }}/kube-vip-ds.yaml"
#% elif bootstrap_distribution in ['k0s'] %#
dest: "/var/lib/k0s/manifests/kube-vip/ds.yaml"
#% endif %#
mode: preserve
#% endif %#
bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
- name: Cluster Nuke
hosts: kubernetes
bootstrap/templates/ansible/playbooks/cluster-prepare.yaml.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
- name: Prepare System
hosts: kubernetes
bootstrap/templates/ansible/playbooks/cluster-reboot.yaml.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution in ['k3s', 'k0s'] %#
#% if bootstrap_distribution in ['k0s', 'k3s'] %#
---
- name: Reboot
hosts: kubernetes
bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2
+9 -9
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution in ['k3s', 'k0s'] %#
#% if bootstrap_distribution in ['k0s', 'k3s'] %#
---
# https://github.com/kevincoakley/ansible-role-k8s-rolling-update
- name: Cluster rollout update
@@ -13,9 +13,9 @@
seconds: 5
tasks:
- name: Details
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
ansible.builtin.command: "k3s kubectl get node {{ inventory_hostname }} -o json"
#% elif bootstrap_distribution == 'k0s' %#
#% elif bootstrap_distribution in ['k0s'] %#
ansible.builtin.command: "k0s kubectl get node {{ inventory_hostname }} -o json"
#% endif %#
register: kubectl_get_node
@@ -33,9 +33,9 @@
- name: Cordon
kubernetes.core.k8s_drain:
name: "{{ inventory_hostname }}"
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
kubeconfig: /etc/rancher/k3s/k3s.yaml
#% elif bootstrap_distribution == 'k0s' %#
#% elif bootstrap_distribution in ['k0s'] %#
kubeconfig: /var/lib/k0s/pki/admin.conf
#% endif %#
state: cordon
@@ -44,9 +44,9 @@
- name: Drain
kubernetes.core.k8s_drain:
name: "{{ inventory_hostname }}"
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
kubeconfig: /etc/rancher/k3s/k3s.yaml
#% elif bootstrap_distribution == 'k0s' %#
#% elif bootstrap_distribution in ['k0s'] %#
kubeconfig: /var/lib/k0s/pki/admin.conf
#% endif %#
state: drain
@@ -80,9 +80,9 @@
- name: Uncordon
kubernetes.core.k8s_drain:
name: "{{ inventory_hostname }}"
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
kubeconfig: /etc/rancher/k3s/k3s.yaml
#% elif bootstrap_distribution == 'k0s' %#
#% elif bootstrap_distribution in ['k0s'] %#
kubeconfig: /var/lib/k0s/pki/admin.conf
#% endif %#
state: uncordon
bootstrap/templates/ansible/playbooks/tasks/cilium.yaml.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
- name: Cilium
block:
bootstrap/templates/ansible/playbooks/tasks/cruft.yaml.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
# https://github.com/k3s-io/k3s/issues/1971
- name: Cruft
bootstrap/templates/ansible/playbooks/tasks/kubeconfig.yaml.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
- name: Get absolute path to this Git repository # noqa: command-instead-of-module
ansible.builtin.command: git rev-parse --show-toplevel
bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
# https://docs.k3s.io/helm
apiVersion: helm.cattle.io/v1
@@ -9,7 +9,7 @@ metadata:
spec:
repo: https://helm.cilium.io/
chart: cilium
# renovate: datasource=github-releases depName=cilium/cilium
# renovate: datasource=helm depName=cilium repository=https://helm.cilium.io
version: "1.14.5"
targetNamespace: kube-system
bootstrap: true
bootstrap/templates/ansible/playbooks/templates/kube-vip-ds.yaml.j2
+2 -75
View File
@@ -1,77 +1,4 @@
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
---
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-vip
namespace: kube-system
labels:
app.kubernetes.io/name: kube-vip
spec:
selector:
matchLabels:
app.kubernetes.io/name: kube-vip
template:
metadata:
labels:
app.kubernetes.io/name: kube-vip
spec:
containers:
- name: kube-vip
image: ghcr.io/kube-vip/kube-vip:v0.6.4
imagePullPolicy: IfNotPresent
args: ["manager"]
env:
- name: address
value: "#{ bootstrap_kube_api_addr }#"
- name: vip_arp
value: "true"
- name: lb_enable
value: "true"
- name: port
value: "6443"
- name: vip_cidr
value: "32"
- name: cp_enable
value: "true"
- name: cp_namespace
value: kube-system
- name: vip_ddns
value: "false"
- name: svc_enable
value: "false"
- name: vip_leaderelection
value: "true"
- name: vip_leaseduration
value: "15"
- name: vip_renewdeadline
value: "10"
- name: vip_retryperiod
value: "2"
- name: prometheus_server
value: :2112
securityContext:
capabilities:
add: ["NET_ADMIN", "NET_RAW", "SYS_TIME"]
hostAliases:
- hostnames:
- kubernetes
ip: 127.0.0.1
hostNetwork: true
serviceAccountName: kube-vip
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/master
operator: Exists
- matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
tolerations:
- effect: NoSchedule
operator: Exists
- effect: NoExecute
operator: Exists
#% include 'partials/kube-vip-ds.partial.yaml.j2' %#
#% endif %#
bootstrap/templates/ansible/playbooks/templates/kube-vip-rbac.yaml.j2
+4
View File
@@ -0,0 +1,4 @@
#% if bootstrap_distribution in ['k3s'] %#
---
#% include 'partials/kube-vip-rbac.partial.yaml.j2' %#
#% endif %#
bootstrap/templates/ansible/requirements.txt.j2
+1 -1
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution in ['k3s', 'k0s'] %#
#% if bootstrap_distribution in ['k0s', 'k3s'] %#
# Ansible
ansible-lint==6.22.2
ansible==9.1.0
bootstrap/templates/ansible/requirements.yaml.j2
+2 -2
View File
@@ -1,4 +1,4 @@
#% if bootstrap_distribution in ['k3s', 'k0s'] %#
#% if bootstrap_distribution in ['k0s', 'k3s'] %#
---
collections:
- name: ansible.posix
@@ -9,7 +9,7 @@ collections:
version: 8.2.0
- name: kubernetes.core
version: 3.0.0
#% if bootstrap_distribution == 'k3s' %#
#% if bootstrap_distribution in ['k3s'] %#
roles:
- name: xanmanning.k3s
src: https://github.com/PyratLabs/ansible-role-k3s