Merge pull request #235 from rancherfederal/dependabot/go_modules/golang.org/x/net-0.23.0

Bump golang.org/x/net from 0.17.0 to 0.23.0

.github/workflows/release.yaml

@@ -61,4 +61,4 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ${{ github.repository_owner }}/${{ github.repository }}:${{ github.ref_name }},${{ github.repository_owner }}/${{ github.repository }}:latest
+          tags: ghcr.io/${{ github.repository }}:${{ github.ref_name }}

.gitignore

@@ -18,14 +18,10 @@ artifacts
 local-artifacts
 airgap-scp.sh
 
-# test artifacts
-*.tar*
-*.out
-
 # generated
 dist/
 tmp/
 bin/
 /store/
 /registry/
-cmd/hauler/binaries
+cmd/hauler/binaries

.goreleaser.yaml

@@ -10,7 +10,7 @@ release:
 
 env:
   - vpkg=github.com/rancherfederal/hauler/internal/version
-  - cosign_version=v2.2.3+carbide.1
+  - cosign_version=v2.2.3+carbide.2
 
 builds:
   - main: cmd/hauler/main.go

Makefile

@@ -1,7 +1,7 @@
 SHELL:=/bin/bash
 GO_FILES=$(shell go list ./... | grep -v /vendor/)
 
-COSIGN_VERSION=v2.2.3+carbide.1
+COSIGN_VERSION=v2.2.3+carbide.2
 
 .SILENT:
 

VAGRANT.md

@@ -1,49 +0,0 @@
-## Hauler Vagrant machine
-
-A Vagrantfile is provided to allow easy provisioning of a local air-gapped CentOS environment. Some artifacts need to be collected from the internet; below are the steps required for successfully provisioning this machine, downloading all dependencies, and installing k3s (without hauler) into this machine.
-
-### First-time setup
-
-1. Install vagrant, if needed: <https://www.vagrantup.com/downloads>
-2. Install `vagrant-vbguest` plugin, as noted in the Vagrantfile:
-   ```shell
-   vagrant plugin install vagrant-vbguest
-   ```
-3. Deploy Vagrant machine, disabling SELinux:
-   ```shell
-   SELINUX=Disabled vagrant up
-   ```
-4. Access the Vagrant machine via SSH:
-   ```shell
-   vagrant ssh
-   ```
-5. Run all prep scripts inside of the Vagrant machine:
-    > This script temporarily enables internet access from within the VM to allow downloading all dependencies. Even so, the air-gapped network configuration IS restored before completion.
-   ```shell
-   sudo /opt/hauler/vagrant-scripts/prep-all.sh
-   ```
-
-All dependencies for all `vagrant-scripts/*-install.sh` scripts are now downloaded to the local
-repository under `local-artifacts`.
-
-### Installing k3s manually
-
-1. Access the Vagrant machine via SSH:
-  ```bash
-  vagrant ssh
-  ```
-2. Run the k3s install script inside of the Vagrant machine:
-  ```shell
-  sudo /opt/hauler/vagrant-scripts/k3s-install.sh
-  ```
-
-### Installing RKE2 manually
-
-1. Access the Vagrant machine via SSH:
-  ```shell
-  vagrant ssh
-  ```
-2. Run the RKE2 install script inside of the Vagrant machine:
-  ```shell
-  sudo /opt/hauler/vagrant-scripts/rke2-install.sh
-  ```

Vagrantfile

@@ -1,65 +0,0 @@
-##################################
-# The vagrant-vbguest plugin is required for CentOS 7.
-# Run the following command to install/update this plugin:
-# vagrant plugin install vagrant-vbguest
-##################################
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "centos/8"
-  config.vm.hostname = "airgap"
-  config.vm.network "private_network", type: "dhcp"
-
-  config.vm.synced_folder ".", "/vagrant"
-
-  config.vm.provider "virtualbox" do |vb|
-    vb.memory = "2048"
-    vb.cpus = "2"
-  
-  config.vm.provision "airgap", type: "shell", run: "always",
-    inline: "/vagrant/vagrant-scripts/airgap.sh airgap"
-  end
-
-  # SELinux is Enforcing by default.
-  # To set SELinux as Disabled on a VM that has already been provisioned:
-  #   SELINUX=Disabled vagrant up --provision-with=selinux
-  # To set SELinux as Permissive on a VM that has already been provsioned
-  #   SELINUX=Permissive vagrant up --provision-with=selinux
-  config.vm.provision "selinux", type: "shell", run: "once" do |sh|
-    sh.upload_path = "/tmp/vagrant-selinux"
-    sh.env = {
-        'SELINUX': ENV['SELINUX'] || "Enforcing"
-    }
-    sh.inline = <<~SHELL
-        #!/usr/bin/env bash
-        set -eux -o pipefail
-
-        if ! type -p getenforce setenforce &>/dev/null; then
-          echo SELinux is Disabled
-          exit 0
-        fi
-
-        case "${SELINUX}" in
-          Disabled)
-            if mountpoint -q /sys/fs/selinux; then
-              setenforce 0
-              umount -v /sys/fs/selinux
-            fi
-            ;;
-          Enforcing)
-            mountpoint -q /sys/fs/selinux || mount -o rw,relatime -t selinuxfs selinuxfs /sys/fs/selinux
-            setenforce 1
-            ;;
-          Permissive)
-            mountpoint -q /sys/fs/selinux || mount -o rw,relatime -t selinuxfs selinuxfs /sys/fs/selinux
-            setenforce 0
-            ;;
-          *)
-            echo "SELinux mode not supported: ${SELINUX}" >&2
-            exit 1
-            ;;
-        esac
-
-        echo SELinux is $(getenforce)
-    SHELL
-  end
-end

