Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add custom k3s image #55

Merged
merged 12 commits into from
Mar 26, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wip: be more sane
  • Loading branch information
mjnagel committed Mar 25, 2024
commit 905e3e3e34ce489a894bd8b01d3f4eac06648948
Original file line number Diff line number Diff line change
@@ -25,6 +25,9 @@ jobs:
username: ${{secrets.IRON_BANK_ROBOT_USERNAME}}
password: ${{secrets.IRON_BANK_ROBOT_PASSWORD}}

- name: Build the custom k3s image
run: uds run build-image

- name: Create and deploy the uds-k3d package
run: uds run

27 changes: 0 additions & 27 deletions .github/workflows/image-test.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/tag-and-release.yml
Original file line number Diff line number Diff line change
@@ -46,10 +46,10 @@ jobs:
username: dummy
password: ${{ secrets.GITHUB_TOKEN }}

- name: Publish the custom k3s image
run: uds run publish-image

- name: Publish the capability
run: |
uds zarf package create --confirm -a arm64 -o oci://ghcr.io/defenseunicorns/packages
uds zarf package create --confirm -a amd64 -o oci://ghcr.io/defenseunicorns/packages

- name: Publish the custom k3s image
run: uds run publish-image
6 changes: 4 additions & 2 deletions tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
variables:
- name: K3S_VERSION
default: "v1.28.7-k3s1"
- name: IMAGE_PATH
default: "ghcr.io/defenseunicorns/oss/uds-k3d-k3s"

tasks:
- name: default
@@ -35,10 +37,10 @@ tasks:
- name: build-image
actions:
- description: Build the custom k3s image
cmd: docker build -t ghcr.io/defenseunicorns/oss/uds-k3d-k3s:${K3S_VERSION} --build-arg K3S_TAG=${K3S_VERSION} docker/
cmd: docker build -t ${IMAGE_PATH}:${K3S_VERSION} --build-arg K3S_TAG=${K3S_VERSION} docker/

- name: publish-image
actions:
- task: build-image
- description: Publish the custom k3s image
cmd: docker push ghcr.io/defenseunicorns/oss/uds-k3d-k3s:${K3S_VERSION}
cmd: docker push ${IMAGE_PATH}:${K3S_VERSION}
2 changes: 1 addition & 1 deletion zarf.yaml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ variables:

- name: K3D_IMAGE
description: "K3d image to use"
default: "rancher/k3s:v1.28.7-k3s1"
default: "ghcr.io/defenseunicorns/oss/uds-k3d-k3s:v1.28.7-k3s1"

- name: K3D_EXTRA_ARGS
description: "Optionally pass k3d arguments to the default"