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

Jump to bottom

Bump replicatedhq/troubleshoot to latest release #3019

Merged
merged 2 commits into from
Mar 19, 2024
Merged

Bump replicatedhq/troubleshoot to latest release #3019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75ccd7c
Bump replicatedhq/troubleshoot to latest release
eks-distro-pr-bot Mar 18, 2024
f5458f6
Update patches, checksums and attribution for replicatedhq/troubleshoot
abhay-krishna Mar 19, 2024
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 UPSTREAM_PROJECTS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ projects:
repos:
- name: troubleshoot
versions:
- tag: v0.84.0
- tag: v0.84.1
go_version: "1.21"
- org: tinkerbell
repos:
Expand Down
107 changes: 30 additions & 77 deletions projects/replicatedhq/troubleshoot/ATTRIBUTION.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ https://github.com/containerd/log
** github.com/containerd/stargz-snapshotter/estargz; version v0.15.1 --
https://github.com/containerd/stargz-snapshotter/estargz

** github.com/containers/image/v5; version v5.29.2 --
** github.com/containers/image/v5; version v5.30.0 --
https://github.com/containers/image/v5

** github.com/containers/libtrust; version v0.0.0-20230121012942-c1716e8a8d01 --
Expand All @@ -35,7 +35,7 @@ https://github.com/containers/libtrust
** github.com/containers/ocicrypt/spec; version v1.1.9 --
https://github.com/containers/ocicrypt

** github.com/containers/storage; version v1.51.0 --
** github.com/containers/storage; version v1.53.0 --
https://github.com/containers/storage

** github.com/distribution/distribution/v3; version v3.0.0-20221208165359-362910506bc2 --
Expand All @@ -44,13 +44,13 @@ https://github.com/distribution/distribution/v3
** github.com/distribution/reference; version v0.5.0 --
https://github.com/distribution/reference

** github.com/docker/cli/cli/config; version v25.0.1+incompatible --
** github.com/docker/cli/cli/config; version v25.0.3+incompatible --
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.1+incompatible --
** github.com/docker/docker; version v25.0.3+incompatible --
https://github.com/moby/moby

** github.com/docker/go-connections; version v0.5.0 --
Expand All @@ -74,7 +74,7 @@ https://github.com/go-openapi/jsonpointer
** github.com/go-openapi/jsonreference; version v0.20.2 --
https://github.com/go-openapi/jsonreference

** github.com/go-openapi/swag; version v0.22.4 --
** github.com/go-openapi/swag; version v0.22.10 --
https://github.com/go-openapi/swag

** github.com/golang-sql/civil; version v0.0.0-20220223132316-b832511892a9 --
Expand All @@ -89,7 +89,7 @@ https://github.com/google/btree
** github.com/google/gnostic-models; version v0.6.8 --
https://github.com/google/gnostic-models

** github.com/google/go-containerregistry/pkg/v1; version v0.16.1 --
** github.com/google/go-containerregistry/pkg/v1; version v0.19.0 --
https://github.com/google/go-containerregistry

** github.com/google/go-intervals/intervalset; version v0.0.2 --
Expand All @@ -110,7 +110,7 @@ https://github.com/googleapis/enterprise-certificate-proxy
** github.com/jmespath/go-jmespath; version v0.4.0 --
https://github.com/jmespath/go-jmespath

** github.com/klauspost/compress; version v1.17.3 --
** github.com/klauspost/compress; version v1.17.7 --
https://github.com/klauspost/compress

** github.com/longhorn/go-iscsi-helper/util; version v0.0.0-20210330030558-49a327fb024e --
Expand All @@ -134,6 +134,9 @@ https://github.com/moby/spdystream
** github.com/moby/sys/mountinfo; version v0.7.1 --
https://github.com/moby/sys/mountinfo

** github.com/moby/sys/user; version v0.1.0 --
https://github.com/moby/sys/user

** github.com/moby/term; version v0.5.0 --
https://github.com/moby/term

Expand All @@ -149,10 +152,7 @@ https://github.com/opencontainers/go-digest
** github.com/opencontainers/image-spec/specs-go; version v1.1.0 --
https://github.com/opencontainers/image-spec

** github.com/opencontainers/runc/libcontainer/user; version v1.1.12 --
https://github.com/opencontainers/runc

** github.com/opencontainers/runtime-spec/specs-go; version v1.1.0 --
** github.com/opencontainers/runtime-spec/specs-go; version v1.2.0 --
https://github.com/opencontainers/runtime-spec

** github.com/opencontainers/selinux; version v1.11.0 --
Expand All @@ -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.0 --
** github.com/replicatedhq/troubleshoot; version v0.84.1 --
https://github.com/replicatedhq/troubleshoot

