From 5acde6cfe2b72d2e8dc0e5b7fce9b8ac2b130da5 Mon Sep 17 00:00:00 2001 From: Max Gautier Date: Fri, 24 Oct 2025 05:57:36 +0000 Subject: [PATCH] Get conf checksum directly for localhost CP loadbalancer (#12632) There is no need to stat the templated file, because the template module already returns a checksum. --- roles/kubernetes/node/tasks/loadbalancer/haproxy.yml | 9 +-------- roles/kubernetes/node/tasks/loadbalancer/nginx-proxy.yml | 9 +-------- .../node/templates/manifests/haproxy.manifest.j2 | 2 +- .../node/templates/manifests/nginx-proxy.manifest.j2 | 2 +- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/roles/kubernetes/node/tasks/loadbalancer/haproxy.yml b/roles/kubernetes/node/tasks/loadbalancer/haproxy.yml index b4c58126e..ec16c33d8 100644 --- a/roles/kubernetes/node/tasks/loadbalancer/haproxy.yml +++ b/roles/kubernetes/node/tasks/loadbalancer/haproxy.yml @@ -18,14 +18,7 @@ owner: root mode: "0755" backup: true - -- name: Haproxy | Get checksum from config - stat: - path: "{{ haproxy_config_dir }}/haproxy.cfg" - get_attributes: false - get_checksum: true - get_mime: false - register: haproxy_stat + register: haproxy_conf - name: Haproxy | Write static pod template: diff --git a/roles/kubernetes/node/tasks/loadbalancer/nginx-proxy.yml b/roles/kubernetes/node/tasks/loadbalancer/nginx-proxy.yml index 66ebe55e0..1c85a756d 100644 --- a/roles/kubernetes/node/tasks/loadbalancer/nginx-proxy.yml +++ b/roles/kubernetes/node/tasks/loadbalancer/nginx-proxy.yml @@ -18,14 +18,7 @@ owner: root mode: "0755" backup: true - -- name: Nginx-proxy | Get checksum from config - stat: - path: "{{ nginx_config_dir }}/nginx.conf" - get_attributes: false - get_checksum: true - get_mime: false - register: nginx_stat + register: nginx_conf - name: Nginx-proxy | Write static pod template: diff --git a/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 b/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 index 7c5097cd3..56fe563fb 100644 --- a/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 +++ b/roles/kubernetes/node/templates/manifests/haproxy.manifest.j2 @@ -7,7 +7,7 @@ metadata: addonmanager.kubernetes.io/mode: Reconcile k8s-app: kube-haproxy annotations: - haproxy-cfg-checksum: "{{ haproxy_stat.stat.checksum }}" + haproxy-cfg-checksum: "{{ haproxy_conf.checksum }}" spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2 b/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2 index 16757ec9a..c31784d35 100644 --- a/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2 +++ b/roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2 @@ -7,7 +7,7 @@ metadata: addonmanager.kubernetes.io/mode: Reconcile k8s-app: kube-nginx annotations: - nginx-cfg-checksum: "{{ nginx_stat.stat.checksum }}" + nginx-cfg-checksum: "{{ nginx_conf.checksum }}" spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet