Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-08-06 05:54:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixup! upgrade-agent: pass patches to kubeadm

Browse source
This commit is contained in:
Markus Rudy 2023-12-14 17:11:09 +01:00 • committed by Leonard Cohnen
parent 901cd20e17
commit 36bee58b13
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upgrade-agent/internal/server/server.go
View file

@ -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)) 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 { if out, err := applyCmd.CombinedOutput(); err != nil {
return nil, status.Errorf(codes.Internal, "unable to execute kubeadm upgrade apply: %s: %s", err, string(out)) return nil, status.Errorf(codes.Internal, "unable to execute kubeadm upgrade apply: %s: %s", err, string(out))
} }