From 117952d6c263ccf1b2780a321cf0281bd4887303 Mon Sep 17 00:00:00 2001 From: Zack Brady Date: Thu, 26 Sep 2024 14:35:32 -0400 Subject: [PATCH] and more updates --- .github/workflows/main.yaml | 39 ++++++++++++------- README.md | 6 +-- .../scripts/rancher/hauler-rancher-minimal.sh | 2 +- hauler/scripts/rancher/hauler-rancher.sh | 2 +- hauler/scripts/rke2/hauler-rke2.sh | 2 +- 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 84de830..c9c6a69 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -292,28 +292,32 @@ jobs: cd hauler/hauler && source ~/.bashrc time hauler store sync --platform linux/amd64 --files rancher-airgap-hauler.yaml time hauler store sync --platform linux/arm64 --files rancher-airgap-hauler.yaml - time hauler store save --filename hauler-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename hauler-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename hauler-carbide-arm64.tar.zst - name: Fetch/Build Helm run: | cd hauler/helm && source ~/.bashrc time hauler store sync --platform linux/amd64 --files rancher-airgap-helm.yaml time hauler store sync --platform linux/arm64 --files rancher-airgap-helm.yaml - time hauler store save --filename helm-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename helm-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename helm-carbide-arm64.tar.zst - name: Fetch/Build Cosign run: | cd hauler/cosign && source ~/.bashrc time hauler store sync --platform linux/amd64 --files rancher-airgap-cosign.yaml time hauler store sync --platform linux/arm64 --files rancher-airgap-cosign.yaml - time hauler store save --filename cosign-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename cosign-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename cosign-carbide-arm64.tar.zst - name: Fetch/Build RKE2 run: | cd hauler/rke2 && source ~/.bashrc time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/amd64 --files rancher-airgap-rke2.yaml time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/arm64 --files rancher-airgap-rke2.yaml - time hauler store save --filename rke2-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename rke2-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename rke2-carbide-arm64.tar.zst - name: Fetch/Build Rancher run: | @@ -322,7 +326,8 @@ jobs: sed -i 's#https://releases.rancher.com/server-charts/latest#https://rancherfederal.github.io/carbide-charts#g' rancher-airgap-rancher.yaml time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/amd64 --files rancher-airgap-rancher.yaml time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/arm64 --files rancher-airgap-rancher.yaml - time hauler store save --filename rancher-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename rancher-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename rancher-carbide-arm64.tar.zst - name: Fetch/Build Rancher Minimal run: | @@ -332,21 +337,24 @@ jobs: sed -i 's#https://releases.rancher.com/server-charts/latest#https://rancherfederal.github.io/carbide-charts#g' rancher-airgap-rancher-minimal.yaml time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/amd64 --files rancher-airgap-rancher-minimal.yaml time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/arm64 --files rancher-airgap-rancher-minimal.yaml - time hauler store save --filename rancher-minimal-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename rancher-minimal-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename rancher-minimal-carbide-arm64.tar.zst - name: Fetch/Build Longhorn run: | cd hauler/longhorn && source ~/.bashrc time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/amd64 --files rancher-airgap-longhorn.yaml time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/arm64 --files rancher-airgap-longhorn.yaml - time hauler store save --filename longhorn-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename longhorn-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename longhorn-carbide-arm64.tar.zst - name: Fetch/Build NeuVector run: | cd hauler/neuvector && source ~/.bashrc time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/amd64 --files rancher-airgap-neuvector.yaml time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/arm64 --files rancher-airgap-neuvector.yaml - time hauler store save --filename neuvector-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename neuvector-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename neuvector-carbide-arm64.tar.zst - name: Fetch/Build Harvester run: | @@ -355,28 +363,32 @@ jobs: sed -i '1,/---/c\apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Images\nmetadata:\n name: rancher-airgap-images-harvester\nspec:\n images:\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-amd64.iso:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-amd64-net-install.iso:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-vmlinuz-amd64:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-initrd-amd64:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-rootfs-amd64.squashfs:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-amd64.sha512:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-arm64.iso:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-vmlinuz-arm64:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-initrd-arm64:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-rootfs-arm64.squashfs:v1.3.2-carbide-1\n - name: rgcrprod.azurecr.us/carbide/harvester/harvester-v1.3.2-carbide-1-arm64.sha512:v1.3.2-carbide-1\n---' rancher-airgap-harvester.yaml time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/amd64 --files rancher-airgap-harvester.yaml time hauler store sync --registry ${Registry} --key ../../carbide-key.pub --platform linux/arm64 --files rancher-airgap-harvester.yaml - time hauler store save --filename harvester-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename harvester-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename harvester-carbide-arm64.tar.zst - name: Fetch/Build Gitea run: | cd hauler/gitea && source ~/.bashrc time hauler store sync --platform linux/amd64 --files rancher-airgap-gitea.yaml time hauler store sync --platform linux/arm64 --files rancher-airgap-gitea.yaml - time hauler store save --filename gitea-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename gitea-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename gitea-carbide-arm64.tar.zst - name: Fetch/Build Kubevip run: | cd hauler/kubevip && source ~/.bashrc time hauler store sync --platform linux/amd64 --files rancher-airgap-kubevip.yaml time hauler store sync --platform linux/arm64 --files rancher-airgap-kubevip.yaml - time hauler store save --filename kubevip-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename kubevip-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename kubevip-carbide-arm64.tar.zst - name: Fetch/Build Vault run: | cd hauler/vault && source ~/.bashrc time hauler store sync --platform linux/amd64 --files rancher-airgap-vault.yaml time hauler store sync --platform linux/arm64 --files rancher-airgap-vault.yaml - time hauler store save --filename vault-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename vault-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename vault-carbide-arm64.tar.zst - name: Fetch/Build Private run: | @@ -390,7 +402,8 @@ jobs: time hauler store sync --platform linux/arm64 --files carbide-dependency-images.yaml time hauler store sync --platform linux/amd64 --files carbide-charts.yaml time hauler store sync --platform linux/arm64 --files carbide-charts.yaml - time hauler store save --filename carbide-carbide.tar.zst + time hauler store save --platform linux/amd64 --filename carbide-carbide-amd64.tar.zst + time hauler store save --platform linux/arm64 --filename carbide-carbide-arm64.tar.zst - name: Fetch/Build/Upload Hauler Binaries run: | diff --git a/README.md b/README.md index ab7a05e..920fa07 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,11 @@ fetch -> validate -> save -> | | -> load -> validate -> distribute ### Core Components - [hauler/rke2](hauler/rke2/README.md) - provides the content manifest for Rancher Kubernetes (RKE2) - - currently supports: `RKE2: v1.29.8` + - currently supports: `RKE2: v1.29.9` - [hauler/rancher](hauler/rancher/README.md) - provides the content manifest for Cert-Manager - currently supports: `Cert-Manager: v1.15.3` - [hauler/rancher](hauler/rancher/README.md) - provides the content manifest for Rancher Multi-Cluster Manager - - currently supports: `Rancher: v2.9.1` + - currently supports: `Rancher: v2.9.2` - [hauler/longhorn](hauler/longhorn/README.md) - provides the content manifest for Rancher Longhorn - currently supports: `Longhorn: v1.7.1` - [hauler/neuvector](hauler/neuvector/README.md) - provides the content manifest for Rancher NeuVector @@ -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.8` + - currently supports: `Hauler: v1.1.0` - [hauler/helm](hauler/helm/README.md) - provides the content manifest for Helm - currently supports: `Helm: v3.16.1` - [hauler/cosign](hauler/cosign/README.md) - provides the content manifest for Cosign diff --git a/hauler/scripts/rancher/hauler-rancher-minimal.sh b/hauler/scripts/rancher/hauler-rancher-minimal.sh index 7e692c1..0e5e66b 100755 --- a/hauler/scripts/rancher/hauler-rancher-minimal.sh +++ b/hauler/scripts/rancher/hauler-rancher-minimal.sh @@ -1,5 +1,5 @@ ### Set Variables -export vRancher=2.9.1 +export vRancher=2.9.2 export vCertManager=1.15.3 ### Setup Working Directory diff --git a/hauler/scripts/rancher/hauler-rancher.sh b/hauler/scripts/rancher/hauler-rancher.sh index e96eb7b..d37f44d 100755 --- a/hauler/scripts/rancher/hauler-rancher.sh +++ b/hauler/scripts/rancher/hauler-rancher.sh @@ -1,5 +1,5 @@ ### Set Variables -export vRancher=2.9.1 +export vRancher=2.9.2 export vCertManager=1.15.3 ### Setup Working Directory diff --git a/hauler/scripts/rke2/hauler-rke2.sh b/hauler/scripts/rke2/hauler-rke2.sh index 85fd55f..b2aebdb 100755 --- a/hauler/scripts/rke2/hauler-rke2.sh +++ b/hauler/scripts/rke2/hauler-rke2.sh @@ -1,5 +1,5 @@ ### Set Variables -export vRKE2=1.29.8 +export vRKE2=1.29.9 export vRKE2SELinux=0.18 ### Setup Working Directory