Pass --ca-file to helm upgrade
when applicable [#74]
This commit is contained in:
parent
1f7b6bb389
commit
c38537ac32
|
@ -6,7 +6,7 @@
|
||||||
| mode | string | helm_command | Indicates the operation to perform. Recommended, but not required. Valid options are `upgrade`, `uninstall`, `lint`, and `help`. |
|
| mode | string | helm_command | Indicates the operation to perform. Recommended, but not required. Valid options are `upgrade`, `uninstall`, `lint`, and `help`. |
|
||||||
| update_dependencies | boolean | | Calls `helm dependency update` before running the main command.|
|
| update_dependencies | boolean | | Calls `helm dependency update` before running the main command.|
|
||||||
| add_repos | list\<string\> | helm_repos | Calls `helm repo add $repo` before running the main command. Each string should be formatted as `repo_name=https://repo.url/`. |
|
| add_repos | list\<string\> | helm_repos | Calls `helm repo add $repo` before running the main command. Each string should be formatted as `repo_name=https://repo.url/`. |
|
||||||
| repo_ca_file | string | | TLS certificate for a chart repository certificate authority. Only applicable when using `add_repos`. |
|
| repo_ca_file | string | | TLS certificate for a chart repository certificate authority. |
|
||||||
| namespace | string | | Kubernetes namespace to use for this operation. |
|
| namespace | string | | Kubernetes namespace to use for this operation. |
|
||||||
| debug | boolean | | Generate debug output within drone-helm3 and pass `--debug` to all helm commands. Use with care, since the debug output may include secrets. |
|
| debug | boolean | | Generate debug output within drone-helm3 and pass `--debug` to all helm commands. Use with care, since the debug output may include secrets. |
|
||||||
|
|
||||||
|
|
|
@ -111,6 +111,7 @@ var upgrade = func(cfg Config) []Step {
|
||||||
Force: cfg.Force,
|
Force: cfg.Force,
|
||||||
Atomic: cfg.AtomicUpgrade,
|
Atomic: cfg.AtomicUpgrade,
|
||||||
CleanupOnFail: cfg.CleanupOnFail,
|
CleanupOnFail: cfg.CleanupOnFail,
|
||||||
|
CAFile: cfg.RepoCAFile,
|
||||||
})
|
})
|
||||||
|
|
||||||
return steps
|
return steps
|
||||||
|
|
|
@ -143,6 +143,7 @@ func (suite *PlanTestSuite) TestUpgrade() {
|
||||||
Force: true,
|
Force: true,
|
||||||
AtomicUpgrade: true,
|
AtomicUpgrade: true,
|
||||||
CleanupOnFail: true,
|
CleanupOnFail: true,
|
||||||
|
RepoCAFile: "state_licensure.repo.cert",
|
||||||
}
|
}
|
||||||
|
|
||||||
steps := upgrade(cfg)
|
steps := upgrade(cfg)
|
||||||
|
@ -166,6 +167,7 @@ func (suite *PlanTestSuite) TestUpgrade() {
|
||||||
Force: cfg.Force,
|
Force: cfg.Force,
|
||||||
Atomic: true,
|
Atomic: true,
|
||||||
CleanupOnFail: true,
|
CleanupOnFail: true,
|
||||||
|
CAFile: "state_licensure.repo.cert",
|
||||||
}
|
}
|
||||||
|
|
||||||
suite.Equal(expected, upgrade)
|
suite.Equal(expected, upgrade)
|
||||||
|
|
|
@ -20,6 +20,7 @@ type Upgrade struct {
|
||||||
Force bool
|
Force bool
|
||||||
Atomic bool
|
Atomic bool
|
||||||
CleanupOnFail bool
|
CleanupOnFail bool
|
||||||
|
CAFile string
|
||||||
|
|
||||||
cmd cmd
|
cmd cmd
|
||||||
}
|
}
|
||||||
|
@ -82,6 +83,9 @@ func (u *Upgrade) Prepare(cfg Config) error {
|
||||||
for _, vFile := range u.ValuesFiles {
|
for _, vFile := range u.ValuesFiles {
|
||||||
args = append(args, "--values", vFile)
|
args = append(args, "--values", vFile)
|
||||||
}
|
}
|
||||||
|
if u.CAFile != "" {
|
||||||
|
args = append(args, "--ca-file", u.CAFile)
|
||||||
|
}
|
||||||
|
|
||||||
args = append(args, u.Release, u.Chart)
|
args = append(args, u.Release, u.Chart)
|
||||||
u.cmd = command(helmBin, args...)
|
u.cmd = command(helmBin, args...)
|
||||||
|
|
|
@ -102,6 +102,7 @@ func (suite *UpgradeTestSuite) TestPrepareWithUpgradeFlags() {
|
||||||
Force: true,
|
Force: true,
|
||||||
Atomic: true,
|
Atomic: true,
|
||||||
CleanupOnFail: true,
|
CleanupOnFail: true,
|
||||||
|
CAFile: "local_ca.cert",
|
||||||
}
|
}
|
||||||
|
|
||||||
cfg := Config{}
|
cfg := Config{}
|
||||||
|
@ -121,6 +122,7 @@ func (suite *UpgradeTestSuite) TestPrepareWithUpgradeFlags() {
|
||||||
"--set-string", "height=5ft10in",
|
"--set-string", "height=5ft10in",
|
||||||
"--values", "/usr/local/stats",
|
"--values", "/usr/local/stats",
|
||||||
"--values", "/usr/local/grades",
|
"--values", "/usr/local/grades",
|
||||||
|
"--ca-file", "local_ca.cert",
|
||||||
"maroon_5_memories", "hot_ac"}, args)
|
"maroon_5_memories", "hot_ac"}, args)
|
||||||
|
|
||||||
return suite.mockCmd
|
return suite.mockCmd
|
||||||
|
|
Loading…
Reference in a new issue