Skip to content

Commit 051d4a8

Browse files
committed
Get integration tests to pass.
1 parent d4efa5f commit 051d4a8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

internal/pkg/agent/cmd/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ would like the Agent to operate.
5151
cmd.Flags().String(flagInstallBasePath, paths.DefaultBasePath, "The path where the Elastic Agent will be installed. It must be an absolute path.")
5252
cmd.Flags().Bool(flagInstallUnprivileged, false, "Install in unprivileged mode, limiting the access of the Elastic Agent. (beta)")
5353

54-
cmd.Flags().Bool(flagInstallNamespace, false, "Install into an isolated namespace. Allows multiple Elastic Agents to be installed at once. (experimental)")
54+
cmd.Flags().String(flagInstallNamespace, "", "Install into an isolated namespace. Allows multiple Elastic Agents to be installed at once. (experimental)")
5555
_ = cmd.Flags().MarkHidden(flagInstallNamespace) // For internal use only.
5656

5757
cmd.Flags().Bool(flagInstallDevelopment, false, "Install into a standardized development namespace, may enable development specific options. Allows multiple Elastic Agents to be installed at once. (experimental)")

pkg/testing/fixture_install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func (f *Fixture) Install(ctx context.Context, installOpts *InstallOpts, opts ..
166166
f.t.Logf("[test %s] Inside fixture install function", f.t.Name())
167167

168168
// check for running agents before installing, but only if not installed into a namespace whose point is allowing two agents at once.
169-
if installOpts != nil && installOpts.Namespace != "" {
169+
if installOpts != nil && !installOpts.Develop && installOpts.Namespace == "" {
170170
assert.Empty(f.t, getElasticAgentProcesses(f.t), "there should be no running agent at beginning of Install()")
171171
}
172172

0 commit comments

Comments
 (0)