From 36bee58b13c4368aea81090abb6f6c8d3f524bc5 Mon Sep 17 00:00:00 2001 From: Markus Rudy Date: Thu, 14 Dec 2023 17:11:09 +0100 Subject: [PATCH] fixup! upgrade-agent: pass patches to kubeadm --- upgrade-agent/internal/server/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade-agent/internal/server/server.go b/upgrade-agent/internal/server/server.go index ce574addc..db34f0dd6 100644 --- a/upgrade-agent/internal/server/server.go +++ b/upgrade-agent/internal/server/server.go @@ -115,7 +115,7 @@ func (s *Server) ExecuteUpdate(ctx context.Context, updateRequest *upgradeproto. return nil, status.Errorf(codes.Internal, "unable to execute kubeadm upgrade plan %s: %s: %s", updateRequest.WantedKubernetesVersion, err, string(out)) } - applyCmd := exec.CommandContext(ctx, "kubeadm", "upgrade", "apply", "--yes", "--patches", "/opt/kubernetes/patches", updateRequest.WantedKubernetesVersion) + applyCmd := exec.CommandContext(ctx, "kubeadm", "upgrade", "apply", "--yes", "--patches", constants.KubeadmPatchDir, updateRequest.WantedKubernetesVersion) if out, err := applyCmd.CombinedOutput(); err != nil { return nil, status.Errorf(codes.Internal, "unable to execute kubeadm upgrade apply: %s: %s", err, string(out)) }