Skip to content

Commit a9a4df5

Browse files
Merge pull request #1445 from ingvagabund/guard-controller-set-explicit-readiness-probe-endpoint-4.12
OCPBUGS-7369: Guard pod set readiness probe endpoint explicitly
2 parents 336ffd5 + f4c118c commit a9a4df5

File tree

8 files changed

+49
-10
lines changed

8 files changed

+49
-10
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/openshift/api v0.0.0-20221013123531-622889ac07cf
1616
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
1717
github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea
18-
github.com/openshift/library-go v0.0.0-20221212171543-669323ec9bca
18+
github.com/openshift/library-go v0.0.0-20230215170552-9fdba43d77f8
1919
github.com/pkg/profile v1.5.0 // indirect
2020
github.com/prometheus-operator/prometheus-operator/pkg/client v0.45.0
2121
github.com/prometheus/client_golang v1.12.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,8 @@ github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR
423423
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
424424
github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea h1:7JbjIzWt3Q75ErY1PAZ+gCA+bErI6HSlpffHFmMMzqM=
425425
github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea/go.mod h1:+J8DqZC60acCdpYkwVy/KH4cudgWiFZRNOBeghCzdGA=
426-
github.com/openshift/library-go v0.0.0-20221212171543-669323ec9bca h1:zAugG9rbkcjEDsnIcyaxmOszs5G3xuIzqNZGw9kS20Y=
427-
github.com/openshift/library-go v0.0.0-20221212171543-669323ec9bca/go.mod h1:KPBAXGaq7pPmA+1wUVtKr5Axg3R68IomWDkzaOxIhxM=
426+
github.com/openshift/library-go v0.0.0-20230215170552-9fdba43d77f8 h1:4NAEsSYjERaGPAwDnD8cTPUQ3lQkuA3FS3quztT/+Co=
427+
github.com/openshift/library-go v0.0.0-20230215170552-9fdba43d77f8/go.mod h1:KPBAXGaq7pPmA+1wUVtKr5Axg3R68IomWDkzaOxIhxM=
428428
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
429429
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
430430
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=

pkg/operator/starter.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
247247
"openshift-kube-apiserver-operator",
248248
"cluster-kube-apiserver-operator",
249249
"6443",
250+
"readyz",
250251
func() (bool, bool, error) {
251252
isSNO, precheckSucceeded, err := common.NewIsSingleNodePlatformFn(configInformers.Config().V1().Infrastructures())()
252253
// create only when not a single node topology

vendor/github.com/openshift/library-go/pkg/crypto/crypto.go

Lines changed: 25 additions & 2 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/staticpod/controller/guard/guard_controller.go

Lines changed: 12 additions & 0 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/staticpod/controller/guard/manifests/guard-pod.yaml

Lines changed: 1 addition & 1 deletion
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/staticpod/controllers.go

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

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ github.com/openshift/client-go/operatorcontrolplane/informers/externalversions/i
297297
github.com/openshift/client-go/operatorcontrolplane/informers/externalversions/operatorcontrolplane
298298
github.com/openshift/client-go/operatorcontrolplane/informers/externalversions/operatorcontrolplane/v1alpha1
299299
github.com/openshift/client-go/operatorcontrolplane/listers/operatorcontrolplane/v1alpha1
300-
# github.com/openshift/library-go v0.0.0-20221212171543-669323ec9bca
300+
# github.com/openshift/library-go v0.0.0-20230215170552-9fdba43d77f8
301301
## explicit; go 1.18
302302
github.com/openshift/library-go/pkg/assets
303303
github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer

0 commit comments

Comments
 (0)