deploy/kubernetes/helm/charts/hauler/.helmignore

@@ -0,0 +1,21 @@
+# HELM IGNORE OPTIONS:
+# Patterns to ignore when building Helm packages.
+# Supports shell glob matching, relative path matching, and negation (prefixed with !)
+
+.DS_Store
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+.project
+.idea/
+*.tmproj
+.vscode/

deploy/kubernetes/helm/charts/hauler/Chart.yaml

@@ -0,0 +1,7 @@
+apiVersion: v2
+name: hauler
+description: Hauler Helm Chart - Airgap Swiss Army Knife
+icon: https://raw.githubusercontent.com/rancherfederal/hauler/main/static/rgs-hauler-logo-icon.svg
+type: application
+version: 0.1.0
+appVersion: 1.0.2

deploy/kubernetes/helm/charts/hauler/README.md

@@ -0,0 +1,33 @@
+# Hauler Helm Chart
+
+### Airgap Swiss Army Knife
+
+`Rancher Government Hauler` simplifies the airgap experience without requiring operators to adopt a specific workflow. **Hauler** simplifies the airgapping process, by representing assets (images, charts, files, etc...) as content and collections to allow operators to easily fetch, store, package, and distribute these assets with declarative manifests or through the command line.
+
+`Hauler` does this by storing contents and collections as OCI Artifacts and allows operators to serve contents and collections with an embedded registry and fileserver. Additionally, `Hauler` has the ability to store and inspect various non-image OCI Artifacts.
+
+**GitHub Repostiory:** https://github.com/rancherfederal/hauler
+
+**Documentation:** http://hauler.dev
+
+---
+
+| Type        | Chart Version | App Version |
+| ----------- | ------------- | ----------- |
+| application | `0.1.0`       | `1.0.2`     |
+
+## Installing the Chart
+
+```bash
+helm install hauler hauler/hauler -n hauler-system -f values.yaml
+```
+
+```bash
+helm status hauler -n hauler-system
+```
+
+## Uninstalling the Chart
+
+```bash
+helm uninstall hauler -n hauler-system
+```

deploy/kubernetes/helm/charts/hauler/app-readme.md

@@ -0,0 +1,33 @@
+# Hauler Helm Chart
+
+### Airgap Swiss Army Knife
+
+`Rancher Government Hauler` simplifies the airgap experience without requiring operators to adopt a specific workflow. **Hauler** simplifies the airgapping process, by representing assets (images, charts, files, etc...) as content and collections to allow operators to easily fetch, store, package, and distribute these assets with declarative manifests or through the command line.
+
+`Hauler` does this by storing contents and collections as OCI Artifacts and allows operators to serve contents and collections with an embedded registry and fileserver. Additionally, `Hauler` has the ability to store and inspect various non-image OCI Artifacts.
+
+**GitHub Repostiory:** https://github.com/rancherfederal/hauler
+
+**Documentation:** http://hauler.dev
+
+---
+
+| Type        | Chart Version | App Version |
+| ----------- | ------------- | ----------- |
+| application | `0.1.0`       | `1.0.2`     |
+
+## Installing the Chart
+
+```bash
+helm install hauler hauler/hauler -n hauler-system -f values.yaml
+```
+
+```bash
+helm status hauler -n hauler-system
+```
+
+## Uninstalling the Chart
+
+```bash
+helm uninstall hauler -n hauler-system
+```

