Skip to content

Commit

Permalink
Update patches, checksums and attribution for replicatedhq/troubleshoot
Browse files Browse the repository at this point in the history
  • Loading branch information
abhay-krishna committed Apr 11, 2024
1 parent 5ceea31 commit 69bc57d
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 20 deletions.
27 changes: 15 additions & 12 deletions projects/replicatedhq/troubleshoot/ATTRIBUTION.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ https://github.com/prometheus/common
** github.com/prometheus/procfs; version v0.12.0 --
https://github.com/prometheus/procfs

** github.com/replicatedhq/troubleshoot; version v0.86.0 --
** github.com/replicatedhq/troubleshoot; version v0.87.0 --
https://github.com/replicatedhq/troubleshoot

** github.com/spf13/afero; version v1.11.0 --
Expand Down Expand Up @@ -200,16 +200,16 @@ https://github.com/census-instrumentation/opencensus-go
** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.46.1 --
https://github.com/open-telemetry/opentelemetry-go-contrib

** go.opentelemetry.io/otel; version v1.24.0 --
** go.opentelemetry.io/otel; version v1.25.0 --
https://github.com/open-telemetry/opentelemetry-go

** go.opentelemetry.io/otel/metric; version v1.24.0 --
** go.opentelemetry.io/otel/metric; version v1.25.0 --
https://github.com/open-telemetry/opentelemetry-go

** go.opentelemetry.io/otel/sdk; version v1.24.0 --
** go.opentelemetry.io/otel/sdk; version v1.25.0 --
https://github.com/open-telemetry/opentelemetry-go

** go.opentelemetry.io/otel/trace; version v1.24.0 --
** go.opentelemetry.io/otel/trace; version v1.25.0 --
https://github.com/open-telemetry/opentelemetry-go

** google.golang.org/genproto/googleapis/api; version v0.0.0-20231106174013-bbf56f31fb17 --
Expand Down Expand Up @@ -266,6 +266,9 @@ https://github.com/kubernetes/kube-openapi
** k8s.io/kubectl/pkg; version v0.29.0 --
https://github.com/kubernetes/kubectl

** k8s.io/kubelet/pkg/apis/stats/v1alpha1; version v0.29.3 --
https://github.com/kubernetes/kubelet

** k8s.io/metrics/pkg/apis/custom_metrics; version v0.29.3 --
https://github.com/kubernetes/metrics

Expand All @@ -278,7 +281,7 @@ https://github.com/oras-project/oras-go
** periph.io/x/host/v3/distro; version v3.8.2 --
https://github.com/periph/host

** sigs.k8s.io/controller-runtime/pkg; version v0.17.2 --
** sigs.k8s.io/controller-runtime/pkg; version v0.17.3 --
https://github.com/kubernetes-sigs/controller-runtime

** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd --
Expand Down Expand Up @@ -999,28 +1002,28 @@ https://github.com/sagikazarmark/slog-shim
** golang.org/go; version go1.21.8 --
https://github.com/golang/go

** golang.org/x/crypto; version v0.21.0 --
** golang.org/x/crypto; version v0.22.0 --
https://golang.org/x/crypto

** golang.org/x/exp; version v0.0.0-20240222234643-814bf88cf225 --
https://golang.org/x/exp

** golang.org/x/mod/semver; version v0.16.0 --
** golang.org/x/mod/semver; version v0.17.0 --
https://golang.org/x/mod

** golang.org/x/net; version v0.22.0 --
** golang.org/x/net; version v0.24.0 --
https://golang.org/x/net

** golang.org/x/oauth2; version v0.18.0 --
https://golang.org/x/oauth2

** golang.org/x/sync; version v0.6.0 --
** golang.org/x/sync; version v0.7.0 --
https://golang.org/x/sync

** golang.org/x/sys; version v0.18.0 --
** golang.org/x/sys; version v0.19.0 --
https://golang.org/x/sys

** golang.org/x/term; version v0.18.0 --
** golang.org/x/term; version v0.19.0 --
https://golang.org/x/term

** golang.org/x/text; version v0.14.0 --
Expand Down
4 changes: 2 additions & 2 deletions projects/replicatedhq/troubleshoot/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
8d15a869d71606985ff38d06ef44dd945f301b85a5e6849369ca7bb9c873ad9e _output/bin/troubleshoot/linux-amd64/support-bundle
c189e9b48d525259f19f79c05427ea0c97b8e1d4d78b0a995d490d4f1038b87f _output/bin/troubleshoot/linux-arm64/support-bundle
323cc813beb9ae65a6ee016e9b7ab0918679eb99a408ec5cc6f65012added6aa _output/bin/troubleshoot/linux-amd64/support-bundle
dcc04d5f6dd0baf3b875e39e8d244bf7a5e0c998c49889636ce2da234e9a696c _output/bin/troubleshoot/linux-arm64/support-bundle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 3cd425d8b5e5f7a19c6683641760680cbaba5b16 Mon Sep 17 00:00:00 2001
From 3421d32b915c8929bddd0fe3720dfcb11539d985 Mon Sep 17 00:00:00 2001
From: danbudris <[email protected]>
Date: Fri, 3 Mar 2023 15:07:50 -0800
Subject: [PATCH] Replace dependency to mitigate license issues and fix module
Expand All @@ -18,7 +18,7 @@ Signed-off-by: Dan Budris <[email protected]>
2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 6194d96..a3f6ddd 100644
index 2109e4a..e73f833 100644
--- a/go.mod
+++ b/go.mod
@@ -116,6 +116,7 @@ require (
Expand All @@ -27,8 +27,8 @@ index 6194d96..a3f6ddd 100644
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/trace v1.25.0 // indirect
@@ -136,7 +137,7 @@ require (
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
Expand All @@ -46,14 +46,14 @@ index 6194d96..a3f6ddd 100644
github.com/xlab/treeprint v1.2.0 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opencensus.io v0.24.0 // indirect
@@ -265,4 +265,5 @@ require (
@@ -266,4 +266,5 @@ require (
replace (
github.com/StackExchange/wmi => github.com/yusufpapurcu/wmi v1.2.2
github.com/go-ole/go-ole => github.com/go-ole/go-ole v1.2.6 // needed for arm builds
+ github.com/xi2/xz => github.com/therootcompany/xz v1.0.1
)
diff --git a/go.sum b/go.sum
index 6fc4b39..5027b70 100644
index 925e6d2..06787c4 100644
--- a/go.sum
+++ b/go.sum
@@ -234,8 +234,9 @@ github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412 h1:vOVO0y
Expand Down

0 comments on commit 69bc57d

Please sign in to comment.