k8s/kubeadm: fix some minor TODOs

4 files changed, 33 insertions, 14 deletions

diff --git a/roles/kubernetes/addons/metrics-server/tasks/main.yml b/roles/kubernetes/addons/metrics-server/tasks/main.yml
index 5236e4e3..87c57346 100644
--- a/roles/kubernetes/addons/metrics-server/tasks/main.yml
+++ b/roles/kubernetes/addons/metrics-server/tasks/main.yml
@@ -9,8 +9,13 @@
     src: "components.{{ kubernetes_metrics_server_version }}.yml.j2"
     dest: /etc/kubernetes/addons/metrics-server/config.yml
 
-  ## TODO: move to server-side apply (GA since 1.22)
+- name: check if metrics-server is already installed
+  check_mode: no
+  command: kubectl --kubeconfig /etc/kubernetes/admin.conf diff -f /etc/kubernetes/addons/metrics-server/config.yml
+  failed_when: false
+  changed_when: false
+  register: kube_metrics_server_diff_result
+
 - name: install metrics-server onto the cluster
+  when: kube_metrics_server_diff_result.rc != 0
   command: kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f /etc/kubernetes/addons/metrics-server/config.yml
-  register: kube_metrics_server_apply_result
-  changed_when: (kube_metrics_server_apply_result.stdout_lines | reject("regex", " unchanged$") | list | length) > 0
diff --git a/roles/kubernetes/kubeadm/control-plane/tasks/net_kube-router.yml b/roles/kubernetes/kubeadm/control-plane/tasks/net_kube-router.yml
index 0a216414..4584e583 100644
--- a/roles/kubernetes/kubeadm/control-plane/tasks/net_kube-router.yml
+++ b/roles/kubernetes/kubeadm/control-plane/tasks/net_kube-router.yml
@@ -4,8 +4,13 @@
     src: "net_kube-router/config.{{ kubernetes_network_plugin_version }}.yml.j2"
     dest: /etc/kubernetes/network-plugin.yml
 
-  ## TODO: move to server-side apply (GA since 1.22)
+- name: check if kube-router is already installed
+  check_mode: no
+  command: kubectl --kubeconfig /etc/kubernetes/admin.conf diff -f /etc/kubernetes/network-plugin.yml
+  failed_when: false
+  changed_when: false
+  register: kube_router_diff_result
+
 - name: install kube-router on to the cluster
+  when: kube_router_diff_result.rc != 0
   command: kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f /etc/kubernetes/network-plugin.yml
-  register: kube_router_apply_result
-  changed_when: (kube_router_apply_result.stdout_lines | reject("regex", " unchanged$") | list | length) > 0
diff --git a/roles/kubernetes/kubeadm/control-plane/tasks/net_kubeguard.yml b/roles/kubernetes/kubeadm/control-plane/tasks/net_kubeguard.yml
index a572ca89..66dac49b 100644
--- a/roles/kubernetes/kubeadm/control-plane/tasks/net_kubeguard.yml
+++ b/roles/kubernetes/kubeadm/control-plane/tasks/net_kubeguard.yml
@@ -7,8 +7,13 @@
       src: "net_kubeguard/kube-router.{{ kubernetes_network_plugin_version }}.yml.j2"
       dest: /etc/kubernetes/network-plugin.yml
 
-    ## TODO: move to server-side apply (GA since 1.22)
+  - name: check if kubeguard (kube-router) is already installed
+    check_mode: no
+    command: kubectl --kubeconfig /etc/kubernetes/admin.conf diff -f /etc/kubernetes/network-plugin.yml
+    failed_when: false
+    changed_when: false
+    register: kubeguard_diff_result
+
   - name: install kubeguard (kube-router) on to the cluster
+    when: kubeguard_diff_result.rc != 0
     command: kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f /etc/kubernetes/network-plugin.yml
-    register: kubeguard_apply_result
-    changed_when: (kubeguard_apply_result.stdout_lines | reject("regex", " unchanged$") | list | length) > 0
diff --git a/roles/kubernetes/kubeadm/control-plane/tasks/primary.yml b/roles/kubernetes/kubeadm/control-plane/tasks/primary.yml
index 450c3a1a..65a6f7c8 100644
--- a/roles/kubernetes/kubeadm/control-plane/tasks/primary.yml
+++ b/roles/kubernetes/kubeadm/control-plane/tasks/primary.yml
@@ -4,7 +4,6 @@
     path: /etc/kubernetes/kubelet.conf
   register: kubeconfig_kubelet_stats
 
-  ## TODO: switch to kubeadm config version v1beta3 (available since 1.22)
 - name: generate kubeadm.config
   template:
     src: kubeadm.config.j2
@@ -118,11 +117,16 @@
     src: node-local-dns.yml.j2
     dest: /etc/kubernetes/node-local-dns.yml
 
-  ## TODO: move to server-side apply (GA since 1.22)
-- name: install  node-local dns cache
+- name: check if node-local dns cache is already installed
+  check_mode: no
+  command: kubectl --kubeconfig /etc/kubernetes/admin.conf diff -f /etc/kubernetes/node-local-dns.yml
+  failed_when: false
+  changed_when: false
+  register: kube_node_local_dns_diff_result
+
+- name: install node-local dns cache
+  when: kube_node_local_dns_diff_result.rc != 0
   command: kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f /etc/kubernetes/node-local-dns.yml
-  register: kube_node_local_dns_apply_result
-  changed_when: (kube_node_local_dns_apply_result.stdout_lines | reject("regex", " unchanged$") | list | length) > 0
 
 
 ## Network Plugin