updated versions again

zackbradys · Dec 9, 2024 · 6ee5c8a · 6ee5c8a
1 parent 3acc04c
commit 6ee5c8a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -386,8 +386,8 @@ jobs:
           source <(grep "export vHarvester=" ../scripts/harvester/hauler-harvester.sh)
           sed -e "s#quay.io/##g" -e "s#ghcr.io/##g" -e "s#registry.k8s.io/##g" -e "s#registry.suse.com/##g" rancher-airgap-harvester.yaml > rancher-airgap-harvester-amd64.yaml
           sed -e "s#quay.io/##g" -e "s#ghcr.io/##g" -e "s#registry.k8s.io/##g" -e "s#registry.suse.com/##g" rancher-airgap-harvester.yaml > rancher-airgap-harvester-arm64.yaml
-          sed -i "1,/---/c\apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Images\nmetadata:\n  name: rancher-airgap-images-harvester\nspec:\n  images:\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-amd64.iso:v1.3.2-govt.1\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-amd64-net-install.iso:v1.3.2-govt.1\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-vmlinuz-amd64:v1.3.2-govt.1\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-initrd-amd64:v1.3.2-govt.1\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-rootfs-amd64.squashfs:v1.3.2-govt.1\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-amd64.sha512:v1.3.2-govt.1\n---" rancher-airgap-harvester-amd64.yaml
-          sed -i "1,/---/c\apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Images\nmetadata:\n  name: rancher-airgap-images-harvester\nspec:\n  images:\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-arm64.iso:v1.3.2-govt.1\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-vmlinuz-arm64:v1.3.2-govt.1\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-initrd-arm64:v1.3.2-govt.1\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-rootfs-arm64.squashfs:v1.3.2-govt.1\n    - name: ${Registry}/carbide/harvester/harvester-v1.3.2-govt.1-arm64.sha512:v1.3.2-govt.1\n---" rancher-airgap-harvester-arm64.yaml
+          sed -i "1,/---/c\apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Images\nmetadata:\n  name: rancher-airgap-images-harvester\nspec:\n  images:\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-amd64.iso:v1.4.0-govt.rc1\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-amd64-net-install.iso:v1.4.0-govt.rc1\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-vmlinuz-amd64:v1.4.0-govt.rc1\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-initrd-amd64:v1.4.0-govt.rc1\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-rootfs-amd64.squashfs:v1.4.0-govt.rc1\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-amd64.sha512:v1.4.0-govt.rc1\n---" rancher-airgap-harvester-amd64.yaml
+          sed -i "1,/---/c\apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Images\nmetadata:\n  name: rancher-airgap-images-harvester\nspec:\n  images:\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-arm64.iso:v1.4.0-govt.rc1\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-vmlinuz-arm64:v1.4.0-govt.rc1\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-initrd-arm64:v1.4.0-govt.rc1\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-rootfs-arm64.squashfs:v1.4.0-govt.rc1\n    - name: ${Registry}/carbide/harvester/harvester-v1.4.0-govt.rc1-arm64.sha512:v1.4.0-govt.rc1\n---" rancher-airgap-harvester-arm64.yaml
           time hauler store sync --store amd64 --registry ${Registry} --key ../../carbide-key.pub --platform linux/amd64 --files rancher-airgap-harvester-amd64.yaml
           time hauler store sync --store arm64 --registry ${Registry} --key ../../carbide-key.pub --platform linux/arm64 --files rancher-airgap-harvester-arm64.yaml
           time hauler store save --store amd64 --platform linux/amd64 --filename harvester-carbide-v${vHarvester}-amd64.tar.zst

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ fetch -> validate -> save -> | <airgap> | -> load -> validate -> distribute
 ### Core Components
 
 - [hauler/rke2](hauler/rke2/README.md) - provides the content manifest for Rancher Kubernetes (RKE2)
