Skip to content

Commit

Permalink
Activate K3s embedded Spegel
Browse files Browse the repository at this point in the history
  • Loading branch information
ricsanfre committed Feb 20, 2025
1 parent 686a909 commit 7738a28
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 4 deletions.
5 changes: 4 additions & 1 deletion ansible/roles/k3s/master/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ k3s_token: s1cret0
k3s_version: v1.24.7+k3s1

# k3s config file
k3s_config_file: /etc/rancher/k3s/config.yaml
k3s_config_file: "{{ k3s_config_dir }}/config.yaml"

# k3s registries file
k3s_registries_file: "{{ k3s_config_dir }}/registries.yaml"

# k3s kubelet config content
k3s_kubelet_config: ""
Expand Down
6 changes: 6 additions & 0 deletions ansible/roles/k3s/master/tasks/pre_configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@
src: "templates/config.yml.j2"
dest: "{{ k3s_config_file }}"
mode: 0644

- name: Ensure containerd registries file exists
ansible.builtin.template:
src: "templates/registry.yml.j2"
dest: "{{ k3s_registries_file }}"
mode: 0600
2 changes: 2 additions & 0 deletions ansible/roles/k3s/master/templates/registry.yml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
{{ k3s_registries | to_nice_yaml(indent=2) }}
2 changes: 1 addition & 1 deletion ansible/roles/k3s/master/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ k3s_primary_control_node: false


# Config directory location for k3s
k3s_config_dir: "{{ k3s_config_file | dirname }}"
k3s_config_dir: "/etc/rancher/k3s"

# Directory for gathering the k3s token for clustering.
k3s_token_file: "{{ k3s_config_dir }}/cluster-token"
5 changes: 4 additions & 1 deletion ansible/roles/k3s/worker/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
k3s_token: s1cret0

# k3s config file
k3s_config_file: /etc/rancher/k3s/config.yaml
k3s_config_file: "{{ k3s_config_dir }}/config.yaml"

# k3s registries file
k3s_registries_file: "{{ k3s_config_dir }}/registries.yaml"

# k3s agent config
k3s_agent_config: ""
Expand Down
6 changes: 6 additions & 0 deletions ansible/roles/k3s/worker/tasks/pre_configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,9 @@
src: "templates/config.yml.j2"
dest: "{{ k3s_config_file }}"
mode: 0644

- name: Ensure containerd registries file exists
ansible.builtin.template:
src: "templates/registry.yml.j2"
dest: "{{ k3s_registries_file }}"
mode: 0600
2 changes: 2 additions & 0 deletions ansible/roles/k3s/worker/templates/registry.yml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
{{ k3s_registries | to_nice_yaml(indent=2) }}
2 changes: 1 addition & 1 deletion ansible/roles/k3s/worker/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---

# Config directory location for k3s
k3s_config_dir: "{{ k3s_config_file | dirname }}"
k3s_config_dir: "/etc/rancher/k3s"

# Directory for gathering the k3s token for clustering.
k3s_token_file: "{{ k3s_config_dir }}/cluster-token"
7 changes: 7 additions & 0 deletions ansible/vars/picluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ k3s_server_config:
disable-helm-controller: true
# Disable kube-proxy (using cilium kube-proxy replacement)
disable-kube-proxy: true
# Enabling Embedded Registry Mirror (Spegel)
embedded-registry: true
# TLS config
tls-san:
- "{{ k3s_api_vip }}" # IP to HAProxy
# Disable K3s addons: coredns, local path, servicelb, traefik and metric-server
Expand Down Expand Up @@ -88,6 +91,10 @@ k3s_agent_config:
# kube-proxy-arg:
# - 'metrics-bind-address=0.0.0.0'

k3s_registries:
mirrors:
"*":


##########
# FluxCD #
Expand Down

0 comments on commit 7738a28

Please sign in to comment.