-
Notifications
You must be signed in to change notification settings - Fork 1
Fix broken install Makefile target, update README #214
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -24,15 +24,50 @@ roxie has been authored with significant AI contributions. | |||||
|
|
||||||
| ## Installation | ||||||
|
|
||||||
| ### Download from GitHub releases | ||||||
| Look up the latest release from https://github.com/stackrox/roxie/releases. | ||||||
|
|
||||||
| ### Install from GitHub releases into local dev environment | ||||||
|
|
||||||
| For example, installing into `$HOME/bin`: | ||||||
| ```bash | ||||||
| curl -fsSL -o "${HOME}/bin/roxie" \ | ||||||
| https://github.com/stackrox/roxie/releases/download/v0.4.0/roxie-linux-amd64 | ||||||
| chmod +x "${HOME}/bin/roxie" | ||||||
| ``` | ||||||
|
|
||||||
| On macOS you likely also need | ||||||
| ```bash | ||||||
| xattr -d com.apple.quarantine "${HOME}/bin/roxie" | ||||||
| ``` | ||||||
|
|
||||||
| ### Installing from source into local dev environment | ||||||
|
|
||||||
| Built using: | ||||||
| ```bash | ||||||
| git clone git@github.com:stackrox/roxie.git | ||||||
| cd roxie | ||||||
| make install | ||||||
| ``` | ||||||
|
|
||||||
| This will install `roxie` into `${GOPATH}/bin`. If that is not desired you can also | ||||||
| build and copy manually: | ||||||
| ```bash | ||||||
| make build | ||||||
| cp roxie /your/custom/bin | ||||||
| ``` | ||||||
|
|
||||||
| ### Install from GitHub releases as part of CI workflow | ||||||
|
|
||||||
| ```bash | ||||||
| curl -fsSL --retry 5 --retry-all-errors -o /usr/local/bin/roxie \ | ||||||
| https://github.com/stackrox/roxie/releases/download/v0.4.0/roxie-linux-amd64 | ||||||
| chmod +x /usr/local/bin/roxie | ||||||
| ``` | ||||||
|
|
||||||
| ### Copy from container image in a Dockerfile | ||||||
| ### Install in container image | ||||||
|
|
||||||
| roxie can also be installed by extracting from a published roxie container image, for example | ||||||
| during container building: | ||||||
|
|
||||||
| ```dockerfile | ||||||
| ARG ROXIE_VERSION=0.4.0 | ||||||
|
|
@@ -61,8 +96,7 @@ Example for deploying Central and SecuredCluster to an Infra OpenShift 4 cluster | |||||
| ```bash | ||||||
| podman run --rm -it --privileged \ | ||||||
| -v $KUBECONFIG:/kubeconfig:U \ | ||||||
| -e MAIN_IMAGE_TAG=4.9.2 \ | ||||||
| quay.io/rhacs-eng/roxie:latest deploy --resources=auto | ||||||
| quay.io/rhacs-eng/roxie:latest deploy -t 4.11.0 --resources=auto | ||||||
| ``` | ||||||
| Specify the `MAIN_IMAGE_TAG` as desired. | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Update stale reference to This comment references the old 📝 Proposed update-Specify the `MAIN_IMAGE_TAG` as desired.
+Specify the tag using the `-t` flag as desired (see line 99 for example).Or simply remove the line if it's self-evident from the example above. 📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||
|
|
||||||
|
|
@@ -71,37 +105,26 @@ Deploying to a GKE cluster requires passing of some more arguments: | |||||
| podman run --rm -it --privileged \ | ||||||
| -v ~/.config/gcloud:/.config/gcloud:U \ | ||||||
| -v $KUBECONFIG:/kubeconfig:U \ | ||||||
| -e MAIN_IMAGE_TAG=4.9.2 \ | ||||||
| -e REGISTRY_USERNAME=$REGISTRY_USERNAME \ | ||||||
| -e REGISTRY_PASSWORD=$REGISTRY_PASSWORD \ | ||||||
| quay.io/rhacs-eng/roxie:latest deploy --resources=auto | ||||||
| quay.io/rhacs-eng/roxie:latest deploy -t 4.11.0 --resources=auto | ||||||
| ``` | ||||||
| Note that in this case we also need to pass the gcloud configuration for the authentication towards | ||||||
| the cluster to succeed. | ||||||
|
|
||||||
| ### Option 2: Deploying using local build | ||||||
| ### Option 2: Deploying using native executable | ||||||
|
|
||||||
| Prerequisites: | ||||||
| - `kubectl` configured to point at your target cluster | ||||||
| - The `roxctl` CLI | ||||||
| - The `roxie` branch forked and cloned to your local machine | ||||||
|
|
||||||
| Built using: | ||||||
| ```bash | ||||||
| make build | ||||||
| ``` | ||||||
|
|
||||||
| Get help: | ||||||
| ```bash | ||||||
| ./roxie --help | ||||||
| ``` | ||||||
| - `roxctl` CLI is installed | ||||||
| - `roxie` CLI is installed | ||||||
|
|
||||||
| Deploy using: | ||||||
| ```bash | ||||||
| MAIN_IMAGE_TAG=4.9.2 ./roxie deploy [ <component> ] | ||||||
| ./roxie deploy -t 4.11.0 [ <component> ] | ||||||
| ``` | ||||||
| where `component` can be `central` or `sensor`. If not specified, both components will be deployed. | ||||||
| Specify the `MAIN_IMAGE_TAG` as desired. | ||||||
| Specify the tag to deploy as desired. | ||||||
|
|
||||||
| Similarly, the deployment(s) can be torn down using: | ||||||
| ```bash | ||||||
|
|
@@ -114,7 +137,7 @@ roxie supports hub + spoke architectures where Central and SecuredCluster run on | |||||
|
|
||||||
| 1. Deploy Central on the hub cluster: | ||||||
| ```bash | ||||||
| ./roxie deploy central -t 4.9.2 | ||||||
| ./roxie deploy central -t 4.11.0 | ||||||
| ``` | ||||||
|
|
||||||
| 2. Create a config file for the spoke cluster, pointing at the Central endpoint (printed during step 1): | ||||||
|
|
@@ -129,7 +152,7 @@ securedCluster: | |||||
| ```bash | ||||||
| ROX_ADMIN_PASSWORD=<admin-password> \ | ||||||
| ROX_CA_CERT_FILE=<path-to-ca-cert> \ | ||||||
| ./roxie deploy secured-cluster -t 4.9.2 -c spoke-config.yaml | ||||||
| ./roxie deploy secured-cluster -t 4.11.0 -c spoke-config.yaml | ||||||
| ``` | ||||||
|
|
||||||
| > **Tip:** If deploying from the roxie subshell, `ROX_ADMIN_PASSWORD` and `ROX_CA_CERT_FILE` are | ||||||
|
|
||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: stackrox/roxie
Length of output: 568
🏁 Script executed:
Repository: stackrox/roxie
Length of output: 1073
🏁 Script executed:
Repository: stackrox/roxie
Length of output: 3102
Reconcile documentation version promotion with code defaults.
The README examples uniformly show version
4.11.0for deployment across all five examples (lines 99, 110, 124, 140, 155). However, the codebase default (ininternal/helpers/tag.go:13) is4.9.2, while tests use4.10.1(intests/e2e/helpers.go:26). This creates a mismatch: users who follow README examples will explicitly deploy4.11.0, but users who omit the-tflag will silently get4.9.2without explicit documentation of that default behavior.Consider either:
defaultMainImageTagto4.11.0to match the documentation4.9.2is the default when-tis omitted, and explaining why4.11.0is recommended🤖 Prompt for AI Agents