Skip to content
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

Bump github.com/prometheus/common from 0.10.0 to 0.29.0 #6327

Merged
merged 5 commits into from
Jun 22, 2021
Merged

Bump github.com/prometheus/common from 0.10.0 to 0.29.0 #6327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c7bac2
Bump github.com/prometheus/common from 0.10.0 to 0.29.0
dependabot[bot] Jun 21, 2021
0a610f0
Bump github.com/prometheus/common from 0.10.0 to 0.29.0
dependabot[bot] Jun 21, 2021
7565145
Replace prometheus/common/log with logrus
adleong Jun 21, 2021
c05781a
Merge branch 'dependabot/go_modules/github.com/prometheus/common-0.29…
adleong Jun 21, 2021
964da96
Fix formatting
kleimkuhler Jun 22, 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
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ require (
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/common v0.26.0
github.com/prometheus/common v0.29.0
github.com/sergi/go-diff v1.2.0
github.com/servicemeshinterface/smi-sdk-go v0.5.0
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
go.opencensus.io v0.22.3
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
go.opencensus.io v0.22.4
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
golang.org/x/tools v0.1.3
google.golang.org/grpc v1.38.0
google.golang.org/protobuf v1.26.0
Expand Down
80 changes: 69 additions & 11 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jaeger/injector/mutator/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/linkerd/linkerd2/controller/webhook"
"github.com/linkerd/linkerd2/jaeger/pkg/labels"
l5dLabels "github.com/linkerd/linkerd2/pkg/k8s"
"github.com/prometheus/common/log"
log "github.com/sirupsen/logrus"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/tools/record"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/linkerd/linkerd2/pkg/k8s"
"github.com/linkerd/linkerd2/pkg/k8s/resource"
"github.com/prometheus/common/log"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/parsing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/linkerd/linkerd2-proxy-init/ports"
"github.com/linkerd/linkerd2/controller/gen/config"
"github.com/prometheus/common/log"
log "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion viz/tap/api/sever.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/linkerd/linkerd2/pkg/prometheus"
pkgTls "github.com/linkerd/linkerd2/pkg/tls"
pb "github.com/linkerd/linkerd2/viz/tap/gen/tap"
"github.com/prometheus/common/log"
"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion viz/tap/injector/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/linkerd/linkerd2/controller/k8s"
"github.com/linkerd/linkerd2/controller/webhook"
vizLabels "github.com/linkerd/linkerd2/viz/pkg/labels"
"github.com/prometheus/common/log"
log "github.com/sirupsen/logrus"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/tools/record"
Expand Down