From 38988669284a84b248f86834ddc235da3558fa98 Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Mon, 1 Apr 2024 14:31:06 -0700 Subject: [PATCH] Update patches, checksums and attribution for replicatedhq/troubleshoot --- .../replicatedhq/troubleshoot/ATTRIBUTION.txt | 36 +++++++++---------- projects/replicatedhq/troubleshoot/CHECKSUMS | 4 +-- ...cy-to-mitigate-license-issues-and-fi.patch | 14 ++++---- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/projects/replicatedhq/troubleshoot/ATTRIBUTION.txt b/projects/replicatedhq/troubleshoot/ATTRIBUTION.txt index f89a1ff33d..e17b9ddf0a 100644 --- a/projects/replicatedhq/troubleshoot/ATTRIBUTION.txt +++ b/projects/replicatedhq/troubleshoot/ATTRIBUTION.txt @@ -14,7 +14,7 @@ https://github.com/googleapis/google-cloud-go ** github.com/ahmetalpbalkan/go-cursor; version v0.0.0-20131010032410-8136607ea412 -- https://github.com/ahmetb/go-cursor -** github.com/aws/aws-sdk-go; version v1.44.253 -- +** github.com/aws/aws-sdk-go; version v1.48.10 -- https://github.com/aws/aws-sdk-go ** github.com/containerd/containerd; version v1.7.13 -- @@ -38,7 +38,7 @@ https://github.com/containers/ocicrypt ** github.com/containers/storage; version v1.53.0 -- https://github.com/containers/storage -** github.com/distribution/distribution/v3; version v3.0.0-20221208165359-362910506bc2 -- +** github.com/distribution/distribution/v3/registry/api; version v3.0.0-alpha.1 -- https://github.com/distribution/distribution/v3 ** github.com/distribution/reference; version v0.5.0 -- @@ -50,7 +50,7 @@ https://github.com/docker/cli ** github.com/docker/distribution; version v2.8.3+incompatible -- https://github.com/distribution/distribution -** github.com/docker/docker; version v25.0.3+incompatible -- +** github.com/docker/docker; version v25.0.5+incompatible -- https://github.com/moby/moby ** github.com/docker/go-connections; version v0.5.0 -- @@ -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.84.1 -- +** github.com/replicatedhq/troubleshoot; version v0.85.0 -- https://github.com/replicatedhq/troubleshoot ** github.com/spf13/afero; version v1.11.0 -- @@ -182,7 +182,7 @@ https://github.com/spf13/cobra ** github.com/tklauser/numcpus; version v0.6.1 -- https://github.com/tklauser/numcpus -** github.com/vmware-tanzu/velero/pkg/apis/velero; version v1.13.0 -- +** github.com/vmware-tanzu/velero/pkg/apis/velero; version v1.13.1 -- https://github.com/vmware-tanzu/velero ** github.com/xeipuuv/gojsonpointer; version v0.0.0-20190905194746-02993c407bfb -- @@ -197,7 +197,7 @@ https://github.com/xeipuuv/gojsonschema ** go.opencensus.io; version v0.24.0 -- https://github.com/census-instrumentation/opencensus-go -** go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp; version v0.45.0 -- +** 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 -- @@ -233,25 +233,25 @@ https://gopkg.in/yaml.v2 ** helm.sh/helm/v3; version v3.14.3 -- https://github.com/helm/helm -** k8s.io/api; version v0.29.2 -- +** k8s.io/api; version v0.29.3 -- https://github.com/kubernetes/api -** k8s.io/apiextensions-apiserver/pkg; version v0.29.2 -- +** k8s.io/apiextensions-apiserver/pkg; version v0.29.3 -- https://github.com/kubernetes/apiextensions-apiserver -** k8s.io/apimachinery/pkg; version v0.29.2 -- +** k8s.io/apimachinery/pkg; version v0.29.3 -- https://github.com/kubernetes/apimachinery -** k8s.io/apiserver/pkg; version v0.29.2 -- +** k8s.io/apiserver/pkg; version v0.29.3 -- https://github.com/kubernetes/apiserver -** k8s.io/cli-runtime/pkg; version v0.29.2 -- +** k8s.io/cli-runtime/pkg; version v0.29.3 -- https://github.com/kubernetes/cli-runtime -** k8s.io/client-go; version v0.29.2 -- +** k8s.io/client-go; version v0.29.3 -- https://github.com/kubernetes/client-go -** k8s.io/component-base/version; version v0.29.2 -- +** k8s.io/component-base/version; version v0.29.3 -- https://github.com/kubernetes/component-base ** k8s.io/klog/v2; version v2.120.1 -- @@ -266,7 +266,7 @@ https://github.com/kubernetes/kube-openapi ** k8s.io/kubectl/pkg; version v0.29.0 -- https://github.com/kubernetes/kubectl -** k8s.io/metrics/pkg/apis/custom_metrics; version v0.29.2 -- +** k8s.io/metrics/pkg/apis/custom_metrics; version v0.29.3 -- https://github.com/kubernetes/metrics ** k8s.io/utils; version v0.0.0-20230726121419-3b25d923346b -- @@ -987,7 +987,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** filippo.io/edwards25519; version v1.1.0 -- https://github.com/FiloSottile/edwards25519 -** github.com/aws/aws-sdk-go/internal/sync/singleflight; version v1.44.253 -- +** github.com/aws/aws-sdk-go/internal/sync/singleflight; version v1.48.10 -- https://github.com/aws/aws-sdk-go ** github.com/liggitt/tabwriter; version v0.0.0-20181228230101-89fcab3d43de -- @@ -1029,10 +1029,10 @@ https://golang.org/x/text ** golang.org/x/time/rate; version v0.5.0 -- https://golang.org/x/time -** k8s.io/apimachinery/third_party/forked/golang; version v0.29.2 -- +** k8s.io/apimachinery/third_party/forked/golang; version v0.29.3 -- https://github.com/kubernetes/apimachinery -** k8s.io/client-go/third_party/forked/golang/template; version v0.29.2 -- +** k8s.io/client-go/third_party/forked/golang/template; version v0.29.3 -- https://github.com/kubernetes/client-go Copyright (c) 2009 The Go Authors. All rights reserved. @@ -1304,7 +1304,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/golang/protobuf; version v1.5.3 -- +** github.com/golang/protobuf; version v1.5.4 -- https://github.com/golang/protobuf Copyright 2010 The Go Authors. All rights reserved. diff --git a/projects/replicatedhq/troubleshoot/CHECKSUMS b/projects/replicatedhq/troubleshoot/CHECKSUMS index cf464fc80f..b01c51486a 100644 --- a/projects/replicatedhq/troubleshoot/CHECKSUMS +++ b/projects/replicatedhq/troubleshoot/CHECKSUMS @@ -1,2 +1,2 @@ -7d6f50cae887ec24a152748f1957cccab826d3364ceb76008e1803d1535fb484 _output/bin/troubleshoot/linux-amd64/support-bundle -5afc295095c6d85f836d1916e7ef67fab2748b078183f1abaa9ecb2b70ce5a27 _output/bin/troubleshoot/linux-arm64/support-bundle +3732ecf0b570f76757c3783722d7e18d6af88c96f3c98ddf1d715fcd14d5b0da _output/bin/troubleshoot/linux-amd64/support-bundle +5905991947bd390501aa4ec97100de490c9e5c6acaa231d4b2238e088efe780c _output/bin/troubleshoot/linux-arm64/support-bundle diff --git a/projects/replicatedhq/troubleshoot/patches/0001-Replace-dependency-to-mitigate-license-issues-and-fi.patch b/projects/replicatedhq/troubleshoot/patches/0001-Replace-dependency-to-mitigate-license-issues-and-fi.patch index 1a081ed942..74dd2c5bd0 100644 --- a/projects/replicatedhq/troubleshoot/patches/0001-Replace-dependency-to-mitigate-license-issues-and-fi.patch +++ b/projects/replicatedhq/troubleshoot/patches/0001-Replace-dependency-to-mitigate-license-issues-and-fi.patch @@ -1,4 +1,4 @@ -From 63204971e0413a5917973c68053f19af978d1ed6 Mon Sep 17 00:00:00 2001 +From 3cd425d8b5e5f7a19c6683641760680cbaba5b16 Mon Sep 17 00:00:00 2001 From: danbudris Date: Fri, 3 Mar 2023 15:07:50 -0800 Subject: [PATCH] Replace dependency to mitigate license issues and fix module @@ -18,7 +18,7 @@ Signed-off-by: Dan Budris 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod -index fdd3b86..3f03976 100644 +index 6194d96..a3f6ddd 100644 --- a/go.mod +++ b/go.mod @@ -116,6 +116,7 @@ require ( @@ -26,7 +26,7 @@ index fdd3b86..3f03976 100644 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect 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.45.0 // 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 @@ -136,7 +137,7 @@ require ( @@ -35,7 +35,7 @@ index fdd3b86..3f03976 100644 github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect - github.com/andybalholm/brotli v1.0.1 // indirect + github.com/andybalholm/brotli v1.1.0 // indirect - github.com/aws/aws-sdk-go v1.44.253 // indirect + github.com/aws/aws-sdk-go v1.48.10 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect @@ -229,7 +230,6 @@ require ( @@ -53,10 +53,10 @@ index fdd3b86..3f03976 100644 + github.com/xi2/xz => github.com/therootcompany/xz v1.0.1 ) diff --git a/go.sum b/go.sum -index 278be58..e33328d 100644 +index 6fc4b39..5027b70 100644 --- a/go.sum +++ b/go.sum -@@ -236,8 +236,9 @@ github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412 h1:vOVO0y +@@ -234,8 +234,9 @@ github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412 h1:vOVO0y github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412/go.mod h1:AI9hp1tkp10pAlK5TCwL+7yWbRgtDm9jhToq6qij2xs= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -67,7 +67,7 @@ index 278be58..e33328d 100644 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU= github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc= -@@ -886,6 +887,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtse +@@ -889,6 +890,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtse github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BGhTkes= github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=