From 7aa55f267622bd998e603b4d839beb240d147379 Mon Sep 17 00:00:00 2001 From: Zack Brady Date: Tue, 13 Aug 2024 12:30:19 -0400 Subject: [PATCH] updated/added hauler bits --- README.md | 6 +++--- examples/os-packages-example.md | 2 +- examples/rancher-airgap-quickstart.md | 2 +- hauler/scripts/hauler/hauler-hauler.sh | 19 ++++++++++++------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f57a3d6..bd2b2f1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Rancher Airgap is a framework and guide built for collecting, packaging, and distributing the Rancher Product Stack for deployment in disconnected or airgapped environments. -We utilize Project [Hauler](https://github.com/rancherfederal/hauler) by [Rancher Government Solutions](https://github.com/rancherfederal) to collect, package, and distribute the assets. `Hauler` simplifies the airgap process, by representing assets as content and collections and allows users to easily fetch, store, package, and distribute with declarative manifests or the command line. In this repositry, we generate these manifests for each of the products. +We utilize Project [Hauler](https://github.com/hauler-dev/hauler) by [Rancher Government Solutions](https://github.com/rancherfederal) to collect, package, and distribute the assets. `Hauler` simplifies the airgap process, by representing assets as content and collections and allows users to easily fetch, store, package, and distribute with declarative manifests or the command line. In this repositry, we generate these manifests for each of the products. **Review the high level *[example use cases](examples)*!** @@ -40,7 +40,7 @@ fetch -> validate -> save -> | | -> load -> validate -> distribute ### Addons - [hauler/hauler](hauler/hauler/README.md) - provides the content manifest for Hauler - - currently supports: `Hauler: v1.0.4` + - currently supports: `Hauler: v1.0.6` - [hauler/helm](hauler/helm/README.md) - provides the content manifest for Helm - currently supports: `Helm: v3.15.3` - [hauler/cosign](hauler/cosign/README.md) - provides the content manifest for Cosign @@ -55,6 +55,6 @@ fetch -> validate -> save -> | | -> load -> validate -> distribute ## Hauler Installation ```bash -# https://github.com/rancherfederal/hauler +# https://github.com/hauler-dev/hauler curl -sfL https://get.hauler.dev | bash ``` diff --git a/examples/os-packages-example.md b/examples/os-packages-example.md index a303f8b..3d5392e 100644 --- a/examples/os-packages-example.md +++ b/examples/os-packages-example.md @@ -47,7 +47,7 @@ hauler store sync --store packages --files rancher-airgap-packages.yaml hauler store save --store packages --filename rancher-airgap-packages.tar.zst ### Fetch Hauler Binary -curl -sfOL https://github.com/rancherfederal/hauler/releases/download/v1.0.3/hauler_1.0.3_linux_amd64.tar.gz +curl -sfOL https://github.com/hauler-dev/hauler/releases/download/v1.0.6/hauler_1.0.6_linux_amd64.tar.gz ``` --- diff --git a/examples/rancher-airgap-quickstart.md b/examples/rancher-airgap-quickstart.md index 4719c97..6c4e0dc 100644 --- a/examples/rancher-airgap-quickstart.md +++ b/examples/rancher-airgap-quickstart.md @@ -52,7 +52,7 @@ hauler store save --store neuvector-store --filename rancher-airgap-neuvector.ta hauler store save --store extras --filename rancher-airgap-extras.tar.zst ### Fetch Hauler Binary -curl -sfOL https://github.com/rancherfederal/hauler/releases/download/v1.0.3/hauler_1.0.3_linux_amd64.tar.gz +curl -sfOL https://github.com/hauler-dev/hauler/releases/download/v1.0.6/hauler_1.0.6_linux_amd64.tar.gz ``` --- diff --git a/hauler/scripts/hauler/hauler-hauler.sh b/hauler/scripts/hauler/hauler-hauler.sh index f6e5dcc..1ed7cef 100644 --- a/hauler/scripts/hauler/hauler-hauler.sh +++ b/hauler/scripts/hauler/hauler-hauler.sh @@ -1,5 +1,5 @@ ### Set Variables -export vHauler=1.0.4 +export vHauler=1.0.6 ### Setup Working Directory rm -rf /opt/hauler/hauler @@ -7,7 +7,7 @@ mkdir -p /opt/hauler/hauler cd /opt/hauler/hauler ### Create Hauler Manifest -### Hauler -> https://github.com/rancherfederal/hauler +### Hauler -> https://github.com/hauler-dev/hauler cat << EOF >> /opt/hauler/hauler/rancher-airgap-hauler.yaml apiVersion: content.hauler.cattle.io/v1alpha1 kind: Files @@ -15,10 +15,14 @@ metadata: name: rancher-airgap-files-hauler spec: files: - - path: https://github.com/rancherfederal/hauler/releases/download/v${vHauler}/hauler_${vHauler}_linux_amd64.tar.gz + - path: https://github.com/hauler-dev/hauler/releases/download/v${vHauler}/hauler_${vHauler}_linux_amd64.tar.gz name: hauler-linux-amd64.tar.gz - - path: https://github.com/rancherfederal/hauler/releases/download/v${vHauler}/hauler_${vHauler}_linux_arm64.tar.gz + - path: https://github.com/hauler-dev/hauler/releases/download/v${vHauler}/hauler_${vHauler}_linux_arm64.tar.gz name: hauler-linux-arm64.tar.gz + - path: https://github.com/hauler-dev/hauler/releases/download/v${vHauler}/hauler_${vHauler}_windows_amd64.tar.gz + name: hauler-windows-amd64.tar.gz + - path: https://github.com/hauler-dev/hauler/releases/download/v${vHauler}/hauler_${vHauler}_windows_arm64.tar.gz + name: hauler-windows-arm64.tar.gz --- apiVersion: content.hauler.cattle.io/v1alpha1 kind: Charts @@ -26,8 +30,8 @@ metadata: name: rancher-airgap-charts-hauler spec: charts: - - name: hauler - repoURL: oci://ghcr.io/rancherfederal/charts + - name: hauler-helm + repoURL: oci://ghcr.io/hauler-dev version: ${vHauler} --- apiVersion: content.hauler.cattle.io/v1alpha1 @@ -36,7 +40,8 @@ metadata: name: rancher-airgap-images-hauler spec: images: - - name: ghcr.io/rancherfederal/hauler:v${vHauler} + - name: ghcr.io/hauler-dev/hauler:v${vHauler} + - name: ghcr.io/hauler-dev/hauler-debug:v${vHauler} EOF ### Add the Hauler Manifest