Skip to content

ROX-20811: Roxctl central generate pvc bug #14312

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

Merged
jschnath merged 6 commits into from
Feb 19, 2025
Merged

ROX-20811: Roxctl central generate pvc bug #14312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9781734
X-Smart-Branch-Parent: master
jschnath Feb 17, 2025
16deb4d
Always generate zip in OutputZip when not running in a docker container
jschnath Feb 17, 2025
ba92e52
Extend container detection to podman and cryospark
jschnath Feb 17, 2025
e7d2311
Export IsX functions
jschnath Feb 17, 2025
2bb742e
Add test for IsRunningInContainer (skipped outside github CI)
jschnath Feb 18, 2025
4795317
Instead of skipping the test locally assert false (not running in con…
jschnath Feb 18, 2025
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
33 changes: 33 additions & 0 deletions pkg/containers/detection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package containers

import "os"

// IsRunningInContainer checks whether the current process is being executed inside one of the containers we check for
func IsRunningInContainer() bool {
return IsDocker() || IsPodman() || IsCryoSpark()
}

// IsDocker returns true if we are running in a docker instance
func IsDocker() bool {
return pathExists("/.dockerenv") ||
pathExists("/.dockerinit") ||
pathExists("/run/.containerenv") ||
pathExists("/var/run/.containerenv")
}

// IsPodman returns true if we are running in a podman instance
func IsPodman() bool {
return os.Getenv("container") == "oci" || os.Getenv("container") == "podman"
}

// IsCryoSpark returns true if we are running in a cryospark instance
func IsCryoSpark() bool {
_, hostnameSet := os.LookupEnv("CRYOSPARC_MASTER_HOSTNAME")
_, userSet := os.LookupEnv("CRYOSPARC_USER")
return hostnameSet || userSet || pathExists("/opt/cryosparc") || pathExists("/app/cryosparc")
}

func pathExists(filepath string) bool {
_, err := os.Stat(filepath)
return err == nil
}
18 changes: 18 additions & 0 deletions pkg/containers/detection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package containers

import (
"os"
"testing"

"github.com/stretchr/testify/assert"
)

// Assert that container detection is running correctly by checking if it returns true in CI. Expected to return
// false when run locally.
func TestContainerDetection(t *testing.T) {
if _, ok := os.LookupEnv("GITHUB_ACTIONS"); ok {
assert.True(t, IsRunningInContainer())
} else {
assert.False(t, IsRunningInContainer())
}
}
3 changes: 2 additions & 1 deletion roxctl/central/generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/stackrox/rox/pkg/backup"
"github.com/stackrox/rox/pkg/buildinfo"
"github.com/stackrox/rox/pkg/certgen"
"github.com/stackrox/rox/pkg/containers"
"github.com/stackrox/rox/pkg/env"
"github.com/stackrox/rox/pkg/errox"
"github.com/stackrox/rox/pkg/features"
Expand Down Expand Up @@ -277,7 +278,7 @@ func OutputZip(logger logger.Logger, io io2.IO, config renderer.Config) error {
}

var outputPath string
if roxctl.InMainImage() {
if roxctl.InMainImage() || !containers.IsRunningInContainer() {
bytes, err := wrapper.Zip()
if err != nil {
return errors.Wrap(err, "error generating zip file")
Expand Down