kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16755 from justinsb/dpkg_was_interrupted 

nodeup: if apt-get tells us to run dpkg configure, run it
This commit is contained in:
Kubernetes Prow Robot 2024-08-23 18:21:47 +01:00 committed by GitHub
parent 9d08e4e7c4 9adfb361ee
commit f486a95d6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/e2e/pkg/tester/skip_regex.go
View File

@ -105,7 +105,7 @@ func (t *Tester) setSkipRegexFlag() error {
if cluster.Spec.LegacyCloudProvider == "digitalocean" {
skipRegex += "|Services.should.respect.internalTrafficPolicy=Local.Pod.and.Node,.to.Pod"
if k8sVersion.Minor < 31 {
if k8sVersion.Minor < 32 {
// https://github.com/kubernetes/kubernetes/issues/121018
skipRegex += "|Services.should.function.for.service.endpoints.using.hostNetwork"
}
@ -147,7 +147,7 @@ func (t *Tester) setSkipRegexFlag() error {
// Dedicated job testing this: https://testgrid.k8s.io/kops-misc#kops-aws-k28-hostname-bug123255
// ref: https://github.com/kubernetes/kops/issues/16349
// ref: https://github.com/kubernetes/kubernetes/issues/123255
if k8sVersion.Minor < 31 {
if k8sVersion.Minor < 32 {
skipRegex += "|Services.should.function.for.service.endpoints.using.hostNetwork"
}

16
upup/pkg/fi/nodeup/nodetasks/package.go
View File

@ -346,6 +346,22 @@ func (_ *Package) RenderLocal(t *local.LocalTarget, a, e, changes *Package) erro
cmd.Env = env
output, err := cmd.CombinedOutput()
if err != nil {
// This is a bit of a hack, but if we get an error that says we need to run dpkg configure, we run it.
// The typical cause is that we install a package that kills nodeup,
// also killing apt-get, and then apt-get is in a bad state.
// Typical error looks like this:
// exit status 100: E: dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct the problem.
if strings.Contains(string(output), "dpkg --configure -a") {
klog.Warningf("found error requiring dpkg repair: %q", string(output))
args := []string{"dpkg", "--configure", "-a"}
klog.Infof("running command %s", args)
cmd := exec.Command(args[0], args[1:]...)
dpkgOutput, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("error running `dpkg --configure -a`: %v: %s", err, string(dpkgOutput))
}
// Note that we still return an error, because our package installation failed; we will retry.
}
return fmt.Errorf("error installing package %q: %v: %s", e.Name, err, string(output))
}
} else {