Skip to content

feat: library-go bump #521

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

Closed
eggfoobar wants to merge 3 commits into from
Closed

feat: library-go bump #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0581ffb
feat: library-go bump
eggfoobar Dec 10, 2021
12f5d03
fix: pull in latest library-go
eggfoobar Dec 17, 2021
a5f0bfe
feat: static resource controller update
eggfoobar Dec 17, 2021
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-20210806203541-4ea9b6da3a37
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
github.com/openshift/library-go v0.0.0-20211216141749-1816407208cf
github.com/openshift/library-go v0.0.0-20211217155025-d48a1fb9b7c2
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-20210806203541-4ea9b6da3a37 h1:40
github.com/openshift/build-machinery-go v0.0.0-20210806203541-4ea9b6da3a37/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-20211216141749-1816407208cf h1:LfL5dbDoRE792MJoIBQcGAeScq2AHFzvY3iXWxCe2OI=
github.com/openshift/library-go v0.0.0-20211216141749-1816407208cf/go.mod h1:hz4rpghzCaE+vejl9v04JdmrujaZA8BBpajosXfIGl8=
github.com/openshift/library-go v0.0.0-20211217155025-d48a1fb9b7c2 h1:XIc3BF59OalAmDZ2YTYiUvRo1LMAGoZbdK01VBPduXU=
github.com/openshift/library-go v0.0.0-20211217155025-d48a1fb9b7c2/go.mod h1:hz4rpghzCaE+vejl9v04JdmrujaZA8BBpajosXfIGl8=
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: 12 additions & 8 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,14 +547,18 @@ func prepareOauthAPIServerOperator(ctx context.Context, controllerContext *contr
).WithStaticResourcesController(
"APIServerStaticResources",
assets.Asset,
[]string{
"oauth-apiserver/ns.yaml",
"oauth-apiserver/apiserver-clusterrolebinding.yaml",
"oauth-apiserver/svc.yaml",
"oauth-apiserver/sa.yaml",
"oauth-apiserver/RBAC/useroauthaccesstokens_binding.yaml",
"oauth-apiserver/RBAC/useroauthaccesstokens_clusterrole.yaml",
"oauth-apiserver/oauth-apiserver-pdb.yaml",
[]apiservercontrollerset.ConditionalFiles{
{
Files: []string{
"oauth-apiserver/ns.yaml",
"oauth-apiserver/apiserver-clusterrolebinding.yaml",
"oauth-apiserver/svc.yaml",
"oauth-apiserver/sa.yaml",
"oauth-apiserver/RBAC/useroauthaccesstokens_binding.yaml",
"oauth-apiserver/RBAC/useroauthaccesstokens_clusterrole.yaml",
"oauth-apiserver/oauth-apiserver-pdb.yaml",
},
},
},
operatorCtx.kubeInformersForNamespaces,
operatorCtx.kubeClient,
Expand Down
17 changes: 14 additions & 3 deletions ...b.com/openshift/library-go/pkg/operator/apiserver/controllerset/apiservercontrollerset.go
View file
Open in desktop

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

29 changes: 17 additions & 12 deletions vendor/github.com/openshift/library-go/pkg/operator/resource/resourceapply/core.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-20211216141749-1816407208cf
# github.com/openshift/library-go v0.0.0-20211217155025-d48a1fb9b7c2
## explicit; go 1.17
github.com/openshift/library-go/pkg/apps/deployment
github.com/openshift/library-go/pkg/assets
Expand Down