Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nodeup: if apt-get tells us to run dpkg configure, run it #16755

Merged
merged 2 commits into from
Aug 23, 2024
Merged

nodeup: if apt-get tells us to run dpkg configure, run it #16755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2168af
nodeup: if apt-get tells us to run dpkg configure, run it
justinsb Aug 15, 2024
9adfb36
kubetest2: Bumping regex skiplist version to include 1.31
justinsb Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/e2e/pkg/tester/skip_regex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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"
}

Expand Down
16 changes: 16 additions & 0 deletions upup/pkg/fi/nodeup/nodetasks/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading