Skip to content

Commit 51036b1

Browse files
build(deps): bump helm.sh/helm/v3 from 3.14.3 to 3.14.4 (#3237)
Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.14.3 to 3.14.4. - [Release notes](https://github.com/helm/helm/releases) - [Commits](helm/helm@v3.14.3...v3.14.4) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 4ad0881 commit 51036b1

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
golang.org/x/time v0.5.0
4343
google.golang.org/grpc v1.61.1
4444
gopkg.in/yaml.v2 v2.4.0
45-
helm.sh/helm/v3 v3.14.3
45+
helm.sh/helm/v3 v3.14.4
4646
k8s.io/api v0.29.3
4747
k8s.io/apiextensions-apiserver v0.29.3
4848
k8s.io/apimachinery v0.29.3

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -916,8 +916,8 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
916916
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
917917
gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
918918
gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
919-
helm.sh/helm/v3 v3.14.3 h1:HmvRJlwyyt9HjgmAuxHbHv3PhMz9ir/XNWHyXfmnOP4=
920-
helm.sh/helm/v3 v3.14.3/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
919+
helm.sh/helm/v3 v3.14.4 h1:6FSpEfqyDalHq3kUr4gOMThhgY55kXUEjdQoyODYnrM=
920+
helm.sh/helm/v3 v3.14.4/go.mod h1:Tje7LL4gprZpuBNTbG34d1Xn5NmRT3OWfBRwpOSer9I=
921921
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
922922
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
923923
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=

vendor/helm.sh/helm/v3/cmd/helm/upgrade.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"helm.sh/helm/v3/pkg/cli/values"
3737
"helm.sh/helm/v3/pkg/downloader"
3838
"helm.sh/helm/v3/pkg/getter"
39+
"helm.sh/helm/v3/pkg/release"
3940
"helm.sh/helm/v3/pkg/storage/driver"
4041
)
4142

@@ -115,12 +116,13 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
115116
client.DryRunOption = "none"
116117
}
117118
// Fixes #7002 - Support reading values from STDIN for `upgrade` command
118-
// Must load values AFTER determining if we have to call install so that values loaded from stdin are are not read twice
119+
// Must load values AFTER determining if we have to call install so that values loaded from stdin are not read twice
119120
if client.Install {
120121
// If a release does not exist, install it.
121122
histClient := action.NewHistory(cfg)
122123
histClient.Max = 1
123-
if _, err := histClient.Run(args[0]); err == driver.ErrReleaseNotFound {
124+
versions, err := histClient.Run(args[0])
125+
if err == driver.ErrReleaseNotFound || isReleaseUninstalled(versions) {
124126
// Only print this to stdout for table output
125127
if outfmt == output.Table {
126128
fmt.Fprintf(out, "Release %q does not exist. Installing it now.\n", args[0])
@@ -146,6 +148,9 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
146148
instClient.DependencyUpdate = client.DependencyUpdate
147149
instClient.Labels = client.Labels
148150
instClient.EnableDNS = client.EnableDNS
151+
if isReleaseUninstalled(versions) {
152+
instClient.Replace = true
153+
}
149154

150155
rel, err := runInstall(args, instClient, valueOpts, out)
151156
if err != nil {
@@ -285,3 +290,7 @@ func newUpgradeCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
285290

286291
return cmd
287292
}
293+
294+
func isReleaseUninstalled(versions []*release.Release) bool {
295+
return len(versions) > 0 && versions[len(versions)-1].Info.Status == release.StatusUninstalled
296+
}

vendor/helm.sh/helm/v3/pkg/cli/environment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const defaultMaxHistory = 10
4444
// defaultBurstLimit sets the default client-side throttling limit
4545
const defaultBurstLimit = 100
4646

47-
// defaultQPS sets the default QPS value to 0 to to use library defaults unless specified
47+
// defaultQPS sets the default QPS value to 0 to use library defaults unless specified
4848
const defaultQPS = float32(0)
4949

5050
// EnvSettings describes all of the environment settings.

vendor/helm.sh/helm/v3/pkg/getter/ocigetter.go

+1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ func (g *OCIGetter) newRegistryClient() (*registry.Client, error) {
119119
IdleConnTimeout: 90 * time.Second,
120120
TLSHandshakeTimeout: 10 * time.Second,
121121
ExpectContinueTimeout: 1 * time.Second,
122+
Proxy: http.ProxyFromEnvironment,
122123
}
123124
})
124125

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ gopkg.in/yaml.v2
12491249
# gopkg.in/yaml.v3 v3.0.1
12501250
## explicit
12511251
gopkg.in/yaml.v3
1252-
# helm.sh/helm/v3 v3.14.3
1252+
# helm.sh/helm/v3 v3.14.4
12531253
## explicit; go 1.21
12541254
helm.sh/helm/v3/cmd/helm
12551255
helm.sh/helm/v3/cmd/helm/require

0 commit comments

Comments
 (0)