From b92a5e1be1fb8fc6e69051ed9e3e7d9e2058978e Mon Sep 17 00:00:00 2001
From: Danny Gershman <danny@radiusmethod.com>
Date: Wed, 5 Apr 2023 20:36:34 +0000
Subject: [PATCH] Zarf Airgap Updates to 0.25.1 and BB 1.56.0
---
docs/assets/scripts/airgap-zarf/zarf-dev.sh | 11 ++++++++---
docs/guides/airgap-zarf/README.md | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/docs/assets/scripts/airgap-zarf/zarf-dev.sh b/docs/assets/scripts/airgap-zarf/zarf-dev.sh
index 709dbc4bed..a52cf90349 100755
--- a/docs/assets/scripts/airgap-zarf/zarf-dev.sh
+++ b/docs/assets/scripts/airgap-zarf/zarf-dev.sh
@@ -1,13 +1,18 @@
#!/usr/bin/env bash
-ZARF_VERSION=v0.25.0
+ZARF_VERSION=v0.25.1
+BIGBANG_VERSION=1.56.0
+
+# Choices: warn, info, debug, trace
+# Currently set only for zarf package deploy
+ZARF_LOG_LEVEL=info
# Prerequisites: REGISTRY1_USERNAME and REGISTRY1_PASSWORD must be exported locally.
# Configurable: ZARF_TEST_REPO, ZARF_TEST_REPO_BRANCH, ZARF_TEST_REPO_DIRECTORY all define where to pick up the zarf.yaml file.
# Example with configuration: KeyName=<KeyName> PublicIP=<Ip> ZARF_TEST_REPO=https://repo1.dso.mil/some-repo.git ZARF_TEST_REPO_BRANCH=development docs/assets/scripts/airgap-zarf/zarf-dev.sh
ZARF_TEST_REPO=${ZARF_TEST_REPO:=https://github.com/defenseunicorns/zarf}
-ZARF_TEST_REPO_BRANCH=${ZARF_TEST_REPO_BRANCH:=main}
+ZARF_TEST_REPO_BRANCH=${ZARF_TEST_REPO_BRANCH:=ZARF_VERSION}
ZARF_TEST_REPO_DIRECTORY=${ZARF_TEST_REPO_DIRECTORY:=zarf/examples/big-bang}
function run() {
@@ -29,4 +34,4 @@ run "set +o history && echo ${REGISTRY1_PASSWORD} | zarf tools registry login re
run "zarf init --components=git-server --confirm"
run "git clone --single-branch --branch ${ZARF_TEST_REPO_BRANCH} ${ZARF_TEST_REPO}"
run "cd ${ZARF_TEST_REPO_DIRECTORY} && zarf package create --confirm --max-package-size=0"
-run "cd ${ZARF_TEST_REPO_DIRECTORY} && zarf package deploy zarf-package-big-bang-example-amd64-1.54.0.tar.zst --confirm --components=gitea-virtual-service"
+run "cd ${ZARF_TEST_REPO_DIRECTORY} && zarf package deploy zarf-package-big-bang-example-amd64-${BIGBANG_VERSION}.tar.zst --confirm --components=gitea-virtual-service --log-level ${ZARF_LOG_LEVEL}"
diff --git a/docs/guides/airgap-zarf/README.md b/docs/guides/airgap-zarf/README.md
index 927432a7a5..965c08629b 100644
--- a/docs/guides/airgap-zarf/README.md
+++ b/docs/guides/airgap-zarf/README.md
@@ -2,7 +2,7 @@
> âš ï¸ This is a work in-progress.
-> âš ï¸ These instructions work specifically with Big Bang version 1.54.0. Other versions are not yet supported.
+### Requires Big Bang 1.54.0 and greater.
This section is currently purely devoted to building and testing packages on a development cluster. The result could be a set of archives that can be used for moving across an airgap. Essentially this automates a few of the steps indicated in this [documentation](https://github.com/defenseunicorns/zarf/blob/main/docs/13-walkthroughs/5-big-bang.md).
--
GitLab