diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f40c756..d2ec668 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -471,14 +471,11 @@ jobs: if: always() run: | mkdir -p hauler/carbide && cd hauler/carbide && source ~/.bashrc - echo -e "apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Images\nmetadata:\n name: carbide-images\nspec:\n images:\n$(curl -sfL https://raw.githubusercontent.com/rancherfederal/carbide-releases/main/carbide-images.txt | sed '/nats/d' | sed 's/^/ - name: /')" > carbide-images.yaml - echo -e "apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Images\nmetadata:\n name: carbide-dependency-images\nspec:\n images:\n$(curl -sfL https://raw.githubusercontent.com/rancherfederal/carbide-releases/main/carbide-images.txt | sed '/rgcr/d' | sed 's/^/ - name: /')" > carbide-dependency-images.yaml + echo -e "apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Images\nmetadata:\n name: carbide-images\nspec:\n images:\n$(curl -sfL https://raw.githubusercontent.com/rancherfederal/carbide-releases/main/carbide-images.txt | sed 's/^/ - name: /')" > carbide-images.yaml echo -e "apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Charts\nmetadata:\n name: carbide-charts\nspec:\n charts:\n - name: rancher\n repoURL: https://rancherfederal.github.io/carbide-charts\n version: 2.9.3\n - name: airgapped-docs\n repoURL: https://rancherfederal.github.io/carbide-charts\n version: 0.1.53\n - name: stigatron\n repoURL: https://rancherfederal.github.io/carbide-charts\n version: 0.3.0\n - name: stigatron-ui\n repoURL: https://rancherfederal.github.io/carbide-charts\n version: 0.3.0\n---\napiVersion: content.hauler.cattle.io/v1alpha1\nkind: Charts\nmetadata:\n name: carbide-dependency-charts\nspec:\n charts:\n - name: heimdall2\n repoURL: https://rancherfederal.github.io/carbide-charts\n version: 0.1.41\n - name: nats\n repoURL: https://nats-io.github.io/k8s/helm/charts\n version: 1.1.5" > carbide-charts.yaml echo -e "apiVersion: content.hauler.cattle.io/v1alpha1\nkind: Images\nmetadata:\n name: carbide-provisioning-images\n annotations:\n hauler.dev/key: ../../carbide-key.pub\n # hauler.dev/platform: linux/amd64 # only fetch specific platform/architecture\nspec:\n images:\n - name: rgcrprod.azurecr.us/rancher/machine:v0.15.0-rancher118-carbide-1\n - name: rgcrprod.azurecr.us/rancher/rancher:v2.9.4-carbide-1\n - name: rgcrprod.azurecr.us/rancher/rancher-agent:v2.9.4-carbide-1\n - name: rgcrprod.azurecr.us/carbide/carbide-docs:0.1.7-carbide-1\n---\napiVersion: content.hauler.cattle.io/v1alpha1\nkind: Charts\nmetadata:\n name: carbide-provisioning-charts\nspec:\n charts:\n - name: rancher\n repoURL: https://rancherfederal.github.io/carbide-charts\n version: 2.9.4" > carbide-provisioning.yaml time hauler store sync --store amd64 --key ../../carbide-key.pub --platform linux/amd64 --files carbide-images.yaml time hauler store sync --store arm64 --key ../../carbide-key.pub --platform linux/arm64 --files carbide-images.yaml - time hauler store sync --store amd64 --platform linux/amd64 --files carbide-dependency-images.yaml - time hauler store sync --store arm64 --platform linux/arm64 --files carbide-dependency-images.yaml time hauler store sync --store amd64 --platform linux/amd64 --files carbide-charts.yaml time hauler store sync --store arm64 --platform linux/arm64 --files carbide-charts.yaml time hauler store sync --store amd64 --platform linux/amd64 --files carbide-provisioning.yaml diff --git a/README.md b/README.md index 4807efc..8cbaac2 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ 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.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 @@ -42,7 +42,7 @@ fetch -> validate -> save -> | | -> load -> validate -> distribute - [hauler/hauler](hauler/hauler/README.md) - provides the content manifest for Hauler - currently supports: `Hauler: v1.1.1` - [hauler/helm](hauler/helm/README.md) - provides the content manifest for Helm - - currently supports: `Helm: v3.16.3` + - currently supports: `Helm: v3.16.4` - [hauler/cosign](hauler/cosign/README.md) - provides the content manifest for Cosign - currently supports: `Cosign: v2.4.1` - [hauler/gitea](hauler/gitea/README.md) - provides the content manifest for Gitea diff --git a/hauler/scripts/helm/hauler-helm.sh b/hauler/scripts/helm/hauler-helm.sh index 8dcc67b..a918dd9 100755 --- a/hauler/scripts/helm/hauler-helm.sh +++ b/hauler/scripts/helm/hauler-helm.sh @@ -1,5 +1,5 @@ ### Set Variables -export vHelm=3.16.3 +export vHelm=3.16.4 ### Setup Working Directory rm -rf /opt/hauler/helm diff --git a/hauler/scripts/rke2/hauler-rke2.sh b/hauler/scripts/rke2/hauler-rke2.sh index d60648e..d46a0e1 100755 --- 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