Add option for install behind http_proxy (#384)
* Add option for install behind http_proxy * Tidy up http_proxy usage
This commit is contained in:
parent
95b2836dfc
commit
e880f08d26
@ -121,3 +121,9 @@ custom_registries_yaml: |
|
|||||||
auth:
|
auth:
|
||||||
username: yourusername
|
username: yourusername
|
||||||
password: yourpassword
|
password: yourpassword
|
||||||
|
|
||||||
|
# Only enable and configure these if you access the internet through a proxy
|
||||||
|
# proxy_env:
|
||||||
|
# HTTP_PROXY: "http://proxy.domain.local:3128"
|
||||||
|
# HTTPS_PROXY: "http://proxy.domain.local:3128"
|
||||||
|
# NO_PROXY: "*.domain.local,127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"
|
||||||
|
|||||||
18
roles/k3s_agent/tasks/http_proxy.yml
Normal file
18
roles/k3s_agent/tasks/http_proxy.yml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
---
|
||||||
|
|
||||||
|
- name: Create k3s.service.d directory
|
||||||
|
file:
|
||||||
|
path: '{{ systemd_dir }}/k3s.service.d'
|
||||||
|
state: directory
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: '0755'
|
||||||
|
|
||||||
|
|
||||||
|
- name: Copy K3s http_proxy conf file
|
||||||
|
template:
|
||||||
|
src: "http_proxy.conf.j2"
|
||||||
|
dest: "{{ systemd_dir }}/k3s.service.d/http_proxy.conf"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: '0755'
|
||||||
@ -1,5 +1,9 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
|
- name: Deploy K3s http_proxy conf
|
||||||
|
include_tasks: http_proxy.yml
|
||||||
|
when: proxy_env is defined
|
||||||
|
|
||||||
- name: Copy K3s service file
|
- name: Copy K3s service file
|
||||||
template:
|
template:
|
||||||
src: "k3s.service.j2"
|
src: "k3s.service.j2"
|
||||||
|
|||||||
4
roles/k3s_agent/templates/http_proxy.conf.j2
Normal file
4
roles/k3s_agent/templates/http_proxy.conf.j2
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
[Service]
|
||||||
|
Environment=HTTP_PROXY={{ proxy_env.HTTP_PROXY }}
|
||||||
|
Environment=HTTPS_PROXY={{ proxy_env.HTTPS_PROXY }}
|
||||||
|
Environment=NO_PROXY={{ proxy_env.NO_PROXY }}
|
||||||
18
roles/k3s_server/tasks/http_proxy.yml
Normal file
18
roles/k3s_server/tasks/http_proxy.yml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
---
|
||||||
|
|
||||||
|
- name: Create k3s.service.d directory
|
||||||
|
file:
|
||||||
|
path: '{{ systemd_dir }}/k3s.service.d'
|
||||||
|
state: directory
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: '0755'
|
||||||
|
|
||||||
|
|
||||||
|
- name: Copy K3s http_proxy conf file
|
||||||
|
template:
|
||||||
|
src: "http_proxy.conf.j2"
|
||||||
|
dest: "{{ systemd_dir }}/k3s.service.d/http_proxy.conf"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: '0755'
|
||||||
@ -12,6 +12,10 @@
|
|||||||
failed_when: false
|
failed_when: false
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
|
||||||
|
- name: Deploy K3s http_proxy conf
|
||||||
|
include_tasks: http_proxy.yml
|
||||||
|
when: proxy_env is defined
|
||||||
|
|
||||||
- name: Deploy vip manifest
|
- name: Deploy vip manifest
|
||||||
include_tasks: vip.yml
|
include_tasks: vip.yml
|
||||||
|
|
||||||
|
|||||||
4
roles/k3s_server/templates/http_proxy.conf.j2
Normal file
4
roles/k3s_server/templates/http_proxy.conf.j2
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
[Service]
|
||||||
|
Environment=HTTP_PROXY={{ proxy_env.HTTP_PROXY }}
|
||||||
|
Environment=HTTPS_PROXY={{ proxy_env.HTTPS_PROXY }}
|
||||||
|
Environment=NO_PROXY={{ proxy_env.NO_PROXY }}
|
||||||
@ -46,6 +46,15 @@
|
|||||||
- /var/lib/rancher/
|
- /var/lib/rancher/
|
||||||
- /var/lib/cni/
|
- /var/lib/cni/
|
||||||
|
|
||||||
|
- name: Remove K3s http_proxy files
|
||||||
|
file:
|
||||||
|
name: "{{ item }}"
|
||||||
|
state: absent
|
||||||
|
with_items:
|
||||||
|
- "{{ systemd_dir }}/k3s.service.d"
|
||||||
|
- "{{ systemd_dir }}/k3s-node.service.d"
|
||||||
|
when: proxy_env is defined
|
||||||
|
|
||||||
- name: Reload daemon_reload
|
- name: Reload daemon_reload
|
||||||
systemd:
|
systemd:
|
||||||
daemon_reload: yes
|
daemon_reload: yes
|
||||||
|
|||||||
5
site.yml
5
site.yml
@ -3,6 +3,7 @@
|
|||||||
hosts: proxmox
|
hosts: proxmox
|
||||||
gather_facts: true
|
gather_facts: true
|
||||||
become: yes
|
become: yes
|
||||||
|
environment: "{{ proxy_env | default({}) }}"
|
||||||
roles:
|
roles:
|
||||||
- role: proxmox_lxc
|
- role: proxmox_lxc
|
||||||
when: proxmox_lxc_configure
|
when: proxmox_lxc_configure
|
||||||
@ -10,6 +11,7 @@
|
|||||||
- name: Prepare k3s nodes
|
- name: Prepare k3s nodes
|
||||||
hosts: k3s_cluster
|
hosts: k3s_cluster
|
||||||
gather_facts: yes
|
gather_facts: yes
|
||||||
|
environment: "{{ proxy_env | default({}) }}"
|
||||||
roles:
|
roles:
|
||||||
- role: lxc
|
- role: lxc
|
||||||
become: true
|
become: true
|
||||||
@ -26,18 +28,21 @@
|
|||||||
|
|
||||||
- name: Setup k3s servers
|
- name: Setup k3s servers
|
||||||
hosts: master
|
hosts: master
|
||||||
|
environment: "{{ proxy_env | default({}) }}"
|
||||||
roles:
|
roles:
|
||||||
- role: k3s_server
|
- role: k3s_server
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
- name: Setup k3s agents
|
- name: Setup k3s agents
|
||||||
hosts: node
|
hosts: node
|
||||||
|
environment: "{{ proxy_env | default({}) }}"
|
||||||
roles:
|
roles:
|
||||||
- role: k3s_agent
|
- role: k3s_agent
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
- name: Configure k3s cluster
|
- name: Configure k3s cluster
|
||||||
hosts: master
|
hosts: master
|
||||||
|
environment: "{{ proxy_env | default({}) }}"
|
||||||
roles:
|
roles:
|
||||||
- role: k3s_server_post
|
- role: k3s_server_post
|
||||||
become: true
|
become: true
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user