upgraded versions

zackbradys · Aug 29, 2024 · 5cf5b3f · 5cf5b3f
1 parent efe6324
commit 5cf5b3f
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 7 deletions.
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.28.12`
+  - currently supports: `RKE2: v1.29.8`
 - [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
@@ -47,6 +47,8 @@ fetch -> validate -> save -> | <airgap> | -> load -> validate -> distribute
   - currently supports: `Cosign: v2.4.0`
 - [hauler/gitea](hauler/gitea/README.md) - provides the content manifest for Gitea
   - currently supports: `Gitea: v1.22.1`
+- [hauler/vault](hauler/vault/README.md) - provides the content manifest for Vault
+  - currently supports: `Vault: v1.17.2`
 - [hauler/kubevip](hauler/kubevip/README.md) - provides the content manifest for KubeVip
   - currently supports: `KubeVip: v0.5.11`
 

diff --git a/examples/rancher-airgap-quickstart.md b/examples/rancher-airgap-quickstart.md
@@ -22,7 +22,8 @@ curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/haul
 curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/hauler/neuvector/rancher-airgap-neuvector.yaml
 # curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/hauler/harvester/rancher-airgap-harvester.yaml
 # curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/hauler/gitea/rancher-airgap-gitea.yaml
-# curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/hauler/kubevip/rancher-airgap-kubevip.yaml
+# curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/hauler/vault/rancher-airgap-vault.yaml
+curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/hauler/kubevip/rancher-airgap-kubevip.yaml
 curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/hauler/cosign/rancher-airgap-cosign.yaml
 curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/hauler/hauler/rancher-airgap-hauler.yaml
 curl -sfOL https://raw.githubusercontent.com/zackbradys/rancher-airgap/main/hauler/helm/rancher-airgap-helm.yaml
@@ -35,7 +36,8 @@ hauler store sync --store longhorn-store --platform linux/amd64 --files rancher-
 hauler store sync --store neuvector-store --platform linux/amd64 --files rancher-airgap-neuvector.yaml
 # hauler store sync --store harvester-store --platform linux/amd64 --files rancher-airgap-harvester.yaml
 # hauler store sync --store gitea-store --platform linux/amd64 --files rancher-airgap-gitea.yaml
-# hauler store sync --store kubevip-store --platform linux/amd64 --files rancher-airgap-kubevip.yaml
+# hauler store sync --store vault-store --platform linux/amd64 --files rancher-airgap-vault.yaml
+hauler store sync --store kubevip-store --platform linux/amd64 --files rancher-airgap-kubevip.yaml
 hauler store sync --store extras --files rancher-airgap-hauler.yaml
 hauler store sync --store extras --files rancher-airgap-helm.yaml
 hauler store sync --store extras --files rancher-airgap-cosign.yaml
@@ -48,7 +50,8 @@ hauler store save --store longhorn-store --filename rancher-airgap-longhorn.tar.
 hauler store save --store neuvector-store --filename rancher-airgap-neuvector.tar.zst
 # hauler store save --store harvester-store --filename rancher-airgap-harvester.tar.zst
 # hauler store save --store gitea-store --filename rancher-airgap-gitea.tar.zst
-# hauler store save --store kubevip-store --filename rancher-airgap-kubevip.tar.zst
+# hauler store save --store vault-store --filename rancher-airgap-vault.tar.zst
+hauler store save --store kubevip-store --filename rancher-airgap-kubevip.tar.zst
 hauler store save --store extras --filename rancher-airgap-extras.tar.zst
 
 ### Fetch Hauler Binary
@@ -126,7 +129,7 @@ Complete the following commands on the first server node in the cluster. You wil
 sudo su
 
 ### Set Variables
-export vRKE2=v1.28.12
+export vRKE2=v1.29.8
 export vPlatform=el9
 export registry=<FQDN or IP>:5000
 export fileserver=<FQDN or IP>:8080
@@ -232,7 +235,7 @@ Complete the following commands on the agent node(s) in the cluster. You will ne
 sudo su
 
 ### Set Variables
-export vRKE2=v1.28.12
+export vRKE2=v1.29.8
 export vPlatform=el9
 export registry=<FQDN or IP>:5000
 export fileserver=<FQDN or IP>:8080

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.28.12
+export vRKE2=1.29.8
 export vRKE2SELinux=0.18
 
 ### Setup Working Directory

diff --git a/hauler/scripts/vault/hauler-vault.sh b/hauler/scripts/vault/hauler-vault.sh
@@ -0,0 +1,36 @@
+### Set Variables
+export vVault=0.28.1
+
+### Setup Working Directory
+rm -rf /opt/hauler/vault
+mkdir -p /opt/hauler/vault
+cd /opt/hauler/vault
+
+### Download Vault Images and Modify the List
+### https://github.com/hashicorp/vault-helm
+helm repo add hashicorp https://helm.releases.hashicorp.com && helm repo update
+vaultImages=$(helm template hashicorp/vault --version=${vGitea} | grep 'image:' | sed 's/"//g; s/.*image: //' | sed 's/^/    - name: /')
+
+### Create Hauler Manifest
+cat << EOF >> /opt/hauler/vault/rancher-airgap-vault.yaml
+apiVersion: content.hauler.cattle.io/v1alpha1
+kind: Charts
+metadata:
+  name: rancher-airgap-charts-vault
+spec:
+  charts:
+    - name: vault
+      repoURL: https://helm.releases.hashicorp.com
+      version: ${vVault}
+---
+apiVersion: content.hauler.cattle.io/v1alpha1
+kind: Images
+metadata:
+  name: rancher-airgap-images-vault
+spec:
+  images:
+${vaultImages}
+EOF
+
+### Add the Hauler Manifest
+hauler store add file rancher-airgap-vault.yaml