Skip to content

bug 2039670: Sync the library-go #538

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

Merged
openshift-merge-robot merged 2 commits into from
Jan 20, 2022
Merged

bug 2039670: Sync the library-go #538

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
afd0fea
Sync library-go
ingvagabund Jan 19, 2022
9b024af
Adjust the code to reflect the changes in the library-go
ingvagabund Jan 19, 2022
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/openshift/api v0.0.0-20211209135129-c58d9f695577
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
github.com/openshift/library-go v0.0.0-20220117173518-ca57b619b5d6
github.com/openshift/library-go v0.0.0-20220119134102-3236af51f6e1
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
go.etcd.io/etcd/client/v3 v3.5.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,8 @@ github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3 h1:65
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3 h1:SG1aqwleU6bGD0X4mhkTNupjVnByMYYuW4XbnCPavQU=
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3/go.mod h1:cwhyki5lqBmrT0m8Im+9I7PGFaraOzcYPtEz93RcsGY=
github.com/openshift/library-go v0.0.0-20220117173518-ca57b619b5d6 h1:HS6brMoum1oJyFriix+Ae3J2FfvK9u9TBqUu+JnG/pc=
github.com/openshift/library-go v0.0.0-20220117173518-ca57b619b5d6/go.mod h1:4UQ9snU1vg53fyTpHQw3vLPiAxI8ub5xrc+y8KPQQFs=
github.com/openshift/library-go v0.0.0-20220119134102-3236af51f6e1 h1:A1d2p0VBeQ1O0jyXIcDoFHkff6ijbQehve4U3fRx+vg=
github.com/openshift/library-go v0.0.0-20220119134102-3236af51f6e1/go.mod h1:6AmNM4N4nHftckybV/U7bQW+5AvK5TW81ndSI6KEidw=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
Expand Down
20 changes: 14 additions & 6 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,6 @@ func prepareOauthAPIServerOperator(ctx context.Context, controllerContext *contr

const apiServerConditionsPrefix = "APIServer"

infraLister := operatorCtx.operatorConfigInformer.Config().V1().Infrastructures().Lister()

apiServerControllers, err := apiservercontrollerset.NewAPIServerControllerSet(
operatorCtx.operatorClient,
eventRecorder,
Expand Down Expand Up @@ -566,18 +564,28 @@ func prepareOauthAPIServerOperator(ctx context.Context, controllerContext *contr
"oauth-apiserver/oauth-apiserver-pdb.yaml",
},
ShouldCreateFn: func() bool {
isSno, err := guard.IsSNOCheckFnc(infraLister)()
isSNO, precheckSucceeded, err := guard.IsSNOCheckFnc(operatorCtx.operatorConfigInformer.Config().V1().Infrastructures())()
if err != nil {
klog.Errorf("IsSNOCheckFnc failed: %v", err)
return false
}
if !precheckSucceeded {
klog.V(4).Infof("IsSNOCheckFnc precheck did not succeed, skipping")
return false
}
return !isSno
return !isSNO
},
ShouldDeleteFn: func() bool {
isSno, err := guard.IsSNOCheckFnc(infraLister)()
isSNO, precheckSucceeded, err := guard.IsSNOCheckFnc(operatorCtx.operatorConfigInformer.Config().V1().Infrastructures())()
if err != nil {
klog.Errorf("IsSNOCheckFnc failed: %v", err)
return false
}
if !precheckSucceeded {
klog.V(4).Infof("IsSNOCheckFnc precheck did not succeed, skipping")
return false
}
return isSno
return isSNO
},
},
},
Expand Down
86 changes: 57 additions & 29 deletions ...thub.com/openshift/library-go/pkg/operator/staticpod/controller/guard/guard_controller.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ github.com/openshift/client-go/route/informers/externalversions/route/v1
github.com/openshift/client-go/route/listers/route/v1
github.com/openshift/client-go/user/clientset/versioned/scheme
github.com/openshift/client-go/user/clientset/versioned/typed/user/v1
# github.com/openshift/library-go v0.0.0-20220117173518-ca57b619b5d6
# github.com/openshift/library-go v0.0.0-20220119134102-3236af51f6e1
## explicit; go 1.17
github.com/openshift/library-go/pkg/apps/deployment
github.com/openshift/library-go/pkg/assets
Expand Down