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!: leapfrogai-ui registry1 flavor integration and uds tasks refactor #1178

Draft
wants to merge 24 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
600bb6c
UI package refactors, task additions and refactor
justinthelaw Oct 2, 2024
3119efe
prevent badge workflow from drafts
justinthelaw Oct 2, 2024
ff79754
add UI to weekly registry1 workflow
justinthelaw Oct 2, 2024
8eaf672
setup tasks for k3d cluster and test user
justinthelaw Oct 2, 2024
2a091e5
setup tasks for k3d cluster and test user, pt.2
justinthelaw Oct 2, 2024
c04ea21
creates for all Zarf packages and images
justinthelaw Oct 2, 2024
8e4c033
WIP deploy tasks
justinthelaw Oct 2, 2024
c9505a9
WIP deploy tasks
justinthelaw Oct 3, 2024
3ce634e
Merge remote-tracking branch 'origin/main' into 736-feat-leapfrogai-u…
justinthelaw Oct 3, 2024
6068be7
WIP deploy tasks, merge with main
justinthelaw Oct 3, 2024
86103bf
registry1 UI 0.13.1 working
justinthelaw Oct 3, 2024
3cc4b42
Merge remote-tracking branch 'origin/main' into 736-feat-leapfrogai-u…
justinthelaw Oct 4, 2024
aef6cd3
cyclic loop workaround
justinthelaw Oct 4, 2024
badcabf
upstream zarfConfig contribution
justinthelaw Oct 4, 2024
ea1ff6d
undo formatting
justinthelaw Oct 4, 2024
32e2558
Merge remote-tracking branch 'origin/main' into 736-feat-leapfrogai-u…
justinthelaw Oct 4, 2024
4fb8de8
upstream zarfConfig contribution, implemented
justinthelaw Oct 4, 2024
0d9076e
streamline logging, minor fixes
justinthelaw Oct 4, 2024
d0e25fd
Merge branch 'main' into 736-feat-leapfrogai-ui-registry1-flavor
justinthelaw Oct 4, 2024
7206738
re-align to upstream create and deploy
justinthelaw Oct 4, 2024
c9a0499
WIP docs updates, add cleans
justinthelaw Oct 4, 2024
f3c917c
remove temp UI registry1 workaround
justinthelaw Oct 7, 2024
2f01de4
clean-up Make targets that already exist
justinthelaw Oct 7, 2024
6366d8f
fix pytest
justinthelaw Oct 7, 2024
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
upstream zarfConfig contribution
justinthelaw committed Oct 4, 2024

Verified

This commit was signed with the committer’s verified signature.
justinthelaw Justin Law
commit badcabfc54bd2eab352920d1f247ba59d3963610
3 changes: 2 additions & 1 deletion tasks/create.yaml
Original file line number Diff line number Diff line change
@@ -166,11 +166,11 @@ tasks:
task: create-common:package
env:
- "FLAVOR=${{ .inputs.flavor }}"
- "ZARF_CONFIG=${{ .inputs.zarfConfig }}"
with:
options: ${{ .inputs.createOptions }} ${{ .inputs.options }} -o ${{ .inputs.outputPath }} --set IMAGE_VERSION=${{ .inputs.version }}
path: ${{ .inputs.path }}
architecture: ${{ .inputs.architecture }}
config: ${{ .inputs.zarfConfig }}

- name: bundle
description: "Create a UDS bundle"
@@ -563,6 +563,7 @@ tasks:
flavor: ${FLAVOR}
architecture: ${ARCHITECTURE}
version: ${VERSION}
zarfConfig: "packages/vllm/zarf-config.yaml"
# the build options below do not affect registry1 builds
createOptions: "--insecure --registry-override=ghcr.io=localhost:${LOCAL_REGISTRY_PORT}"

2 changes: 2 additions & 0 deletions tasks/utils.yaml
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ tasks:
shell:
linux: bash
darwin: bash
mute: true
cmd: |
if [[ ${FLAVOR} = "upstream" || ${{ .inputs.override }} = "true" ]]; then
docker tag ${{ .inputs.current }} ${{ .inputs.new }}
@@ -64,6 +65,7 @@ tasks:
shell:
linux: bash
darwin: bash
mute: true
cmd: |
if [[ ${FLAVOR} = "upstream" || ${{ .inputs.override }} = "true" ]]; then
docker push ${{ .inputs.tag }} ${{ .inputs.options }}