Skip to content

Bug 2034484: feat: bumped library-go #304

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 4 commits into from
Dec 21, 2021
Merged

Bug 2034484: feat: bumped library-go #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
156007d
feat: upgraded library-go
eggfoobar Dec 15, 2021
b464a3d
bump: library-go
eggfoobar Dec 17, 2021
e74ca7b
bump: library-go
eggfoobar Dec 20, 2021
07199b7
fix: rbac read for infrastructures resource
eggfoobar Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions api/v1/zz_generated.deepcopy.go
View file
Open in desktop

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

1 change: 1 addition & 0 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ rules:
- get
- list
- watch
- apiGroups:
- config.openshift.io
resources:
- infrastructures
verbs:
- get
- list
- watch
- apiGroups:
- rbac.authorization.k8s.io
resources:
Expand Down
1 change: 1 addition & 0 deletions controllers/localvolume/localvolume_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ func (r *LocalVolumeReconciler) deregisterLVFromStorageClass(lv localv1.LocalVol
//+kubebuilder:rbac:groups=storage.k8s.io,resources=storageclasses,verbs=*
//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles;clusterrolebindings;rolebindings,verbs=get;list;watch;create;update;patch;delete
//+kubebuilder:rbac:groups="",resources=nodes,verbs=get;list;watch
//+kubebuilder:rbac:groups=config.openshift.io,resources=infrastructures,verbs=get;list;watch

func (r *LocalVolumeReconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.Result, error) {
logger := r.Log.WithValues("request.Namespace", request.Namespace, "Request.Name", request.Name)
Expand Down
11 changes: 5 additions & 6 deletions diskmaker/api_updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (

localv1 "github.com/openshift/local-storage-operator/api/v1"
"github.com/openshift/local-storage-operator/api/v1alpha1"
"github.com/prometheus/common/log"
Copy link
Copy Markdown
Contributor Author

@eggfoobar eggfoobar Dec 15, 2021

Choose a reason for hiding this comment

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

I wasn't sure if there was a reason why the prometheus log package was pulled in, they recently did a refactor to a different package. Since we're already using klog and zap directly, figured it might be easier to utilize klog instead. Should I refactor to pull this in if needed?

Copy link
Copy Markdown
Member

@dobsonj dobsonj Dec 20, 2021

Choose a reason for hiding this comment

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

This change looks fine, I think it was a mistake that LSO ever used this prometheus log package.


v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -42,18 +41,18 @@ type sdkAPIUpdater struct {
func NewAPIUpdater(scheme *runtime.Scheme) (ApiUpdater, error) {
recorder, err := getEventRecorder(scheme)
if err != nil {
log.Error(err, "failed to get event recorder")
klog.Error(err, "failed to get event recorder")
return &sdkAPIUpdater{}, err
}

config, err := config.GetConfig()
if err != nil {
log.Error(err, "failed to get rest.config")
klog.Error(err, "failed to get rest.config")
return &sdkAPIUpdater{}, err
}
crClient, err := client.New(config, client.Options{})
if err != nil {
log.Error(err, "failed to create controller-runtime client")
klog.Error(err, "failed to create controller-runtime client")
return &sdkAPIUpdater{}, err
}

Expand All @@ -68,12 +67,12 @@ func getEventRecorder(scheme *runtime.Scheme) (record.EventRecorder, error) {
var recorder record.EventRecorder
config, err := config.GetConfig()
if err != nil {
log.Error(err, "failed to get rest.config")
klog.Error(err, "failed to get rest.config")
return recorder, err
}
kubeClient, err := kubernetes.NewForConfig(config)
if err != nil {
log.Error(err, "could not build kubeclient")
klog.Error(err, "could not build kubeclient")
}
eventBroadcaster := record.NewBroadcaster()
eventBroadcaster.StartLogging(klog.Infof)
Expand Down
5 changes: 2 additions & 3 deletions diskmaker_manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
diskmakerControllerLvSet "github.com/openshift/local-storage-operator/diskmaker/controllers/lvset"
"github.com/openshift/local-storage-operator/localmetrics"
"github.com/pkg/errors"
"github.com/prometheus/common/log"
"github.com/spf13/cobra"
zaplog "go.uber.org/zap"
apiruntime "k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -62,7 +61,7 @@ func startManager(cmd *cobra.Command, args []string) error {

namespace, err := common.GetWatchNamespace()
if err != nil {
log.Error(err, "Failed to get watch namespace")
setupLog.Error(err, "Failed to get watch namespace")
return err
}

Expand Down Expand Up @@ -115,7 +114,7 @@ func startManager(cmd *cobra.Command, args []string) error {
// Start the Cmd
stopChan := signals.SetupSignalHandler()
if err := mgr.Start(stopChan); err != nil {
log.Error(err, "manager exited non-zero")
setupLog.Error(err, "manager exited non-zero")
return err
}
return nil
Expand Down
85 changes: 42 additions & 43 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,64 +5,63 @@ go 1.16
require (
github.com/aws/aws-sdk-go v1.38.49
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v0.4.0
github.com/go-logr/logr v1.2.0
github.com/google/gofuzz v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0
github.com/onsi/gomega v1.16.0
github.com/openshift/api v0.0.0-20210831091943-07e756545ac1
github.com/openshift/client-go v0.0.0-20210831095141-e19a065e79f7
github.com/openshift/library-go v0.0.0-20210831102543-1a08f0c3bd9a
github.com/onsi/gomega v1.17.0
github.com/openshift/api v0.0.0-20211209135129-c58d9f695577
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3
github.com/openshift/library-go v0.0.0-20211220195323-eca2c467c492
github.com/pborman/uuid v1.2.1
github.com/pkg/errors v0.9.1
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.49.0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/common v0.26.0
github.com/rogpeppe/go-internal v1.8.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
go.uber.org/zap v1.18.1
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
k8s.io/api v0.22.1
k8s.io/apiextensions-apiserver v0.22.1
k8s.io/apimachinery v0.22.1
k8s.io/client-go v0.22.1
k8s.io/component-helpers v0.22.1
go.uber.org/zap v1.19.1
golang.org/x/net v0.0.0-20210825183410-e898025ed96a
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8
k8s.io/api v0.23.0
k8s.io/apiextensions-apiserver v0.23.0
k8s.io/apimachinery v0.23.0
k8s.io/client-go v0.23.0
k8s.io/component-helpers v0.23.0
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471
sigs.k8s.io/controller-runtime v0.9.6
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
sigs.k8s.io/controller-runtime v0.11.0
sigs.k8s.io/sig-storage-local-static-provisioner v0.0.0-20210414025242-c96e27d784e2
sigs.k8s.io/yaml v1.2.0
sigs.k8s.io/yaml v1.3.0
)

replace (
k8s.io/api => k8s.io/api v0.22.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.1
k8s.io/apimachinery => k8s.io/apimachinery v0.22.1
k8s.io/apiserver => k8s.io/apiserver v0.22.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.1
k8s.io/client-go => k8s.io/client-go v0.22.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.1
k8s.io/code-generator => k8s.io/code-generator v0.22.1
k8s.io/component-base => k8s.io/component-base v0.22.1
k8s.io/component-helpers => k8s.io/component-helpers v0.22.1
k8s.io/controller-manager => k8s.io/controller-manager v0.22.1
k8s.io/cri-api => k8s.io/cri-api v0.22.1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.1
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.1
k8s.io/kubectl => k8s.io/kubectl v0.22.1
k8s.io/kubelet => k8s.io/kubelet v0.22.1
k8s.io/api => k8s.io/api v0.23.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.0
k8s.io/apimachinery => k8s.io/apimachinery v0.23.0
k8s.io/apiserver => k8s.io/apiserver v0.23.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.0
k8s.io/client-go => k8s.io/client-go v0.23.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.0
k8s.io/code-generator => k8s.io/code-generator v0.23.0
k8s.io/component-base => k8s.io/component-base v0.23.0
k8s.io/component-helpers => k8s.io/component-helpers v0.23.0
k8s.io/controller-manager => k8s.io/controller-manager v0.23.0
k8s.io/cri-api => k8s.io/cri-api v0.23.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.0
k8s.io/kubectl => k8s.io/kubectl v0.23.0
k8s.io/kubelet => k8s.io/kubelet v0.23.0
k8s.io/kubernetes => k8s.io/kubernetes v1.22.1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.1
k8s.io/metrics => k8s.io/metrics v0.22.1
k8s.io/mount-utils => k8s.io/mount-utils v0.22.1
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.1
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.0
k8s.io/metrics => k8s.io/metrics v0.23.0
k8s.io/mount-utils => k8s.io/mount-utils v0.23.0
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.0
)

replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
Expand Down
Loading