-  - currently supports: `RKE2: v1.30.6`
+  - currently supports: `RKE2: v1.30.7`
 - [hauler/rancher](hauler/rancher/README.md) - provides the content manifest for Cert-Manager
   - currently supports: `Cert-Manager: v1.16.2`
 - [hauler/rancher](hauler/rancher/README.md) - provides the content manifest for Rancher Multi-Cluster Manager
@@ -35,12 +35,12 @@ fetch -> validate -> save -> | <airgap> | -> load -> validate -> distribute
 - [hauler/neuvector](hauler/neuvector/README.md) - provides the content manifest for Rancher NeuVector
   - currently supports: `NeuVector: v5.4.1`
 - [hauler/harvester](hauler/harvester/README.md) - provides the content manifest for Rancher Harvester
-  - currently supports: `Harvester: v1.3.2`
+  - currently supports: `Harvester: v1.4.0`
 
 ### Addons
 
 - [hauler/hauler](hauler/hauler/README.md) - provides the content manifest for Hauler
-  - currently supports: `Hauler: v1.1.0`
+  - currently supports: `Hauler: v1.1.1`
 - [hauler/helm](hauler/helm/README.md) - provides the content manifest for Helm
   - currently supports: `Helm: v3.16.3`
 - [hauler/cosign](hauler/cosign/README.md) - provides the content manifest for Cosign

diff --git 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/hauler-dev/hauler/releases/download/v1.1.0/hauler_1.1.0_linux_amd64.tar.gz
+curl -sfOL https://github.com/hauler-dev/hauler/releases/download/v1.1.1/hauler_1.1.1_linux_amd64.tar.gz
 ```
 
 ---

diff --git a/examples/rancher-airgap-quickstart.md b/examples/rancher-airgap-quickstart.md
@@ -55,7 +55,7 @@ hauler store save --store kubevip-store --filename rancher-airgap-kubevip.tar.zs
 hauler store save --store extras --filename rancher-airgap-extras.tar.zst
 
 ### Fetch Hauler Binary
-curl -sfOL https://github.com/hauler-dev/hauler/releases/download/v1.1.0/hauler_1.1.0_linux_amd64.tar.gz
+curl -sfOL https://github.com/hauler-dev/hauler/releases/download/v1.1.1/hauler_1.1.1_linux_amd64.tar.gz
 ```
 
 ---

diff --git a/hauler/scripts/harvester/hauler-harvester.sh b/hauler/scripts/harvester/hauler-harvester.sh
@@ -1,5 +1,5 @@
 ### Set Variables
-export vHarvester=1.3.2
+export vHarvester=1.4.0
 
 ### Setup Working Directory
 rm -rf /opt/hauler/harvester

diff --git a/hauler/scripts/hauler/hauler-hauler.sh b/hauler/scripts/hauler/hauler-hauler.sh
@@ -1,5 +1,5 @@
 ### Set Variables
-export vHauler=1.1.0
+export vHauler=1.1.1
 
 ### Setup Working Directory
 rm -rf /opt/hauler/hauler
@@ -19,6 +19,10 @@ spec:
       name: hauler-linux-amd64.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}_darwin_amd64.tar.gz
+      name: hauler-darwin-amd64.tar.gz
+    - path: https://github.com/hauler-dev/hauler/releases/download/v${vHauler}/hauler_${vHauler}_darwin_arm64.tar.gz
+      name: hauler-darwin-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

diff --git a/hauler/scripts/rke2/hauler-rke2.sh b/hauler/scripts/rke2/hauler-rke2.sh
@@ -1,5 +1,5 @@
 ### Set Variables
-export vRKE2=1.30.6
+export vRKE2=1.30.7
 export vRKE2SELinux=0.18
 
 ### Setup Working Directory

diff --git a/hauler/scripts/vault/hauler-vault.sh b/hauler/scripts/vault/hauler-vault.sh
@@ -1,5 +1,5 @@
 ### Set Variables
-export vVault=0.29.0
+export vVault=0.29.1
 
 ### Setup Working Directory
 rm -rf /opt/hauler/vault