maybe it will work this time...

zackbradys · Dec 10, 2024 · eed433e · eed433e
1 parent 12b254c
commit eed433e
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 38 deletions.
diff --git a/hauler/scripts/cosign/hauler-cosign.sh b/hauler/scripts/cosign/hauler-cosign.sh
@@ -20,6 +20,3 @@ spec:
     - path: https://github.com/sigstore/cosign/releases/download/v${vCosign}/cosign-linux-arm64
       name: cosign-linux-arm64
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-cosign.yaml
diff --git a/hauler/scripts/gitea/hauler-gitea.sh b/hauler/scripts/gitea/hauler-gitea.sh
@@ -31,6 +31,3 @@ spec:
   images:
 ${giteaImages}
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-gitea.yaml
diff --git a/hauler/scripts/harvester/hauler-harvester.sh b/hauler/scripts/harvester/hauler-harvester.sh
@@ -62,6 +62,3 @@ spec:
   images:
 ${harvesterImages}
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-harvester.yaml
diff --git a/hauler/scripts/hauler/hauler-hauler.sh b/hauler/scripts/hauler/hauler-hauler.sh
@@ -47,6 +47,3 @@ spec:
     - name: ghcr.io/hauler-dev/hauler:${vHauler}
     - name: ghcr.io/hauler-dev/hauler-debug:${vHauler}
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-hauler.yaml
diff --git a/hauler/scripts/helm/hauler-helm.sh b/hauler/scripts/helm/hauler-helm.sh
@@ -20,6 +20,3 @@ spec:
     - path: https://get.helm.sh/helm-v${vHelm}-linux-arm64.tar.gz
       name: helm-linux-amd64.tar.gz
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-helm.yaml
diff --git a/hauler/scripts/kubevip/hauler-kubevip.sh b/hauler/scripts/kubevip/hauler-kubevip.sh
@@ -29,6 +29,3 @@ spec:
     - path: https://kube-vip.io/manifests/rbac.yaml
       name: kubevip-rbac-manifest.yaml
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-kubevip.yaml
diff --git a/hauler/scripts/longhorn/hauler-longhorn.sh b/hauler/scripts/longhorn/hauler-longhorn.sh
@@ -41,6 +41,3 @@ spec:
   images:
 ${longhornImages}
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-longhorn.yaml
diff --git a/hauler/scripts/neuvector/hauler-neuvector.sh b/hauler/scripts/neuvector/hauler-neuvector.sh
@@ -31,6 +31,3 @@ spec:
   images:
 ${neuvectorImages}
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-neuvector.yaml
diff --git a/hauler/scripts/rancher/hauler-rancher-minimal.sh b/hauler/scripts/rancher/hauler-rancher-minimal.sh
@@ -14,7 +14,7 @@ certManagerImagesMinimal=$(helm template jetstack/cert-manager --version=v${vCer
 
 ### Download Rancher Images
 ### https://github.com/rancher/rancher
-curl -#L https://github.com/rancher/rancher/releases/download/v${vRancher}/rancher-images.txt -o rancher-images-minimal.txt
+curl -sSfL https://prime.ribs.rancher.io/rancher/v${vRancher}/rancher-images.txt -o rancher-images-minimal.txt
 
 sed -i '/neuvector\|minio\|gke\|aks\|eks\|sriov\|harvester\|longhorn\|thanos\|tekton\|istio\|multus\|hyper\|jenkins\|prom\|grafana\|windows/d' rancher-images-minimal.txt
 
@@ -70,6 +70,3 @@ spec:
   images:
 ${rancherImagesMinimal}
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-rancher-minimal.yaml
diff --git a/hauler/scripts/rancher/hauler-rancher.sh b/hauler/scripts/rancher/hauler-rancher.sh
@@ -14,7 +14,7 @@ certManagerImages=$(helm template jetstack/cert-manager --version=v${vCertManage
 
 ### Download Rancher Images and Modify the List
 ### https://github.com/rancher/rancher
-rancherImages=$(curl -sSfL https://github.com/rancher/rancher/releases/download/v${vRancher}/rancher-images.txt | sed -e "s/^/    - name: /")
+rancherImages=$(curl -sSfL https://prime.ribs.rancher.io/rancher/v${vRancher}/rancher-images.txt | sed -e "s/^/    - name: /")
 
 ### Create Hauler Manifest
 cat << EOF >> /opt/hauler/rancher/rancher-airgap-rancher.yaml
@@ -58,6 +58,3 @@ spec:
   images:
 ${rancherImages}
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-rancher.yaml
diff --git a/hauler/scripts/rke2/hauler-rke2.sh b/hauler/scripts/rke2/hauler-rke2.sh
@@ -77,6 +77,3 @@ spec:
   images:
 ${rke2Images}
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-rke2.yaml
diff --git a/hauler/scripts/vault/hauler-vault.sh b/hauler/scripts/vault/hauler-vault.sh
@@ -31,6 +31,3 @@ spec:
   images:
 ${vaultImages}
 EOF
-
-### Add the Hauler Manifest
-hauler store add file rancher-airgap-vault.yaml