Skip to content

Commit

Permalink
Merge pull request #19 from radiusmethod/feature/injector-version-and…
Browse files Browse the repository at this point in the history
…-shasum

Update injector version and shasum
  • Loading branch information
dgershman authored Nov 13, 2024
2 parents 465b6bf + 8f3bcf8 commit 0712042
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
# renovate: depName=zarf-dev/zarf
ZARF_VERSION: 0.37.0
ZARF_VERSION: 0.42.2

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

env:
# renovate: depName=zarf-dev/zarf
ZARF_VERSION: 0.37.0
ZARF_VERSION: 0.42.2

jobs:
build:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARCH:=amd64
# renovate: depName=zarf-dev/zarf
ZARF_VERSION:="0.37.0"
ZARF_VERSION:="0.42.2"
# renovate: depName=go-gitea/gitea
GITEA_VERSION:="1.22.1"
GITEA_VERSION:="1.22.3"
# renovate: depName=distribution/distribution
REGISTRY_VERSION:="2.8.3"

Expand All @@ -20,8 +20,8 @@ build-full:
--set AGENT_IMAGE_DOMAIN="registry1.dso.mil/" \
--set AGENT_IMAGE="ironbank/opensource/defenseunicorns/zarf/zarf-agent" \
--set AGENT_IMAGE_TAG=v$(ZARF_VERSION) \
--set INJECTOR_VERSION="2023-08-02" \
--set INJECTOR_AMD64_SHASUM="91de0768855ee2606a4f85a92bb480ff3a14ca205fd8d05eb397c18e15aa0247" \
--set INJECTOR_VERSION="2024-07-22" \
--set INJECTOR_AMD64_SHASUM="8463bfd66930a4b26c665b51f25e8a32ed5948068bae49987013c89173394478" \
--set GITEA_IMAGE=registry1.dso.mil/ironbank/opensource/go-gitea/gitea:v$(GITEA_VERSION) && \
mv $(BUILD_DIR)/zarf-init-amd64-v$(ZARF_VERSION).tar.zst $(BUILD_DIR)/zarf-init-full-amd64-v$(ZARF_VERSION).tar.zst

Expand Down
16 changes: 8 additions & 8 deletions k3s/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ components:
architecture: amd64
files:
# Include the actual K3s binary
- source: https://github.com/k3s-io/k3s/releases/download/v1.28.4+k3s2/k3s
shasum: 9014535a4cd20c788282d60398a06279983562093455b53ab76701539ce67acf
- source: https://github.com/k3s-io/k3s/releases/download/v1.29.10+k3s1/k3s
shasum: 5b82d6964ae1720a2cd5a5198a7732636ae6076321d497f5533502e2e488f53f
target: /usr/sbin/k3s
executable: true
# K3s magic provides these tools when symlinking
Expand All @@ -24,8 +24,8 @@ components:
- /usr/sbin/ctr
- /usr/sbin/crictl
# Transfer the K3s images for containerd to pick them up
- source: https://github.com/k3s-io/k3s/releases/download/v1.28.4+k3s2/k3s-airgap-images-amd64.tar.zst
shasum: bc4d05bad56a583c80ff443d60e8277a136cc4357dc8527702d38b5cca28880d
- source: https://github.com/k3s-io/k3s/releases/download/v1.29.10+k3s1/k3s-airgap-images-amd64.tar.zst
shasum: 09e644d380d27a845f5c8028066271cd712d0ac6fcfc283ba44ec532adb2ca6f
target: /var/lib/rancher/k3s/agent/images/k3s.tar.zst
actions:
onDeploy:
Expand All @@ -44,8 +44,8 @@ components:
architecture: arm64
files:
# Include the actual K3s binary
- source: https://github.com/k3s-io/k3s/releases/download/v1.28.4+k3s2/k3s-arm64
shasum: 1ae72ca06d3302f3e86ef92e6e8f84e14a084da69564e87d6e2e75f62e72388d
- source: https://github.com/k3s-io/k3s/releases/download/v1.29.10+k3s1/k3s-arm64
shasum: 0eccc3ce9bbf40b88c897f6a6293dd6aa97ee59b6f2f69c30e2811608e607757
target: /usr/sbin/k3s
executable: true
# K3s magic provides these tools when symlinking
Expand All @@ -54,8 +54,8 @@ components:
- /usr/sbin/ctr
- /usr/sbin/crictl
# Transfer the K3s images for containerd to pick them up
- source: https://github.com/k3s-io/k3s/releases/download/v1.28.4+k3s2/k3s-airgap-images-arm64.tar.zst
shasum: 50621ae1391aec7fc66ca66a46a0e9fd48ce373a58073000efdc278233adc64b
- source: https://github.com/k3s-io/k3s/releases/download/v1.29.10+k3s1/k3s-airgap-images-arm64.tar.zst
shasum: 18ab57f41a1c497283a2723a27c3ca5b64975c2873e4f0ed0646753fb2bdc60f
target: /var/lib/rancher/k3s/agent/images/k3s.tar.zst
actions:
onDeploy:
Expand Down
10 changes: 5 additions & 5 deletions zarf/full/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ components:
required: true
import:
# renovate: depName=zarf-dev/zarf
url: oci://ghcr.io/zarf-dev/packages/init:v0.37.0
url: oci://ghcr.io/zarf-dev/packages/init:v0.42.2

- name: zarf-seed-registry
required: true
import:
# renovate: depName=zarf-dev/zarf
url: oci://ghcr.io/zarf-dev/packages/init:v0.37.0
url: oci://ghcr.io/zarf-dev/packages/init:v0.42.2

- name: zarf-registry
required: true
import:
# renovate: depName=zarf-dev/zarf
url: oci://ghcr.io/zarf-dev/packages/init:v0.37.0
url: oci://ghcr.io/zarf-dev/packages/init:v0.42.2

- name: zarf-agent
required: true
import:
# renovate: depName=zarf-dev/zarf
url: oci://ghcr.io/zarf-dev/packages/init:v0.37.0
url: oci://ghcr.io/zarf-dev/packages/init:v0.42.2

- name: git-server
import:
# renovate: depName=zarf-dev/zarf
url: oci://ghcr.io/zarf-dev/packages/init:v0.37.0
url: oci://ghcr.io/zarf-dev/packages/init:v0.42.2

0 comments on commit 0712042

Please sign in to comment.