Skip to content

Commit 111fb75

Browse files
authored
Merge pull request #1411 from NVIDIA/dependabot/go_modules/main/github.com/mittwald/go-helm-client-0.12.17
Bump github.com/mittwald/go-helm-client from 0.12.16 to 0.12.17
2 parents 839a6be + 989ff0e commit 111fb75

File tree

42 files changed

+698
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+698
-183
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/NVIDIA/nvidia-container-toolkit v1.17.6
1111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1212
github.com/go-logr/logr v1.4.2
13-
github.com/mittwald/go-helm-client v0.12.16
13+
github.com/mittwald/go-helm-client v0.12.17
1414
github.com/onsi/ginkgo/v2 v2.23.3
1515
github.com/onsi/gomega v1.36.3
1616
github.com/openshift/api v0.0.0-20250311085700-14a17c7009c4
@@ -48,7 +48,7 @@ require (
4848
github.com/blang/semver/v4 v4.0.0 // indirect
4949
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5050
github.com/chai2010/gettext-go v1.0.2 // indirect
51-
github.com/containerd/containerd v1.7.23 // indirect
51+
github.com/containerd/containerd v1.7.24 // indirect
5252
github.com/containerd/errdefs v0.3.0 // indirect
5353
github.com/containerd/log v0.1.0 // indirect
5454
github.com/containerd/platforms v0.2.1 // indirect
@@ -128,7 +128,7 @@ require (
128128
github.com/prometheus/common v0.62.0 // indirect
129129
github.com/prometheus/procfs v0.15.1 // indirect
130130
github.com/rivo/uniseg v0.4.4 // indirect
131-
github.com/rubenv/sql-migrate v1.7.0 // indirect
131+
github.com/rubenv/sql-migrate v1.7.1 // indirect
132132
github.com/russross/blackfriday/v2 v2.1.0 // indirect
133133
github.com/shopspring/decimal v1.4.0 // indirect
134134
github.com/spf13/cast v1.7.0 // indirect
@@ -162,7 +162,7 @@ require (
162162
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
163163
gopkg.in/inf.v0 v0.9.1 // indirect
164164
gopkg.in/yaml.v3 v3.0.1 // indirect
165-
helm.sh/helm/v3 v3.16.4 // indirect
165+
helm.sh/helm/v3 v3.17.1 // indirect
166166
k8s.io/apiserver v0.32.3 // indirect
167167
k8s.io/cli-runtime v0.32.2 // indirect
168168
k8s.io/component-base v0.32.3 // indirect

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNS
6060
github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA=
6161
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
6262
github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
63-
github.com/containerd/containerd v1.7.23 h1:H2CClyUkmpKAGlhQp95g2WXHfLYc7whAuvZGBNYOOwQ=
64-
github.com/containerd/containerd v1.7.23/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw=
63+
github.com/containerd/containerd v1.7.24 h1:zxszGrGjrra1yYJW/6rhm9cJ1ZQ8rkKBR48brqsa7nA=
64+
github.com/containerd/containerd v1.7.24/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw=
6565
github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=
6666
github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
6767
github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4=
@@ -246,8 +246,8 @@ github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQ
246246
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
247247
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
248248
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
249-
github.com/mittwald/go-helm-client v0.12.16 h1:YTyJX6L0SI/O7HNTG0qDZI2/jyGELxJOQEjvTj4mf6k=
250-
github.com/mittwald/go-helm-client v0.12.16/go.mod h1:PDF7Ra8bmJ2YTNzoehoMMi+gW/EJBk/4TLz7j52rehY=
249+
github.com/mittwald/go-helm-client v0.12.17 h1:PncoE1u3fXuHWLineNDQ4hI5J4uVbMW3JWrtdBR86TI=
250+
github.com/mittwald/go-helm-client v0.12.17/go.mod h1:GQxuPspUcMsxWWDtYzjRdxOAjh3LKADIfgqtUf9mjHk=
251251
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
252252
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
253253
github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=
@@ -329,8 +329,8 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
329329
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
330330
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
331331
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
332-
github.com/rubenv/sql-migrate v1.7.0 h1:HtQq1xyTN2ISmQDggnh0c9U3JlP8apWh8YO2jzlXpTI=
333-
github.com/rubenv/sql-migrate v1.7.0/go.mod h1:S4wtDEG1CKn+0ShpTtzWhFpHHI5PvCUtiGI+C+Z2THE=
332+
github.com/rubenv/sql-migrate v1.7.1 h1:f/o0WgfO/GqNuVg+6801K/KW3WdDSupzSjDYODmiUq4=
333+
github.com/rubenv/sql-migrate v1.7.1/go.mod h1:Ob2Psprc0/3ggbM6wCzyYVFFuc6FyZrb2AS+ezLDFb4=
334334
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
335335
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
336336
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
@@ -480,8 +480,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
480480
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
481481
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
482482
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
483-
helm.sh/helm/v3 v3.16.4 h1:rBn/h9MACw+QlhxQTjpl8Ifx+VTWaYsw3rguGBYBzr0=
484-
helm.sh/helm/v3 v3.16.4/go.mod h1:k8QPotUt57wWbi90w3LNmg3/MWcLPigVv+0/X4B8BzA=
483+
helm.sh/helm/v3 v3.17.1 h1:gzVoAD+qVuoJU6KDMSAeo0xRJ6N1znRxz3wyuXRmJDk=
484+
helm.sh/helm/v3 v3.17.1/go.mod h1:nvreuhuR+j78NkQcLC3TYoprCKStLyw5P4T7E5itv2w=
485485
k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls=
486486
k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k=
487487
k8s.io/apiextensions-apiserver v0.32.3 h1:4D8vy+9GWerlErCwVIbcQjsWunF9SUGNu7O7hiQTyPY=

vendor/github.com/containerd/containerd/content/local/store.go

Lines changed: 22 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/remotes/docker/resolver.go

Lines changed: 27 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/remotes/docker/resolver_unix.go

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/remotes/docker/resolver_windows.go

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/containerd/containerd/version/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/helm.sh/helm/v3/internal/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var (
2929
//
3030
// Increment major number for new feature additions and behavioral changes.
3131
// Increment minor number for bug fixes and performance enhancements.
32-
version = "v3.16"
32+
version = "v3.17"
3333

3434
// metadata is extra build time data
3535
metadata = ""

vendor/helm.sh/helm/v3/pkg/action/dependency.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,17 @@ import (
3434
//
3535
// It provides the implementation of 'helm dependency' and its respective subcommands.
3636
type Dependency struct {
37-
Verify bool
38-
Keyring string
39-
SkipRefresh bool
40-
ColumnWidth uint
37+
Verify bool
38+
Keyring string
39+
SkipRefresh bool
40+
ColumnWidth uint
41+
Username string
42+
Password string
43+
CertFile string
44+
KeyFile string
45+
CaFile string
46+
InsecureSkipTLSverify bool
47+
PlainHTTP bool
4148
}
4249

4350
// NewDependency creates a new Dependency object with the given configuration.

vendor/helm.sh/helm/v3/pkg/action/get_metadata.go

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ limitations under the License.
1616

1717
package action
1818

19-
import "time"
19+
import (
20+
"sort"
21+
"strings"
22+
"time"
23+
24+
"helm.sh/helm/v3/pkg/chart"
25+
)
2026

2127
// GetMetadata is the action for checking a given release's metadata.
2228
//
@@ -28,14 +34,16 @@ type GetMetadata struct {
2834
}
2935

3036
type Metadata struct {
31-
Name string `json:"name" yaml:"name"`
32-
Chart string `json:"chart" yaml:"chart"`
33-
Version string `json:"version" yaml:"version"`
34-
AppVersion string `json:"appVersion" yaml:"appVersion"`
35-
Namespace string `json:"namespace" yaml:"namespace"`
36-
Revision int `json:"revision" yaml:"revision"`
37-
Status string `json:"status" yaml:"status"`
38-
DeployedAt string `json:"deployedAt" yaml:"deployedAt"`
37+
Name string `json:"name" yaml:"name"`
38+
Chart string `json:"chart" yaml:"chart"`
39+
Version string `json:"version" yaml:"version"`
40+
AppVersion string `json:"appVersion" yaml:"appVersion"`
41+
Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
42+
Dependencies []*chart.Dependency `json:"dependencies,omitempty" yaml:"dependencies,omitempty"`
43+
Namespace string `json:"namespace" yaml:"namespace"`
44+
Revision int `json:"revision" yaml:"revision"`
45+
Status string `json:"status" yaml:"status"`
46+
DeployedAt string `json:"deployedAt" yaml:"deployedAt"`
3947
}
4048

4149
// NewGetMetadata creates a new GetMetadata object with the given configuration.
@@ -57,13 +65,26 @@ func (g *GetMetadata) Run(name string) (*Metadata, error) {
5765
}
5866

5967
return &Metadata{
60-
Name: rel.Name,
61-
Chart: rel.Chart.Metadata.Name,
62-
Version: rel.Chart.Metadata.Version,
63-
AppVersion: rel.Chart.Metadata.AppVersion,
64-
Namespace: rel.Namespace,
65-
Revision: rel.Version,
66-
Status: rel.Info.Status.String(),
67-
DeployedAt: rel.Info.LastDeployed.Format(time.RFC3339),
68+
Name: rel.Name,
69+
Chart: rel.Chart.Metadata.Name,
70+
Version: rel.Chart.Metadata.Version,
71+
AppVersion: rel.Chart.Metadata.AppVersion,
72+
Dependencies: rel.Chart.Metadata.Dependencies,
73+
Annotations: rel.Chart.Metadata.Annotations,
74+
Namespace: rel.Namespace,
75+
Revision: rel.Version,
76+
Status: rel.Info.Status.String(),
77+
DeployedAt: rel.Info.LastDeployed.Format(time.RFC3339),
6878
}, nil
6979
}
80+
81+
// FormattedDepNames formats metadata.dependencies names into a comma-separated list.
82+
func (m *Metadata) FormattedDepNames() string {
83+
depsNames := make([]string, 0, len(m.Dependencies))
84+
for _, dep := range m.Dependencies {
85+
depsNames = append(depsNames, dep.Name)
86+
}
87+
sort.StringSlice(depsNames).Sort()
88+
89+
return strings.Join(depsNames, ",")
90+
}

0 commit comments

Comments
 (0)