Skip to content

Bug 2037856: bump library go #590

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 3 commits into from
Jan 24, 2022
Merged

Bug 2037856: bump library go #590

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
0a4d58c
Update library-go
ravisantoshgudimetla Jan 17, 2022
49d4db2
Start using leases as well
ravisantoshgudimetla Jan 17, 2022
d1558c9
Fix tests that rely on lease configmap
ravisantoshgudimetla Jan 24, 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 bindata/assets/config/defaultconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extendedArguments:
leader-elect-retry-period:
- "3s"
leader-elect-resource-lock:
- "configmaps"
- "leases"
controllers:
- "*"
- "-ttl" # TODO: this is excluded in kube-core, but not in #21092
Expand Down
1 change: 1 addition & 0 deletions bindata/assets/kube-controller-manager/leader-election-cluster-policy-controller-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ rules:
- ""
resources:
- configmaps
- leases
verbs:
- get
- list
Expand Down
1 change: 1 addition & 0 deletions ...ets/kube-controller-manager/leader-election-kube-controller-manager-role-kube-system.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ rules:
- ""
resources:
- configmaps
- leases
verbs:
- create
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 @@ -9,7 +9,7 @@ require (
github.com/openshift/api v0.0.0-20220110171111-997c316db5e1
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-20220111125907-7f25b9c7ad22
github.com/openshift/library-go v0.0.0-20220117141918-17ce0045e35e
github.com/prometheus/common v0.28.0
github.com/spf13/cobra v1.2.1
github.com/spf13/pflag v1.0.5
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 @@ -522,8 +522,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-20220111125907-7f25b9c7ad22 h1:yi4NoYekLpqHqatGMwashmyxui0mI3AcoWMPozuCZfA=
github.com/openshift/library-go v0.0.0-20220111125907-7f25b9c7ad22/go.mod h1:4UQ9snU1vg53fyTpHQw3vLPiAxI8ub5xrc+y8KPQQFs=
github.com/openshift/library-go v0.0.0-20220117141918-17ce0045e35e h1:O3M+vt90vglXRKyb9At4S9Z8MpKHwlRJlc1HbokZlt4=
github.com/openshift/library-go v0.0.0-20220117141918-17ce0045e35e/go.mod h1:4UQ9snU1vg53fyTpHQw3vLPiAxI8ub5xrc+y8KPQQFs=
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
2 changes: 1 addition & 1 deletion pkg/cmd/render/render_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func TestRenderCommand(t *testing.T) {
"--flex-volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec",
"--kube-api-burst=300",
"--kube-api-qps=150",
"--leader-elect-resource-lock=configmaps",
"--leader-elect-resource-lock=leases",
"--leader-elect-retry-period=3s",
"--leader-elect=true",
"--pv-recycler-pod-template-filepath-hostpath=",
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,15 +264,15 @@ func TestKCMRecovery(t *testing.T) {

ctx := context.Background()

// Try to delete the kube controller manager's configmap in kube-system
err = kubeClient.CoreV1().ConfigMaps("kube-system").Delete(ctx, "kube-controller-manager", metav1.DeleteOptions{})
// Try to delete the kube controller manager's lease object in kube-system
err = kubeClient.CoordinationV1().Leases("kube-system").Delete(ctx, "kube-controller-manager", metav1.DeleteOptions{})
if err != nil {
t.Fatal(err)
}

// Check to see that the configmap then gets recreated
// Check to see that the lease object then gets recreated
err = wait.Poll(time.Second*5, time.Second*300, func() (bool, error) {
_, err := kubeClient.CoreV1().ConfigMaps("kube-system").Get(ctx, "kube-controller-manager", metav1.GetOptions{})
_, err := kubeClient.CoordinationV1().Leases("kube-system").Get(ctx, "kube-controller-manager", metav1.GetOptions{})
if errors.IsNotFound(err) {
return false, nil
}
Expand Down
13 changes: 10 additions & 3 deletions vendor/github.com/openshift/library-go/pkg/config/leaderelection/leaderelection.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/github.com/openshift/library-go/pkg/controller/controllercmd/builder.go
View file
Open in desktop

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

47 changes: 47 additions & 0 deletions .../openshift/library-go/pkg/operator/staticresourcecontroller/static_resource_controller.go
View file
Open in desktop

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

12 changes: 5 additions & 7 deletions vendor/github.com/openshift/library-go/test/library/metrics/query.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 @@ -254,7 +254,7 @@ github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1
github.com/openshift/client-go/route/clientset/versioned
github.com/openshift/client-go/route/clientset/versioned/scheme
github.com/openshift/client-go/route/clientset/versioned/typed/route/v1
# github.com/openshift/library-go v0.0.0-20220111125907-7f25b9c7ad22
# github.com/openshift/library-go v0.0.0-20220117141918-17ce0045e35e
## explicit; go 1.17
github.com/openshift/library-go/pkg/assets
github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer
Expand Down