** github.com/spf13/afero; version v1.11.0 --
Expand Down Expand Up @@ -230,7 +230,7 @@ https://gopkg.in/ini.v1
** gopkg.in/yaml.v2; version v2.4.0 --
https://gopkg.in/yaml.v2

** helm.sh/helm/v3; version v3.14.2 --
** helm.sh/helm/v3; version v3.14.3 --
https://github.com/helm/helm

** k8s.io/api; version v0.29.2 --
Expand Down Expand Up @@ -619,26 +619,6 @@ This product includes software developed at
Docker Inc. (https://www.docker.com/).


* For github.com/opencontainers/runc/libcontainer/user see also this required NOTICE:
runc

Copyright 2012-2015 Docker, Inc.

This product includes software developed at Docker, Inc. (http://www.docker.com).

The following is courtesy of our legal counsel:


Use and transfer of Docker may be subject to certain restrictions by the
United States and other governments.
It is your responsibility to ensure that your use and/or transfer does not
violate applicable laws.

For more information, please see http://www.bis.doc.gov

See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.


* For github.com/prometheus/client_golang/prometheus see also this required NOTICE:
Prometheus instrumentation library for Go applications
Copyright 2012-2015 The Prometheus Authors
Expand Down Expand Up @@ -1004,6 +984,9 @@ 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 --
https://github.com/aws/aws-sdk-go

Expand All @@ -1019,7 +1002,7 @@ https://github.com/golang/go
** golang.org/x/crypto; version v0.21.0 --
https://golang.org/x/crypto

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

** golang.org/x/mod/semver; version v0.16.0 --
Expand All @@ -1028,7 +1011,7 @@ https://golang.org/x/mod
** golang.org/x/net; version v0.22.0 --
https://golang.org/x/net

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

** golang.org/x/sync; version v0.6.0 --
Expand Down Expand Up @@ -1358,7 +1341,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
** github.com/golang/snappy; version v0.0.4 --
https://github.com/golang/snappy

** github.com/klauspost/compress/internal/snapref; version v1.17.3 --
** github.com/klauspost/compress/internal/snapref; version v1.17.7 --
https://github.com/klauspost/compress

Copyright (c) 2011 The Snappy-Go Authors. All rights reserved.
Expand Down Expand Up @@ -1460,40 +1443,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
** github.com/gorilla/handlers; version v1.5.2 --
https://github.com/gorilla/handlers

Copyright (c) 2023 The Gorilla Authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------

** github.com/gorilla/mux; version v1.8.0 --
** github.com/gorilla/mux; version v1.8.1 --
https://github.com/gorilla/mux

Copyright (c) 2012-2018 The Gorilla Authors. All rights reserved.
Copyright (c) 2023 The Gorilla Authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -1834,7 +1787,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------

** github.com/sylabs/sif/v2/pkg/sif; version v2.15.0 --
** github.com/sylabs/sif/v2/pkg/sif; version v2.15.1 --
https://github.com/sylabs/sif/v2

# LICENSE
Expand Down Expand Up @@ -2104,7 +2057,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------

** google.golang.org/protobuf; version v1.31.0 --
** google.golang.org/protobuf; version v1.33.0 --
https://go.googlesource.com/protobuf

Copyright (c) 2018 The Go Authors. All rights reserved.
Expand Down Expand Up @@ -2350,7 +2303,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

------

** github.com/andybalholm/brotli; version v1.0.5 --
** github.com/andybalholm/brotli; version v1.1.0 --
https://github.com/andybalholm/brotli
Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors.

Expand Down Expand Up @@ -2386,7 +2339,7 @@ Copyright (c) 2016 Caleb Spare
https://github.com/chzyer/readline
Copyright (c) 2015 Chzyer

** github.com/docker/docker-credential-helpers; version v0.8.0 --
** github.com/docker/docker-credential-helpers; version v0.8.1 --
https://github.com/docker/docker-credential-helpers
Copyright (c) 2016 David Calavera

Expand All @@ -2402,7 +2355,7 @@ Copyright (c) 2015 Exponent Labs LLC
https://github.com/fatih/color
Copyright (c) 2013 Fatih Arslan

** github.com/felixge/httpsnoop; version v1.0.3 --
** github.com/felixge/httpsnoop; version v1.0.4 --
https://github.com/felixge/httpsnoop
Copyright (c) 2016 Felix Geisendörfer ([email protected])

Expand Down Expand Up @@ -2430,7 +2383,7 @@ Copyright (c) 2019 Jack Christensen
https://github.com/jackc/pgservicefile
Copyright (c) 2020 Jack Christensen

** github.com/jackc/pgx/v5; version v5.5.4 --
** github.com/jackc/pgx/v5; version v5.5.5 --
https://github.com/jackc/pgx/v5
Copyright (c) 2013-2021 Jack Christensen

Expand All @@ -2446,7 +2399,7 @@ Copyright (c) 2019 Josh Bleecher Snyder
https://github.com/json-iterator/go
Copyright (c) 2016 json-iterator

** github.com/klauspost/compress/zstd/internal/xxhash; version v1.17.3 --
** github.com/klauspost/compress/zstd/internal/xxhash; version v1.17.7 --
https://github.com/klauspost/compress
Copyright (c) 2016 Caleb Spare

Expand Down Expand Up @@ -2936,11 +2889,11 @@ limitations under the License.

------

** github.com/go-sql-driver/mysql; version v1.7.1 --
** github.com/go-sql-driver/mysql; version v1.8.0 --
https://github.com/go-sql-driver/mysql

* Package github.com/go-sql-driver/mysql's source code may be found at:
https://github.com/go-sql-driver/mysql/tree/v1.7.1
https://github.com/go-sql-driver/mysql/tree/v1.8.0

Mozilla Public License Version 2.0
==================================
Expand Down
4 changes: 2 additions & 2 deletions projects/replicatedhq/troubleshoot/CHECKSUMS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
964fe269b2c79cc8becfd33bb64146dfdab28fc513ab80c817992c4d66f4f802 _output/bin/troubleshoot/linux-amd64/support-bundle
1e727f293aca2c0ad64b167a67685e7a9169ac2fcb8a458d2b42f899deb95f49 _output/bin/troubleshoot/linux-arm64/support-bundle
7d6f50cae887ec24a152748f1957cccab826d3364ceb76008e1803d1535fb484 _output/bin/troubleshoot/linux-amd64/support-bundle
5afc295095c6d85f836d1916e7ef67fab2748b078183f1abaa9ecb2b70ce5a27 _output/bin/troubleshoot/linux-arm64/support-bundle
2 changes: 1 addition & 1 deletion projects/replicatedhq/troubleshoot/GIT_TAG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.84.0
v0.84.1
2 changes: 1 addition & 1 deletion projects/replicatedhq/troubleshoot/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## **replicatedhq/troubleshoot**
![Version](https://img.shields.io/badge/version-v0.84.0-blue)
![Version](https://img.shields.io/badge/version-v0.84.1-blue)
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiWlJsdnRmNnRYUjhUV20xaHJYTng2WXVlVXFBbHZPQnpnblh2bzFLYk1VUHAra2VpWFRFNWpMY0ovTC9PWnBBN2JEcDBXcjRSeVoxd3pyWWxQVzQzZFY4PSIsIml2UGFyYW1ldGVyU3BlYyI6IjZxRUdIK2N6TVZNNUdqL0oiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)

[troubleshoot](https://troubleshoot.sh/) is a kubectl plugin providing diagnostic tools for Kubernetes applications. It provides tools for collecting and analyzing cluster information including deployment statuses, cluster resources, and host logs.
Expand Down
50 changes: 34 additions & 16 deletions ...edhq/troubleshoot/patches/0001-Replace-dependency-to-mitigate-license-issues-and-fi.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 273a9e6a7b6039e6cef6049f283666adf6a6e225 Mon Sep 17 00:00:00 2001
From 63204971e0413a5917973c68053f19af978d1ed6 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 @@ -13,43 +13,61 @@ so bumping to the latest unretracted version

Signed-off-by: Dan Budris <[email protected]>
---
go.mod | 3 ++-
go.sum | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
go.mod | 5 +++--
go.sum | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 1561029..8c7b496 100644
index fdd3b86..3f03976 100644
--- a/go.mod
+++ b/go.mod
@@ -133,7 +133,7 @@ require (
@@ -116,6 +116,7 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
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/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
@@ -136,7 +137,7 @@ require (
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/hcsshim v0.12.0-rc.1 // indirect
github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
- github.com/andybalholm/brotli v1.0.1 // indirect
+ github.com/andybalholm/brotli v1.0.5 // indirect
+ github.com/andybalholm/brotli v1.1.0 // indirect
github.com/aws/aws-sdk-go v1.44.253 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
@@ -264,4 +264,5 @@ require (
@@ -229,7 +230,6 @@ require (
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/vbatts/tar-split v0.11.5 // indirect
- github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
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 (
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 79bdb7d..c3f7e36 100644
index 278be58..e33328d 100644
--- a/go.sum
+++ b/go.sum
@@ -232,6 +232,8 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
@@ -236,8 +236,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=
github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc=
-github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc=
github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
+github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
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=
@@ -975,6 +977,8 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtse
@@ -886,6 +887,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=
Expand All @@ -59,5 +77,5 @@ index 79bdb7d..c3f7e36 100644
github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
--
2.39.3 (Apple Git-145)
2.39.3 (Apple Git-146)