From 8610430e95819594ec368a28a52f970a843f8239 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 19 Mar 2024 07:59:45 -0400 Subject: [PATCH] fix: remove some config to keep things simple Signed-off-by: Devin Buhl --- .../ansible/inventory/group_vars/controllers/main.yaml.j2 | 4 ---- .../ansible/inventory/group_vars/workers/main.yaml.j2 | 4 ---- .../templates/kubernetes/bootstrap/talos/talconfig.yaml.j2 | 2 -- 3 files changed, 10 deletions(-) diff --git a/bootstrap/templates/ansible/inventory/group_vars/controllers/main.yaml.j2 b/bootstrap/templates/ansible/inventory/group_vars/controllers/main.yaml.j2 index a5796e35..875c4c61 100644 --- a/bootstrap/templates/ansible/inventory/group_vars/controllers/main.yaml.j2 +++ b/bootstrap/templates/ansible/inventory/group_vars/controllers/main.yaml.j2 @@ -22,15 +22,11 @@ k3s_server: - "bind-address=0.0.0.0" kube-scheduler-arg: - "bind-address=0.0.0.0" - kubelet-arg: - - "image-gc-high-threshold=55" - - "image-gc-low-threshold=50" #% if bootstrap_feature_gates.dual_stack_ipv4_first %# node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}" #% else %# node-ip: "{{ ansible_host }}" #% endif %# - pause-image: registry.k8s.io/pause:3.9 secrets-encryption: true tls-san: - "#{ bootstrap_controllers_vip }#" diff --git a/bootstrap/templates/ansible/inventory/group_vars/workers/main.yaml.j2 b/bootstrap/templates/ansible/inventory/group_vars/workers/main.yaml.j2 index 428852e0..61622c98 100644 --- a/bootstrap/templates/ansible/inventory/group_vars/workers/main.yaml.j2 +++ b/bootstrap/templates/ansible/inventory/group_vars/workers/main.yaml.j2 @@ -1,12 +1,8 @@ --- k3s_control_node: false k3s_agent: - kubelet-arg: - - "image-gc-high-threshold=55" - - "image-gc-low-threshold=50" #% if bootstrap_feature_gates.dual_stack_ipv4_first %# node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}" #% else %# node-ip: "{{ ansible_host }}" #% endif %# - pause-image: registry.k8s.io/pause:3.9 diff --git a/bootstrap/templates/kubernetes/bootstrap/talos/talconfig.yaml.j2 b/bootstrap/templates/kubernetes/bootstrap/talos/talconfig.yaml.j2 index b3cf21b5..7a91c437 100644 --- a/bootstrap/templates/kubernetes/bootstrap/talos/talconfig.yaml.j2 +++ b/bootstrap/templates/kubernetes/bootstrap/talos/talconfig.yaml.j2 @@ -119,8 +119,6 @@ patches: machine: kubelet: extraArgs: - image-gc-low-threshold: 50 - image-gc-high-threshold: 55 rotate-server-certificates: true nodeIP: validSubnets: ["#{ bootstrap_node_network }#"]