Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ LABEL maintainer="StackRox" \
io.k8s.display-name="roxie ACS Deployment Tool"

# Install required tools via microdnf
# kubectl, helm are available in RHEL repos
# Note: UBI minimal comes with curl pre-installed, which is sufficient for our needs
RUN microdnf install -y \
# Core utilities
Expand Down
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,12 @@ roxie has been authored with significant AI contributions.
- Automated waiting for readiness and loadbalancer availability.
- No fiddling with API endpoints: detects and wires endpoints automatically.
- No fiddling with init bundles or CRS: roxie generates and handles these bits for you.
- Operator by default: deploys the ACS Operator without requiring OpenShift/OLM. Helm is also supported.
- Deploys the ACS Operator without requiring OpenShift/OLM.
- Ability to replace operator versions (up- and downgrading).
- Automated fast ACS teardowns.
- Handles Quay image pull secrets automatically.
- Verifies image existence before attempting deployment.

Note: Helm charts are currently also supported: use `--helm` to deploy Central and Secured Cluster via Helm. Only
use this in case you have very specific requirements which force you to use the Helm charts directly.
One example would be working on the Helm charts and needing to test them independently of the ACS operator.
Support for Helm charts might be dropped in the future.

## Quick start

### Option 1: Deploying using image (Recommended for non-developers)
Expand Down Expand Up @@ -120,4 +115,4 @@ docker related targets.

## Testing (E2E)

The E2E suite expects a valid `kubectl` context.
The E2E suite expects a valid `kubectl` context.
24 changes: 0 additions & 24 deletions cmd/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ Examples:
RunE: runDeploy,
}

cmd.Flags().BoolVar(&helm, "helm", false, "Deploy using Helm charts instead of operator")
_ = cmd.Flags().MarkHidden("helm")
cmd.Flags().BoolVar(&olm, "olm", false, "Deploy operator via OLM (requires OLM installed)")
cmd.Flags().BoolVar(&konflux, "konflux", false, "Use Konflux images")
cmd.Flags().BoolVar(&deployOperator, "deploy-operator", true, "Deploy and check operator (set to false to skip operator deployment/checks)")
Expand All @@ -54,15 +52,6 @@ Examples:
}

func runDeploy(cmd *cobra.Command, args []string) error {
// Validate flag combinations early, before env initialization
if helm && olm {
return errors.New("cannot use both --helm and --olm flags together")
}

if helm && len(featureFlags) > 0 {
return errors.New("--features flag is not supported with --helm (feature flags only work with operator-based deployments)")
}

log := logger.New()
if err := env.Initialize(log); err != nil {
return err
Expand All @@ -79,10 +68,6 @@ func runDeploy(cmd *cobra.Command, args []string) error {
return err
}

if components.IncludesOperatorExplicitly() && helm {
return errors.New("cannot use --helm flag with 'operator' component")
}

if components.IncludesCentral() && os.Getenv("ROXIE_SHELL") != "" {
return errors.New("already in a roxie sub-shell (ROXIE_SHELL environment variable is set), please exit the shell and try again")
}
Expand Down Expand Up @@ -122,9 +107,6 @@ func runDeploy(cmd *cobra.Command, args []string) error {
}

if konflux {
if helm {
return errors.New("cannot use both --helm and --konflux flags together (Konflux requires operator-based deployment)")
}
if olm {
return errors.New("cannot use both --olm and --konflux flags together (not currently implemented)")
}
Expand Down Expand Up @@ -182,12 +164,6 @@ func runDeploy(cmd *cobra.Command, args []string) error {
d.SetEnvrcFile(envrc)
}

if helm {
if err := d.SetUseHelm(true); err != nil {
return err
}
}

if olm {
if err := d.SetUseOLM(true); err != nil {
return err
Expand Down
3 changes: 1 addition & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ var (
// Global flags
verbose bool
earlyReadiness bool
helm bool
olm bool
konflux bool
deployOperator bool
Expand Down Expand Up @@ -48,7 +47,7 @@ Red Hat Advanced Cluster Security (ACS) on any Kubernetes/OpenShift cluster.`,
}

func init() {
rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Enable verbose output (show CRs and Helm values)")
rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Enable verbose output (show CRs)")
rootCmd.PersistentFlags().BoolVar(&earlyReadiness, "early-readiness", true, "Only wait for essential workloads (central/sensor) to be ready")
rootCmd.AddCommand(newDeployCmd())
rootCmd.AddCommand(newTeardownCmd())
Expand Down
2 changes: 0 additions & 2 deletions cmd/teardown.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ func newTeardownCmd() *cobra.Command {
RunE: runTeardown,
}

cmd.Flags().BoolVar(&helm, "helm", false, "Force teardown of Helm deployment")
_ = cmd.Flags().MarkHidden("helm")
cmd.Flags().BoolVar(&singleNamespace, "single-namespace", false, "Deploy all components in a single namespace ('stackrox' by default)")

return cmd
Expand Down
4 changes: 0 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@

# Essential Kubernetes tools (lightweight)
kubectl
kubernetes-helm

# Optional: Kubernetes utilities (lightweight)
k9s
Expand All @@ -92,7 +91,6 @@
echo "Available tools:"
echo " - roxie ($(roxie version))"
echo " - kubectl ($(kubectl version --client --short 2>/dev/null || echo 'not configured'))"
echo " - helm ($(helm version --short 2>/dev/null || echo 'unknown'))"
echo " - Go $(go version | cut -d' ' -f3)"
echo ""
echo "💡 For full set of pre-installed tooling use:"
Expand All @@ -116,7 +114,6 @@

# Kubernetes tools
kubectl
kubernetes-helm
k9s
stern

Expand All @@ -133,7 +130,6 @@
echo "Available tools:"
echo " - roxie ($(roxie version))"
echo " - kubectl ($(kubectl version --client --short 2>/dev/null || echo 'not configured'))"
echo " - helm ($(helm version --short 2>/dev/null || echo 'unknown'))"
echo " - podman ($(podman --version | head -n1))"
echo " - haproxy ($(haproxy -v | head -n1))"
echo ""
Expand Down
Loading
Loading