deploy/kubernetes/helm/charts/hauler/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "hauler.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "hauler.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "hauler.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "hauler.labels" -}}
+helm.sh/chart: {{ include "hauler.chart" . }}
+{{ include "hauler.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "hauler.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "hauler.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "hauler.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "hauler.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

deploy/kubernetes/helm/charts/hauler/templates/hauler-fileserver/hauler-fileserver-deployment.yaml

@@ -0,0 +1,76 @@
+{{- if .Values.haulerFileserver.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: hauler-fileserver
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.haulerFileserver.replicas }}
+  selector:
+    matchLabels:
+      app: hauler-fileserver
+      {{- include "hauler.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        app: hauler-fileserver
+        {{- include "hauler.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- if or .Values.haulerJobs.hauls.enabled .Values.haulerJobs.manifests.enabled }}
+      initContainers:
+        {{- if .Values.haulerJobs.hauls.enabled }}
+        - name: wait-for-hauler-hauls-job
+          image: {{ .Values.hauler.initContainers.image.repository }}:{{ .Values.hauler.initContainers.image.tag }}
+          imagePullPolicy: {{ .Values.hauler.initContainers.imagePullPolicy }}
+          args: ["wait", "--for=condition=complete", "job", "hauler-hauls-job", "--namespace", "{{ .Release.Namespace }}", "--timeout={{ .Values.hauler.initContainers.timeout }}"]
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+        {{- end }}
+        {{- if .Values.haulerJobs.manifests.enabled }}
+        - name: wait-for-hauler-manifests-job
+          image: {{ .Values.hauler.initContainers.image.repository }}:{{ .Values.hauler.initContainers.image.tag }}
+          imagePullPolicy: {{ .Values.hauler.initContainers.imagePullPolicy }}
+          args: ["wait", "--for=condition=complete", "job", "hauler-manifests-job", "--namespace", "{{ .Release.Namespace }}", "--timeout={{ .Values.hauler.initContainers.timeout }}"]
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+        {{- end }}
+      {{- end }}
+      containers:
+        - name: hauler-fileserver
+          image: {{ .Values.hauler.image.repository }}:{{ .Values.hauler.image.tag }}
+          imagePullPolicy: {{ .Values.hauler.imagePullPolicy }}
+          args: ["store", "serve", "fileserver", "--port", "{{ .Values.haulerFileserver.port }}"]
+          ports:
+            - containerPort: {{ .Values.haulerFileserver.port }}
+          volumeMounts:
+            - name: hauler-data
+              mountPath: /store
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+      restartPolicy: Always
+      serviceAccountName: hauler-service-account
+      volumes:
+        - name: hauler-data
+          persistentVolumeClaim:
+            claimName: hauler-data
+{{- end }}

deploy/kubernetes/helm/charts/hauler/templates/hauler-fileserver/hauler-fileserver-ingress.yaml

@@ -0,0 +1,27 @@
+{{- if and .Values.haulerFileserver.enabled .Values.haulerFileserver.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: hauler-fileserver
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+spec:
+  rules:
+  - host: {{ .Values.haulerFileserver.ingress.hostname }}
+    http:
+      paths:
+      - backend:
+          service:
+            name: hauler-fileserver
+            port:
+              number: {{ .Values.haulerFileserver.service.ports.targetPort }}
+        path: /
+        pathType: Prefix
+  {{- if .Values.haulerFileserver.ingress.tls.enabled }}
+  tls:
+  - hosts:
+    - {{ .Values.haulerFileserver.ingress.hostname }}
+    secretName: {{ .Values.haulerFileserver.ingress.tls.secretName }}
+  {{- end }}
+{{- end }}

deploy/kubernetes/helm/charts/hauler/templates/hauler-fileserver/hauler-fileserver-service.yaml

@@ -0,0 +1,18 @@
+{{- if and .Values.haulerFileserver.enabled .Values.haulerFileserver.service.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: hauler-fileserver
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+spec:
+  selector:
+    app: hauler-fileserver
+  ports:
+    - name: hauler-fileserver
+      protocol: {{ .Values.haulerFileserver.service.ports.protocol }}
+      port: {{ .Values.haulerFileserver.service.ports.port }}
+      targetPort: {{ .Values.haulerFileserver.service.ports.targetPort }}
+  type: {{ .Values.haulerFileserver.service.type }}
+{{- end }}

deploy/kubernetes/helm/charts/hauler/templates/hauler-registry/hauler-registry-deployment.yaml

@@ -0,0 +1,76 @@
+{{- if .Values.haulerRegistry.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: hauler-registry
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.haulerRegistry.replicas }}
+  selector:
+    matchLabels:
+      app: hauler-registry
+      {{- include "hauler.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        app: hauler-registry
+        {{- include "hauler.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- if or .Values.haulerJobs.hauls.enabled .Values.haulerJobs.manifests.enabled }}
+      initContainers:
+        {{- if .Values.haulerJobs.hauls.enabled }}
+        - name: wait-for-hauler-hauls-job
+          image: {{ .Values.hauler.initContainers.image.repository }}:{{ .Values.hauler.initContainers.image.tag }}
+          imagePullPolicy: {{ .Values.hauler.initContainers.imagePullPolicy }}
+          args: ["wait", "--for=condition=complete", "job", "hauler-hauls-job", "--namespace", "{{ .Release.Namespace }}", "--timeout={{ .Values.hauler.initContainers.timeout }}"]
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+        {{- end }}
+        {{- if .Values.haulerJobs.manifests.enabled }}
+        - name: wait-for-hauler-manifests-job
+          image: {{ .Values.hauler.initContainers.image.repository }}:{{ .Values.hauler.initContainers.image.tag }}
+          imagePullPolicy: {{ .Values.hauler.initContainers.imagePullPolicy }}
+          args: ["wait", "--for=condition=complete", "job", "hauler-manifests-job", "--namespace", "{{ .Release.Namespace }}", "--timeout={{ .Values.hauler.initContainers.timeout }}"]
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+        {{- end }}
+      {{- end }}
+      containers:
+        - name: hauler-registry
+          image: {{ .Values.hauler.image.repository }}:{{ .Values.hauler.image.tag }}
+          imagePullPolicy: {{ .Values.hauler.imagePullPolicy }}
+          args: ["store", "serve", "registry", "--port", "{{ .Values.haulerRegistry.port }}"]
+          ports:
+            - containerPort: {{ .Values.haulerRegistry.port }}
+          volumeMounts:
+            - name: hauler-data
+              mountPath: /store
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+      restartPolicy: Always
+      serviceAccountName: hauler-service-account
+      volumes:
+        - name: hauler-data
+          persistentVolumeClaim:
+            claimName: hauler-data
+{{- end }}

deploy/kubernetes/helm/charts/hauler/templates/hauler-registry/hauler-registry-ingress.yaml

@@ -0,0 +1,28 @@
+{{- if and .Values.haulerRegistry.enabled .Values.haulerRegistry.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: hauler-registry
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+spec:
+  rules:
+  - host: {{ .Values.haulerRegistry.ingress.hostname }}
+    http:
+      paths:
+      - backend:
+          service:
+            name: hauler-registry
+            port:
+              number: {{ .Values.haulerRegistry.service.ports.targetPort }}
+        path: /
+        pathType: Prefix
+  {{- if .Values.haulerRegistry.ingress.tls.enabled }}
+  tls:
+  - hosts:
+    - {{ .Values.haulerRegistry.ingress.hostname }}
+    secretName: {{ .Values.haulerRegistry.ingress.tls.secretName }}
+  {{- end }}
+{{- end }}
+

deploy/kubernetes/helm/charts/hauler/templates/hauler-registry/hauler-registry-service.yaml

@@ -0,0 +1,18 @@
+{{- if and .Values.haulerRegistry.enabled .Values.haulerRegistry.service.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: hauler-registry
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+spec:
+  selector:
+    app: hauler-registry
+  ports:
+    - name: hauler-registry
+      protocol: {{ .Values.haulerRegistry.service.ports.protocol }}
+      port: {{ .Values.haulerRegistry.service.ports.port }}
+      targetPort: {{ .Values.haulerRegistry.service.ports.targetPort }}
+  type: {{ .Values.haulerRegistry.service.type }}
+{{- end }}

deploy/kubernetes/helm/charts/hauler/templates/hauler/hauler-jobs.yaml

@@ -0,0 +1,126 @@
+{{- if .Values.haulerJobs.hauls.enabled }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: hauler-hauls-job
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: hauler-fetch-hauls
+          image: {{ .Values.haulerJobs.image.repository }}:{{ .Values.haulerJobs.image.tag }}
+          imagePullPolicy: {{ .Values.haulerJobs.imagePullPolicy }}
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              {{- range .Values.haulerJobs.hauls.artifacts }}
+              curl -o /hauls/{{ .name }} {{ .path }} &&
+              {{- end }}
+              echo hauler fetch completed
+          volumeMounts:
+            - name: hauler-data
+              mountPath: /hauls
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+      containers:
+        - name: hauler-load-hauls
+          image: {{ .Values.hauler.image.repository }}:{{ .Values.hauler.image.tag }}
+          imagePullPolicy: {{ .Values.hauler.imagePullPolicy }}
+          args:
+            - "store"
+            - "load"
+            {{- range .Values.haulerJobs.hauls.artifacts }}
+            - "/hauls/{{ .name }}"
+            {{- end }}
+          volumeMounts:
+            - name: hauler-data
+              mountPath: /hauls
+            - name: hauler-data
+              mountPath: /store
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+      restartPolicy: OnFailure
+      volumes:
+        - name: hauler-data
+          persistentVolumeClaim:
+            claimName: hauler-data
+{{- end }}
+---
+{{- if .Values.haulerJobs.manifests.enabled }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: hauler-manifests-job
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+spec:
+  template:
+    spec:
+      initContainers:
+        - name: hauler-fetch-manifests
+          image: {{ .Values.haulerJobs.image.repository }}:{{ .Values.haulerJobs.image.tag }}
+          imagePullPolicy: {{ .Values.haulerJobs.imagePullPolicy }}
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              {{- range .Values.haulerJobs.manifests.artifacts }}
+              curl -o /manifests/{{ .name }} {{ .path }} &&
+              {{- end }}
+              echo hauler fetch completed
+          volumeMounts:
+            - name: hauler-data
+              mountPath: /manifests
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+      containers:
+        - name: hauler-load-manifests
+          image: {{ .Values.hauler.image.repository }}:{{ .Values.hauler.image.tag }}
+          imagePullPolicy: {{ .Values.hauler.imagePullPolicy }}
+          args:
+            {{- range .Values.haulerJobs.manifests.artifacts }}
+            - "store"
+            - "sync"
+            - "--files"
+            - "/manifests/{{ .name }}"
+            {{- end }}
+          volumeMounts:
+            - name: hauler-data
+              mountPath: /manifests
+            - name: hauler-data
+              mountPath: /store
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
+      restartPolicy: OnFailure
+      volumes:
+        - name: hauler-data
+          persistentVolumeClaim:
+            claimName: hauler-data
+{{- end }}

deploy/kubernetes/helm/charts/hauler/templates/hauler/hauler-pvc.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: hauler-data
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+spec:
+  accessModes:
+  - {{ .Values.hauler.data.pvc.accessModes }}
+  resources:
+    requests:
+      storage: {{ .Values.hauler.data.pvc.storageRequest }}
+  {{- if .Values.hauler.data.pvc.storageClass }}
+  storageClassName: {{ .Values.hauler.data.pvc.storageClass }}
+  {{- end }}

deploy/kubernetes/helm/charts/hauler/templates/hauler/hauler-rbac.yaml

@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: hauler-service-account
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: hauler-role
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+rules:
+- apiGroups: ["batch"]
+  resources: ["jobs"]
+  verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: hauler-role-binding
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "hauler.labels" . | nindent 4 }}
+roleRef:
+  kind: Role
+  name: hauler-role
+  apiGroup: rbac.authorization.k8s.io
+subjects:
+  - kind: ServiceAccount
+    name: hauler-service-account
+    namespace: {{ .Release.Namespace }}

deploy/kubernetes/helm/charts/hauler/values.yaml

@@ -0,0 +1,94 @@
+# Helm Chart Values for Hauler
+# Docs: https://hauler.dev
+
+hauler:
+  image:
+    repository: ghcr.io/rancherfederal/hauler
+    tag: v1.0.2
+  imagePullPolicy: Always
+
+  initContainers:
+    image:
+      repository: rancher/kubectl
+      tag: v1.27.0 # update to your kubernetes version
+    imagePullPolicy: Always
+    timeout: 1h
+
+  data:
+    pvc:
+      accessModes: ReadWriteMany
+      storageClass: longhorn # optional... will use default storage class
+      storageRequest: 48Gi # recommended size of 3x the artifact(s)
+
+# Helm Chart Values for the Hauler Jobs
+# Docs: https://rancherfederal.github.io/hauler-docs/docs/introduction/quickstart
+
+haulerJobs:
+  image:
+    repository: rancher/shell
+    tag: v0.1.22
+  imagePullPolicy: Always
+
+  hauls:
+    enabled: true
+    artifacts:
+      - path: https://raw.githubusercontent.com/rancherfederal/hauler/main/testdata/haul.tar.zst
+        name: haul.tar.zst
+      # - path: /path/to/additional-hauls.tar.zst
+      #   name: additional-hauls.tar.zst
+
+  manifests:
+    enabled: true
+    artifacts:
+      - path: https://raw.githubusercontent.com/rancherfederal/hauler/main/testdata/hauler-manifest.yaml
+        name: hauler-manifest.yaml
+      # - path: /path/to/additional-manifests.yaml
+      #   name: additional-manifests.yaml
+
+# Helm Chart Values for the Hauler Fileserver
+# Docs: https://rancherfederal.github.io/hauler-docs/docs/guides-references/command-line/hauler-store#hauler-store-serve-fileserver
+
+haulerFileserver:
+  enabled: true
+  port: 8080 # default port for the fileserver
+  replicas: 1
+
+  ingress:
+    enabled: true
+    hostname: fileserver.ranchers.io
+    tls:
+      enabled: true
+      source: secret # only supported source
+      secretName: tls-certs # must be created outside of this chart
+
+  service:
+    enabled: true
+    type: ClusterIP
+    ports:
+      protocol: TCP
+      port: 8080 # default port for the fileserver
+      targetPort: 8080 # default port for the fileserver
+
+# Helm Chart Values for the Hauler Registry
+# Docs: https://rancherfederal.github.io/hauler-docs/docs/guides-references/command-line/hauler-store#hauler-store-serve-registry
+
+haulerRegistry:
+  enabled: true
+  port: 5000 # default port for the registry
+  replicas: 1
+
+  ingress:
+    enabled: true
+    hostname: registry.ranchers.io
+    tls:
+      enabled: true
+      source: secret # only supported source
+      secretName: tls-certs # must be created outside of this chart
+
+  service:
+    enabled: true
+    type: ClusterIP
+    ports:
+      protocol: TCP
+      port: 5000 # default port for the registry
+      targetPort: 5000 # default port for the registry

go.mod

@@ -144,11 +144,11 @@ require (
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
-	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/oauth2 v0.10.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect

go.sum

@@ -564,8 +564,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -638,8 +638,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -713,14 +713,14 @@ golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

pkg/content/chart/chart_test.go

@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	chartpath = "../../../testdata/podinfo-6.0.3.tgz"
+	chartpath = "../../../testdata/rancher-cluster-templates-0.4.4.tgz"
 )
 
 func TestNewChart(t *testing.T) {
@@ -48,13 +48,13 @@ func TestNewChart(t *testing.T) {
 			},
 			want: v1.Descriptor{
 				MediaType: consts.ChartLayerMediaType,
-				Size:      13524,
+				Size:      13102,
 				Digest: v1.Hash{
 					Algorithm: "sha256",
-					Hex:       "e30b95a08787de69ffdad3c232d65cfb131b5b50c6fd44295f48a078fceaa44e",
+					Hex:       "4b3bb4e474b54bf9057b298f8f11c239bb561396716d8cd5fc369c407fba2965",
 				},
 				Annotations: map[string]string{
-					ocispec.AnnotationTitle: "podinfo-6.0.3.tgz",
+					ocispec.AnnotationTitle: "rancher-cluster-templates-0.4.4.tgz",
 				},
 			},
 			wantErr: false,
@@ -72,18 +72,18 @@ func TestNewChart(t *testing.T) {
 			// TODO: Use a mock helm server
 			name: "should fetch a remote chart",
 			args: args{
-				name: "ingress-nginx",
-				opts: &action.ChartPathOptions{RepoURL: "https://kubernetes.github.io/ingress-nginx", Version: "4.0.16"},
+				name: "cert-manager",
+				opts: &action.ChartPathOptions{RepoURL: "https://charts.jetstack.io", Version: "1.14.4"},
 			},
 			want: v1.Descriptor{
 				MediaType: consts.ChartLayerMediaType,
-				Size:      38591,
+				Size:      80674,
 				Digest: v1.Hash{
 					Algorithm: "sha256",
-					Hex:       "b0ea91f7febc6708ad9971871d2de6e8feb2072110c3add6dd7082d90753caa2",
+					Hex:       "5775fdbc1881d6e510df76d38753af54b86bd14caa8edb28fdbb79527042dede",
 				},
 				Annotations: map[string]string{
-					ocispec.AnnotationTitle: "ingress-nginx-4.0.16.tgz",
+					ocispec.AnnotationTitle: "cert-manager-v1.14.4.tgz",
 				},
 			},
 			wantErr: false,

testdata/chart-collection.yaml

@@ -1,23 +0,0 @@
----
-apiVersion: collection.hauler.cattle.io/v1alpha1
-kind: ThickCharts
-metadata:
-  name: mythickchart
-spec:
-  charts:
-    # charts are also fetched and served as OCI content (currently experimental in helm)
-    #   HELM_EXPERIMENTAL_OCI=1 helm chart pull <hauler-registry>/loki:2.6.2
-#    - name: loki
-#      repoURL: https://grafana.github.io/helm-charts
-
-#    - name: longhorn
-#      repoURL: https://charts.longhorn.io
-
-#    - name: cert-manager
-#      repoURL: https://charts.jetstack.io
-#      version: v1.6.1
-#      extraImages:
-#        - ref: quay.io/jetstack/cert-manager-cainjector:v1.6.1
-
-    - name: podinfo
-      repoURL: https://stefanprodan.github.io/podinfo

testdata/contents.yaml

@@ -1,56 +0,0 @@
-apiVersion: content.hauler.cattle.io/v1alpha1
-kind: Files
-metadata:
-  name: myfile
-spec:
-  files:
-    # hauler can save/redistribute files on disk (be careful! paths are relative)
-    - path: testdata/contents.yaml
-
-    # when directories are specified, the directory contents will be archived and stored
-    - path: testdata/
-
-    # hauler can also fetch remote content, and will "smartly" identify filenames _when possible_
-    #   filename below = "k3s-images.txt"
-    - path: "https://github.com/k3s-io/k3s/releases/download/v1.22.2%2Bk3s2/k3s-images.txt"
-
-    # when discovered filenames are not desired, a file name can be specified
-    - path: https://get.k3s.io
-      name: k3s-init.sh
-
----
-apiVersion: content.hauler.cattle.io/v1alpha1
-kind: Images
-metadata:
-  name: myimage
-spec:
-  images:
-    # images can be referenced shorthanded without a tag
-    - name: hello-world
-
-    # or namespaced with a tag
-    - name: rancher/cowsay:latest
-
-    # or by their digest:
-    - name: registry@sha256:42043edfae481178f07aa077fa872fcc242e276d302f4ac2026d9d2eb65b955f
-
-    # or fully qualified from any OCI compliant registry registry
-    - name: ghcr.io/fluxcd/flux-cli:v0.22.0
-
----
-apiVersion: content.hauler.cattle.io/v1alpha1
-kind: Charts
-metadata:
-  name: mychart
-spec:
-  charts:
-    # charts are also fetched and served as OCI content (currently experimental in helm)
-    #   HELM_EXPERIMENTAL_OCI=1 helm chart pull <hauler-registry>/loki:2.6.2
-    - name: loki
-      repoURL: https://grafana.github.io/helm-charts
-#      version: latest  # the latest version will be used when version is empty
-
-    # specific versions can also be used
-    - name: rancher
-      repoURL: https://releases.rancher.com/server-charts/latest
-      version: 2.6.2

testdata/hauler-manifest.yaml

@@ -0,0 +1,26 @@
+apiVersion: content.hauler.cattle.io/v1alpha1
+kind: Images
+metadata:
+  name: hauler-content-images-example
+spec:
+  images:
+    - name: busybox:latest
+---
+apiVersion: content.hauler.cattle.io/v1alpha1
+kind: Charts
+metadata:
+  name: hauler-content-charts-example
+spec:
+  charts:
+    - name: rancher
+      repoURL: https://releases.rancher.com/server-charts/stable
+      version: 2.8.2
+---
+apiVersion: content.hauler.cattle.io/v1alpha1
+kind: Files
+metadata:
+  name: hauler-content-files-example
+spec:
+  files:
+    - path: https://get.rke2.io
+      name: install.sh

testdata/k3s-collection.yaml

@@ -1,13 +0,0 @@
----
-apiVersion: collection.hauler.cattle.io/v1alpha1
-kind: K3s
-metadata:
-  name: myk3s
-spec:
-  # version can be exact (as listed on https://github.com/k3s-io/k3s/releases)
-  version: v1.22.2+k3s2
-
-  # or can point to a channel, in which case the latest version in the channel is used: https://update.k3s.io/v1-release/channels
-#  version: stable
-#  version: latest
-#  version: v1.22

vagrant-scripts/airgap.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-set -x
-
-if [ "$#" -ne 1 ] || ( [ "$1" != "internet" ] && [ "$1" != "airgap" ] ); then
-  echo \
-"Enable or disable internet access in hauler's CentOS Vagrant machine.
-
-Usage: $0 internet
-       $0 airgap" >&2
-  exit 1
-fi
-
-if [ "$1" = "internet" ]; then
-  # internet: set default gateway to NAT network interface
-  default_iface="eth0"
-  gw_ip="10.0.2.2"
-else
-  # airgap: set default gateway to private network interface
-  default_iface="eth1"
-  gw_ip=$(ip -f inet a show "${default_iface}" | awk 'match($0, /inet ([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})/, arr) { print arr[1] }')
-fi
-
-
-ip r delete default
-ip r add default via ${gw_ip} dev ${default_iface} proto dhcp metric 100

vagrant-scripts/k3s-install.sh

@@ -1,41 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# RUN IN VAGRANT MACHINE
-# Install a default, bare k3s cluster into the Vagrant machine
-################################################################################
-
-if [ -f "/usr/local/bin/k3s-uninstall.sh" ]; then
-  /usr/local/bin/k3s-uninstall.sh
-else
-  echo "k3s is not installed"
-fi
-
-if pgrep -x "firewalld" >/dev/null
-then
-  echo "[FATAL] disable firewalld first"
-fi
-
-SELINUXSTATUS=$(getenforce)
-if [ "$SELINUXSTATUS" == "Permissive" ]; then
-    echo "[FATAL] disable selinux"
-    exit 1
-else
-    echo "SELINUX disabled. continuing"
-fi
-
-LOCAL_IMAGES_FILEPATH=/var/lib/rancher/k3s/agent/images
-ARTIFACT_DIR=/opt/hauler/local-artifacts/k3s
-
-mkdir -p ${LOCAL_IMAGES_FILEPATH}
-
-cp ${ARTIFACT_DIR}/images/* ${LOCAL_IMAGES_FILEPATH}
-
-cp ${ARTIFACT_DIR}/bin/k3s /usr/local/bin/k3s
-chmod +x /usr/local/bin/k3s
-
-yum install -y ${ARTIFACT_DIR}/rpm/*
-
-INSTALL_K3S_SKIP_DOWNLOAD=true ${ARTIFACT_DIR}/bin/k3s-install.sh
-
-chmod +r /etc/rancher/k3s/k3s.yaml

vagrant-scripts/k3s-prep.sh

@@ -1,50 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# RUN IN VAGRANT MACHINE
-# Download all required dependencies for an air-gapped k3s install, saving them
-# to the folder shared with the host machine.
-################################################################################
-
-BASE_SHARED_DIR="/opt/hauler"
-VAGRANT_SCRIPTS_DIR="${BASE_SHARED_DIR}/vagrant-scripts"
-ARTIFACTS_DIR="${BASE_SHARED_DIR}/local-artifacts/k3s"
-
-K3S_VERSION='v1.18.8+k3s1'
-K3S_VERSION_URL='v1.18.8%2Bk3s1'
-
-LOCAL_IMAGES="${ARTIFACTS_DIR}/images"
-LOCAL_BIN="${ARTIFACTS_DIR}/bin"
-LOCAL_RPM="${ARTIFACTS_DIR}/rpm"
-
-mkdir -p ${LOCAL_IMAGES}
-mkdir -p ${LOCAL_BIN}
-mkdir -p ${LOCAL_RPM}
-
-# temporarily allow internet access
-${VAGRANT_SCRIPTS_DIR}/airgap.sh internet
-
-pushd ${LOCAL_IMAGES}
-
-curl -LO https://github.com/rancher/k3s/releases/download/${K3S_VERSION_URL}/k3s-airgap-images-amd64.tar
-
-popd
-
-pushd ${LOCAL_BIN}
-
-curl -LO https://github.com/rancher/k3s/releases/download/${K3S_VERSION_URL}/k3s
-curl -L https://raw.githubusercontent.com/rancher/k3s/${K3S_VERSION_URL}/install.sh -o k3s-install.sh
-chmod +x ./*
-
-popd
-
-pushd ${LOCAL_RPM}
-
-curl -LO https://rpm.rancher.io/k3s-selinux-0.1.1-rc1.el7.noarch.rpm
-yum install -y yum-utils
-yumdownloader --destdir=. --resolve container-selinux selinux-policy-base
-
-popd
-
-# restore air-gap configuration
-${VAGRANT_SCRIPTS_DIR}/airgap.sh airgap

vagrant-scripts/prep-all.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-BASE_SHARED_DIR="/opt/hauler"
-VAGRANT_SCRIPTS_DIR="${BASE_SHARED_DIR}/vagrant-scripts"
-
-for script in ${VAGRANT_SCRIPTS_DIR}/*-prep.sh ; do
-  echo "---"
-  echo "Running ${script} ..."
-  echo "---"
-
-  sh "${script}"
-done

vagrant-scripts/rke2-install.sh

@@ -1,73 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# RUN IN VAGRANT MACHINE
-# Install a default, bare rke2 cluster into the Vagrant machine
-################################################################################
-
-BASE_SHARED_DIR="/opt/hauler"
-VAGRANT_SCRIPTS_DIR="${BASE_SHARED_DIR}/vagrant-scripts"
-
-RKE2_VERSION_DOCKER='v1.18.4-beta16-rke2'
-
-if pgrep -x "firewalld" >/dev/null
-then
-  echo "[FATAL] disable firewalld first"
-fi
-
-mkdir -p /etc/rancher/rke2/
-
-# TODO - allow using selinux
-
-SELINUXSTATUS="$(getenforce)"
-if [ "$SELINUXSTATUS" = "Permissive" ] || [ "$SELINUXSTATUS" = "Enforcing" ]
-then
-  echo "selinux: true" | sudo tee -a /etc/rancher/rke2/config.yaml > /dev/null
-else
-  echo "SELINUX disabled. continuing"
-fi
-
-LOCAL_IMAGES_FILEPATH=/var/lib/rancher/rke2/agent/images
-ARTIFACT_DIR="${BASE_SHARED_DIR}/local-artifacts/rke2"
-
-mkdir -p ${LOCAL_IMAGES_FILEPATH}
-
-cp ${ARTIFACT_DIR}/images/* ${LOCAL_IMAGES_FILEPATH}
-
-# TODO - add ability to use local binary with yum install
-
-# ----------------------------------------------------------
-# uncomment to use a specific local binary for the install
-# ----------------------------------------------------------
-# LOCAL_RKE2_BIN='rke2-beta13-dev'
-
-#if [ -n "${LOCAL_RKE2_BIN}" ] && [ -f "${ARTIFACT_DIR}/bin/${LOCAL_RKE2_BIN}" ] ; then
-#  echo "Use "${ARTIFACT_DIR}/bin/${LOCAL_RKE2_BIN}" for rke2 binary"
-#
-#  INSTALL_RKE2_SKIP_START=true \
-#    RKE2_RUNTIME_IMAGE="rancher/rke2-runtime:${RKE2_VERSION_DOCKER}" \
-#    ${ARTIFACT_DIR}/bin/rke2-installer.run
-#
-#  rm -f /usr/local/bin/rke2
-#
-#  cp "${ARTIFACT_DIR}/bin/${LOCAL_RKE2_BIN}" /usr/local/bin/rke2
-#
-#  systemctl start rke2
-#else
-#  ${ARTIFACT_DIR}/bin/rke2-installer.run
-#fi
-
-yum install -y ${ARTIFACT_DIR}/rpm/*
-
-systemctl enable rke2-server && systemctl start rke2-server
-
-while [ -f "/etc/rancher/rke2/rke2.yaml" ] ; do
-  echo "Waiting for /etc/rancher/rke2/rke2.yaml to exist..."
-  sleep 10
-done
-
-chmod +r /etc/rancher/rke2/rke2.yaml
-
-echo "RKE2 cluster is wrapping up installation, run the following commands to allow kubectl access:
-export KUBECONFIG=/etc/rancher/rke2/rke2.yaml
-export PATH=/var/lib/rancher/rke2/bin/:\${PATH}"

vagrant-scripts/rke2-prep.sh

@@ -1,72 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# RUN IN VAGRANT MACHINE
-# Download all required dependencies for an air-gapped rke2 install, saving them
-# to the folder shared with the host machine.
-################################################################################
-
-BASE_SHARED_DIR="/opt/hauler"
-VAGRANT_SCRIPTS_DIR="${BASE_SHARED_DIR}/vagrant-scripts"
-ARTIFACTS_DIR="${BASE_SHARED_DIR}/local-artifacts/rke2"
-
-RKE2_VERSION='v1.18.13+rke2r1'
-RKE2_VERSION_URL='v1.18.13%2Brke2r1'
-RKE2_VERSION_DOCKER='v1.18.13-rke2r1'
-
-LOCAL_IMAGES="${ARTIFACTS_DIR}/images"
-LOCAL_BIN="${ARTIFACTS_DIR}/bin"
-LOCAL_RPM="${ARTIFACTS_DIR}/rpm"
-
-mkdir -p ${LOCAL_IMAGES}
-mkdir -p ${LOCAL_BIN}
-mkdir -p ${LOCAL_RPM}
-
-# temporarily allow internet access
-${VAGRANT_SCRIPTS_DIR}/airgap.sh internet
-
-pushd ${LOCAL_IMAGES}
-
-curl -LO https://github.com/rancher/rke2/releases/download/${RKE2_VERSION_URL}/rke2-images.linux-amd64.tar.gz
-gunzip rke2-images.linux-amd64.tar.gz
-
-popd
-
-#pushd ${LOCAL_BIN}
-#
-#curl -L https://github.com/rancher/rke2/releases/download/${RKE2_VERSION_URL}/rke2-installer.linux-amd64.run -o rke2-installer.run
-#chmod +x ./*
-#
-#popd
-
-pushd ${LOCAL_RPM}
-
-yum install -y yum-plugin-downloadonly
-
-rke2_rpm_channel='stable'
-rpm_site='rpm.rancher.io'
-maj_ver='7'
-rke2_majmin=$(echo "${RKE2_VERSION}" | sed -E -e "s/^v([0-9]+\.[0-9]+).*/\1/")
-
-cat <<-EOF >"/etc/yum.repos.d/rancher-rke2.repo"
-[rancher-rke2-common-${rke2_rpm_channel}]
-name=Rancher RKE2 Common (${RKE2_VERSION})
-baseurl=https://${rpm_site}/rke2/${rke2_rpm_channel}/common/centos/${maj_ver}/noarch
-enabled=1
-gpgcheck=1
-gpgkey=https://${rpm_site}/public.key
-[rancher-rke2-${rke2_majmin}-${rke2_rpm_channel}]
-name=Rancher RKE2 ${rke2_majmin} (${RKE2_VERSION})
-baseurl=https://${rpm_site}/rke2/${rke2_rpm_channel}/${rke2_majmin}/centos/${maj_ver}/x86_64
-enabled=1
-gpgcheck=1
-gpgkey=https://${rpm_site}/public.key
-EOF
-
-yum install --downloadonly --downloaddir=./ rke2-server
-
-popd
-
-
-# restore air-gap configuration
-${VAGRANT_SCRIPTS_DIR}/airgap.sh airgap