Skip to content

bug 2039670: Create the PDB dynamically so it does not get created on the SNO topology #514

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 12, 2022
Merged

bug 2039670: Create the PDB dynamically so it does not get created on the SNO topology #514

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
ae7742d
Create the PDB only when the cluster topology is not SNO
ingvagabund Dec 8, 2021
363b428
go mod vendor
ingvagabund Jan 10, 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
22 changes: 22 additions & 0 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import (
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
"github.com/openshift/library-go/pkg/operator/revisioncontroller"
"github.com/openshift/library-go/pkg/operator/staleconditions"
"github.com/openshift/library-go/pkg/operator/staticpod/controller/guard"
"github.com/openshift/library-go/pkg/operator/staticpod/controller/revision"
"github.com/openshift/library-go/pkg/operator/staticresourcecontroller"
"github.com/openshift/library-go/pkg/operator/status"
Expand Down Expand Up @@ -528,6 +529,8 @@ 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 @@ -556,10 +559,29 @@ func prepareOauthAPIServerOperator(ctx context.Context, controllerContext *contr
"oauth-apiserver/sa.yaml",
"oauth-apiserver/RBAC/useroauthaccesstokens_binding.yaml",
"oauth-apiserver/RBAC/useroauthaccesstokens_clusterrole.yaml",
},
},
{
Files: []string{
"oauth-apiserver/oauth-apiserver-pdb.yaml",
},
ShouldCreateFn: func() bool {
isSno, err := guard.IsSNOCheckFnc(infraLister)()
if err != nil {
return false
}
return !isSno
},
ShouldDeleteFn: func() bool {
isSno, err := guard.IsSNOCheckFnc(infraLister)()
if err != nil {
Copy link
Contributor

@deads2k deads2k Dec 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you'll have a nicer time if you make the IsSNOCheckFnc only return a bool. I won't quibble though. I bet if you make it, they will come :)

return false
}
return isSno
},
},
},

operatorCtx.kubeInformersForNamespaces,
operatorCtx.kubeClient,
).WithRevisionController(
Expand Down
313 changes: 313 additions & 0 deletions ...ithub.com/openshift/library-go/pkg/operator/staticpod/controller/guard/bindata/bindata.go
View file
Open in desktop

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

Loading