Skip to content

Commit 900e279

Browse files
Merge pull request #1764 from p0lyn0mial/pick-library-go-1870
API-1835: migrate startup monitor conditon to ssa
2 parents 6f57eb3 + 6c27597 commit 900e279

File tree

22 files changed

+480
-280
lines changed

22 files changed

+480
-280
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/openshift/api v0.0.0-20241104230711-4c27e61e5554
1818
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
1919
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
20-
github.com/openshift/library-go v0.0.0-20241023193830-022ad9c25e39
20+
github.com/openshift/library-go v0.0.0-20241113144043-e59cd12636ac
2121
github.com/pkg/profile v1.7.0 // indirect
2222
github.com/prometheus/client_golang v1.19.1
2323
github.com/spf13/cobra v1.8.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660 h1:F0
167167
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
168168
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=
169169
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
170-
github.com/openshift/library-go v0.0.0-20241023193830-022ad9c25e39 h1:QUoMgNRHKDX0BXCbsdYHwoIyqYBGSJy9dNBAph9WqEU=
171-
github.com/openshift/library-go v0.0.0-20241023193830-022ad9c25e39/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
170+
github.com/openshift/library-go v0.0.0-20241113144043-e59cd12636ac h1:0KXgmeR732ykasVCwqa1IcqCO7/MOegCZhCTocuCt7k=
171+
github.com/openshift/library-go v0.0.0-20241113144043-e59cd12636ac/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
172172
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
173173
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
174174
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

pkg/operator/starter.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
435435
)
436436

437437
staleConditionsController := staleconditions.NewRemoveStaleConditionsController(
438+
"kube-apiserver",
438439
[]string{
439440
// the static pod operator used to directly set these. this removes those conditions since the static pod operator was updated.
440441
// these can be removed in 4.5

vendor/github.com/openshift/library-go/pkg/controller/factory/base_controller.go

Lines changed: 17 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/controller/factory/factory.go

Lines changed: 29 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/library-go/pkg/operator/encryption/controllers.go

Lines changed: 69 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)