From eb4bd36f7391e2768f2b2e9c8a226b84412aafe4 Mon Sep 17 00:00:00 2001
From: Marijn van der Giesen <55738566+mvandergiesen@users.noreply.github.com>
Date: Thu, 9 Mar 2023 22:50:30 +0100
Subject: [PATCH] fix(kubernetes): Also apply kubeadm patches during upgrade
(#9781)
---
roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml b/roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml
index d3d1d04f8..4a0043ef2 100644
--- a/roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml
+++ b/roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml
@@ -19,6 +19,7 @@
--ignore-preflight-errors=all
--allow-experimental-upgrades
--etcd-upgrade={{ (etcd_deployment_type == "kubeadm") | bool | lower }}
+ {% if kubeadm_patches is defined and kubeadm_patches.enabled %}--patches={{ kubeadm_patches.dest_dir }}{% endif %}
--force
register: kubeadm_upgrade
# Retry is because upload config sometimes fails
@@ -40,6 +41,7 @@
--ignore-preflight-errors=all
--allow-experimental-upgrades
--etcd-upgrade={{ (etcd_deployment_type == "kubeadm") | bool | lower }}
+ {% if kubeadm_patches is defined and kubeadm_patches.enabled %}--patches={{ kubeadm_patches.dest_dir }}{% endif %}
--force
register: kubeadm_upgrade
# Retry is because upload config sometimes fails
--
GitLab