chore: remove cross-rs references

Author: DavSanchez

Makefile

@@ -29,10 +29,6 @@ build-%:
 	@echo "Building $* with mode: $(BUILD_MODE), bin $(BIN) and arch: $(ARCH)"
 	ARCH=$(ARCH) BUILD_MODE=$(BUILD_MODE) BIN="newrelic-$(*)" PKG="newrelic_agent_control" ./build/scripts/build_binary.sh
 
-cross-build-%:
-	@echo "Building $* using cross-rs with mode: $(BUILD_MODE), bin $(BIN) and arch: $(ARCH)"
-	ARCH=$(ARCH) BUILD_MODE=$(BUILD_MODE) BIN="newrelic-$(*)" PKG="newrelic_agent_control" ./build/scripts/build_binary_cross.sh
-
 .PHONY: tilt-up
 tilt-up:
 	tilt up ; tilt down

Tiltfile

@@ -17,8 +17,8 @@ cluster = os.getenv('CLUSTER', "")
 chartmuseum_basic_auth = os.getenv('CHARTMUSEUM_BASIC_AUTH', "")
 
 # build_with options:
-# cargo: No crosscompilation, faster than cross
-# cross: Supports crosscompilaton
+# cargo: No crosscompilation, faster than cargo-zigbuild
+# zig: Supports crosscompilaton
 build_with = os.getenv('BUILD_WITH','zig')
 arch = os.getenv('ARCH','arm64')
 target_tuple = os.getenv('TARGET_TUPLE', 'aarch64-unknown-linux-musl')
@@ -39,15 +39,6 @@ if build_with == 'cargo':
         './agent-control',
       ]
   )
-elif build_with == 'cross': 
-  local_resource(
-      'build-binary',
-      cmd="make BUILD_MODE=debug ARCH=%s cross-build-agent-control-cli" % arch +
-           "&& make BUILD_MODE=debug ARCH=%s cross-build-agent-control-k8s" % arch ,
-      deps=[
-        './agent-control',
-      ]
-  )
 elif build_with == 'zig':
   local_resource(
       'build-binary',

agent-control/tests/k8s/Tiltfile

@@ -34,8 +34,8 @@ helm_resource(
 )
 
 # build_with options:
-# cargo: No crosscompilation, faster than cross
-# cross: Supports crosscompilaton
+# cargo: No crosscompilation, faster than cargo-zigbuild
+# zig: Supports crosscompilaton
 build_with = os.getenv('BUILD_WITH','zig')
 arch = os.getenv('ARCH','arm64')
 target_tuple = os.getenv('TARGET_TUPLE', 'aarch64-unknown-linux-musl')
@@ -49,13 +49,6 @@ if build_with == 'cargo':
       cmd="cargo build --package newrelic_agent_control --bin newrelic-agent-control-k8s && mkdir -p bin && rm -f bin/newrelic-agent-control-"+arch+" && mv target/debug/newrelic-agent-control-k8s bin/newrelic-agent-control-"+arch,
       deps=["../../../agent-control/src"]
   )
-elif build_with == 'cross': 
-  local_resource(
-      'build-binary',
-      dir="../../../",
-      cmd="make BUILD_MODE=debug ARCH=%s cross-build-agent-control-k8s" % arch,
-      deps=["../../../agent-control/src"]
-  )
 elif build_with == 'zig':
   local_resource(
       'build-binary',

build/scripts/build_binary_cross.sh

@@ -2,16 +2,17 @@
 
 ## Compiling and running Agent Control
 
-As of now, Agent Control is supported on Linux (x86_64 and aarch64). The program is written in Rust, and for multiplatform compilation we leverage [`cross`](https://github.com/cross-rs/cross).
+As of now, Agent Control is supported on Linux (x86_64 and aarch64). The program is written in Rust, and for multiplatform compilation we leverage [`cargo-zigbuild`](https://github.com/rust-cross/cargo-zigbuild) and musl libc.
 
 ### On-host
 
 To compile and run locally:
 
-1. Install the [Rust toolchain](https://www.rust-lang.org/tools/install) for your system.
-2. Run `cargo build --bin newrelic-agent-control-onhost`
-3. `newrelic-agent-control-onhost` binary will be generated at `./target/debug/newrelic-agent-control-onhost`
-4. Prepare a `config.yaml` file in `/etc/newrelic-agent-control/`, example:
+1. Install the [Rust toolchain](https://www.rust-lang.org/tools/install) for your system, also add the relevant target for your system, e.g. (`rustup target add x86_64-unknown-linux-musl`).
+2. Install `cargo-zigbuild` with `cargo install --locked cargo-zigbuild`.
+3. Run `cargo zigbuild --bin newrelic-agent-control --target <ARCH>-unknown-linux-musl`, where `<ARCH>` is either `x86_64` or `aarch64`, depending on your system.
+4. `newrelic-agent-control` binary will be generated at `./target/<ARCH>-unknown-linux-musl/debug/newrelic-agent-control`
+5. Prepare a `config.yaml` file in `/etc/newrelic-agent-control/`, example:
 
     ```yaml
     fleet_control:
@@ -23,7 +24,7 @@ To compile and run locally:
         agent_type: "newrelic/io.opentelemetry.collector:0.1.0"
     ```
 
-5. Place values files in the folder `/etc/newrelic-agent-control/fleet/agents.d/{AGENT-ID}/` where `AGENT-ID` is a key in the
+6. Place values files in the folder `/etc/newrelic-agent-control/fleet/agents.d/{AGENT-ID}/` where `AGENT-ID` is a key in the
    `agents:` list. Example:
 
     ```yaml
@@ -34,7 +35,7 @@ To compile and run locally:
       # pipelines:
     ```
 
-6. Execute the binary with the config file with `sudo ./target/debug/newrelic-agent-control`
+7. Execute the binary with the config file with `sudo ./target/debug/newrelic-agent-control`
 
 #### Filesystem layout and persistence
 
@@ -95,14 +96,6 @@ We use [`minikube`](https://minikube.sigs.k8s.io/docs/) and [`tilt`](https://til
 - Ensure you have `tilt` installed for managing local development environments.
 - Add an Agent Control values file in `local/agent-control-tilt.yml`.
 
-> [!CAUTION]
-> Be aware that `cross` 0.2.5 [broke cross-compilation](https://github.com/cross-rs/cross/issues/1214). If you are using
-> it, run the following command.
->
-> ```sh
-> docker pull ghcr.io/cross-rs/aarch64-unknown-linux-musl:0.2.5 --platform linux/x86_64
-> ```
-
 Note: Adding the `'chart_repo'` setting, pointing to the [New Relic charts](https://github.com/newrelic/helm-charts/tree/master/charts) on a local path, allows using local helm charts.
 
 #### Steps