chore(deps): upgrade github.com/replicatedhq/troubleshoot to v0.128.1#5908
Merged
Conversation
Upgrades github.com/k0sproject/k0s to latest main to resolve k8s.io/kubernetes v1.35.0 -> v1.36.0 mismatch that was breaking k8s.io/api/scheduling/v1alpha1 imports during go mod tidy. Also adds a replace directive for opencontainers/runc v1.3.3 to maintain compatibility with github.com/ory/dockertest/v3 used in integration tests.
emosbaugh
changed the title
sgalsaleh
previously approved these changes
May 13, 2026
Migrates integration/database/rqlite_migration_test.go from the v3 struct-based API to the v4 functional-options API. Key changes: - dockertest.NewPool now requires context.Context - pool.Run uses functional options (WithName, WithTag, WithEnv, etc.) - Port bindings use network.ParsePort and network.PortMap - Host config uses moby container.HostConfig types - Retry requires context and timeout - Resource cleanup uses Close(ctx) instead of Purge - Custom removeContainerByName helper since v4 drops RemoveContainerByName This also removes the github.com/opencontainers/runc replace directive that was only needed to keep dockertest v3 working.
emosbaugh
force-pushed
the
fix-k8s-deps-align-troubleshoot
branch
from
560ccbc to
a2ac7dd
Compare
sgalsaleh
approved these changes
May 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes
go mod tidyfailures caused by mismatched Kubernetes dependency versions, and upgradesgithub.com/ory/dockertestfrom v3 to v4 to remove a temporaryreplacedirective.Commit 1: Align k8s dependencies to v1.36.0
github.com/k0sproject/k0swas pinned to a version that pulled ink8s.io/kubernetes v1.35.0, while the rest of the repo already usedk8s.io/* v0.36.0. This skew causedgo mod tidyto fail becausek8s.io/kubernetes v1.35.0still importsk8s.io/api/scheduling/v1alpha1, which was removed inv0.36.0.Changes:
github.com/k0sproject/k0sto latestmain(usesk8s.io/kubernetes v1.36.0)replacedirectives (csi-translation-lib,dynamic-resource-allocation,kube-scheduler) fromv0.35.0→v0.36.0replace github.com/opencontainers/runc => v1.3.3becauserunc v1.4.0removedlibcontainer/user, breakingdockertest/v3Commit 2: Upgrade
github.com/ory/dockertest/v3tov4.0.0The
runcreplace in commit 1 was only needed fordockertest/v3. Rather than carry areplacedirective forever for a test-only dependency, we upgraded todockertest/v4, which does not depend on the removedruncpackage.Key API migration changes in
integration/database/rqlite_migration_test.go:dockertest.NewPool("")→dockertest.NewPool(ctx, "")pool.RunWithOptions(&RunOptions{...}, hostConfig)→pool.Run(ctx, repo, WithName(...), WithTag(...), ...)(functional options)network.ParsePort(...)andnetwork.PortMapcontainer.HostConfigfromgithub.com/moby/moby/api/types/containerpool.Retry(func() error)→pool.Retry(ctx, timeout, func() error)pool.Purge(resource)→resource.Close(ctx)+pool.Close(ctx)removeContainerByNamehelper since v4 removedpool.RemoveContainerByNameThis allowed us to drop the
opencontainers/runcreplace directive entirely.Verification
go mod tidycompletes cleanlygo build ./...compiles successfullygo test -c ./integration/database/...compiles (tests require Docker to run)