Skip to content

Commit 503f383

Browse files
arnab2001arnab2001
committed
merge upstream/main, address review comments, and fix findings
Resolve merge conflicts with upstream/main, incorporating: - artifact.FormatRepositoryForDisplay/ReferenceIsDigest renames - --filter support for kit list - kitfile.FilterConf/ParseFilter relocation Address reviewer feedback: - Eliminate options duplication by embedding kit.*Options in cmd structs - Restore comments removed during initial refactor - Use kit.ModelInfo directly in cmd/list via type alias Fix review findings: - Fix %ws typo in removeModelRef error wrapping - Add credential/concurrency initialization to kit.Push - Fix TagCommand to use declared opts variable Signed-off-by: Arnab Chatterjee <arnabchat2001@gmail.com>
1 parent 4245450 commit 503f383

120 files changed

Lines changed: 5567 additions & 2003 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-devmode.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222

2323
## install build dependencies for frontend generation
2424
- name: Install Node.js
25-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
25+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
2626
with:
2727
node-version-file: './frontend/dev-mode/.nvmrc'
2828

2929
- name: Install pnpm
30-
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
30+
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
3131
with:
3232
package_json_file: frontend/dev-mode/package.json
3333
run_install: false
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
echo "PNPM_CACHE_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
3939
40-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
40+
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
4141
name: Setup pnpm cache
4242
with:
4343
path: ${{ env.PNPM_CACHE_STORE_PATH }}

‎.github/workflows/build-docs.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # 6.0.2
2323

2424
- name: Install Node.js
25-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # 6.2.0
25+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # 6.3.0
2626
with:
2727
node-version-file: './docs/.nvmrc'
2828

29-
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # 4.2.0
29+
- uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # 4.4.0
3030
name: Install pnpm
3131
with:
3232
run_install: false
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
echo "PNPM_CACHE_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
3939
40-
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # 5.0.3
40+
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # 5.0.4
4141
name: Setup pnpm cache
4242
with:
4343
path: ${{ env.PNPM_CACHE_STORE_PATH }}

‎.github/workflows/kubeflow-components-test.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Set up QEMU
35-
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
35+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
3636

3737
- name: Set up Docker Buildx
38-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
38+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
3939

4040
- name: Checkout
4141
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4242

4343
- name: Check kubeflow components container build
44-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
44+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
4545
with:
4646
platforms: linux/amd64,linux/arm64
4747
push: false

‎.github/workflows/next-container-build.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Set up QEMU
29-
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
29+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
3030

3131
- name: Set up Docker Buildx
32-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
32+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
3333

3434
- name: Login to ghcr.io
35-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
35+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
3636
with:
3737
registry: ${{ env.REGISTRY }}
3838
username: ${{ github.actor }}
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Build and push base Kit container
4545
id: build-kit-container
46-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
46+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
4747
with:
4848
platforms: linux/amd64,linux/arm64
4949
push: true
@@ -60,7 +60,7 @@ jobs:
6060
6161
- name: Build and push Kit init container
6262
id: build-kit-init-container
63-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
63+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
6464
with:
6565
platforms: linux/amd64,linux/arm64
6666
push: true
@@ -77,7 +77,7 @@ jobs:
7777
7878
- name: Build and push Kit KServe container
7979
id: build-kit-serve-container
80-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
80+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
8181
with:
8282
platforms: linux/amd64,linux/arm64
8383
push: true
@@ -94,7 +94,7 @@ jobs:
9494
9595
- name: Build and push Kubeflow Pipeline components container
9696
id: build-kubeflow-container
97-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
97+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
9898
with:
9999
platforms: linux/amd64,linux/arm64
100100
push: true

‎.github/workflows/platform-release.yaml‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,34 @@ jobs:
3939

4040
## install build dependencies for frontend generation
4141
- name: Install Node.js
42-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
42+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
4343
with:
4444
node-version-file: './frontend/dev-mode/.nvmrc'
4545

4646
- name: Install pnpm
47-
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
47+
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
4848
with:
4949
package_json_file: './docs/package.json'
5050

5151
- name: Setup Go
52-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
52+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
5353
with:
5454
go-version-file: 'go.mod'
5555

5656
- name: Import Apple Code Signing Certificates
5757
if: ${{ github.event_name != 'workflow_dispatch' || !inputs.skip_signing }}
58-
uses: Apple-Actions/import-codesign-certs@b610f78488812c1e56b20e6df63ec42d833f2d14 # v6.0.0
58+
uses: Apple-Actions/import-codesign-certs@fe74d46e82474f87e1ba79832ad28a4013d0e33a # v6.1.0
5959
with:
6060
p12-file-base64: ${{ secrets.APPLE_CERTIFICATE_BASE64 }}
6161
p12-password: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
6262

6363
- name: Install Syft
64-
uses: anchore/sbom-action/download-syft@28d71544de8eaf1b958d335707167c5f783590ad #v0.22.2
64+
uses: anchore/sbom-action/download-syft@e22c389904149dbc22b58101806040fa8d37a610 #v0.24.0
6565
with:
6666
syft-version: v1.32.0
6767

6868
- name: Run GoReleaser
69-
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a #v6.4.0
69+
uses: goreleaser/goreleaser-action@ec59f474b9834571250b370d4735c50f8e2d1e29 #v7.0.0
7070
with:
7171
version: latest
7272
distribution: goreleaser
@@ -90,7 +90,7 @@ jobs:
9090
./build/scripts/sign ./dist/kitops-darwin-x86_64.zip
9191
./build/scripts/sign ./dist/kitops-offline-darwin-x86_64.zip
9292
- name: Upload macOS artifacts
93-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
93+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
9494
with:
9595
name: dist-macos
9696
if-no-files-found: error
@@ -107,25 +107,25 @@ jobs:
107107
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
108108

109109
- name: Setup Go
110-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
110+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
111111
with:
112112
go-version-file: 'go.mod'
113113

114114
- name: Install Syft
115-
uses: anchore/sbom-action/download-syft@28d71544de8eaf1b958d335707167c5f783590ad #v0.22.2
115+
uses: anchore/sbom-action/download-syft@e22c389904149dbc22b58101806040fa8d37a610 #v0.24.0
116116
with:
117117
syft-version: v1.32.0
118118

119119
- name: Run GoReleaser
120-
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a #v6.4.0
120+
uses: goreleaser/goreleaser-action@ec59f474b9834571250b370d4735c50f8e2d1e29 #v7.0.0
121121
with:
122122
version: latest
123123
distribution: goreleaser
124124
args: release --clean --snapshot --config ./.goreleaser.windows.yaml
125125
env:
126126
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
127127
- name: Upload Windows artifacts
128-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
128+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
129129
with:
130130
name: dist-windows
131131
if-no-files-found: error
@@ -141,17 +141,17 @@ jobs:
141141
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
142142

143143
- name: Setup Go
144-
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
144+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
145145
with:
146146
go-version-file: 'go.mod'
147147

148148
- name: Install Syft
149-
uses: anchore/sbom-action/download-syft@28d71544de8eaf1b958d335707167c5f783590ad #v0.22.2
149+
uses: anchore/sbom-action/download-syft@e22c389904149dbc22b58101806040fa8d37a610 #v0.24.0
150150
with:
151151
syft-version: v1.32.0
152152

153153
- name: Run GoReleaser
154-
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a #v6.4.0
154+
uses: goreleaser/goreleaser-action@ec59f474b9834571250b370d4735c50f8e2d1e29 #v7.0.0
155155
with:
156156
version: latest
157157
distribution: goreleaser
@@ -160,7 +160,7 @@ jobs:
160160
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
161161

162162
- name: Upload Linux artifacts
163-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
163+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
164164
with:
165165
name: dist-linux
166166
if-no-files-found: error
@@ -176,11 +176,21 @@ jobs:
176176
runs-on: ubuntu-latest
177177
needs: [build-linux, build-macos, build-windows]
178178
steps:
179-
# checkout the current repository
179+
- name: Generate a token for docs update PR
180+
id: generate-token
181+
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 ## v3.0.0
182+
with:
183+
app-id: ${{ vars.KITOPS_BOT_ID }}
184+
private-key: ${{ secrets.KITOPS_BOT_PRIVATE_KEY }}
185+
owner: kitops-ml
186+
187+
# checkout the current repository using the App token
188+
# so that git credentials are set correctly for the docs update PR
180189
- name: Checkout kitops
181190
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
182191
with:
183192
path: kitops
193+
token: ${{ steps.generate-token.outputs.token }}
184194

185195
# Create the homebrew-file directory to store the
186196
# homebrew artifacts and copy the awk script and
@@ -192,7 +202,7 @@ jobs:
192202
cp ./kitops/build/homebrew/*.* ./homebrew-files
193203
194204
- name: Merge build artifacts
195-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
205+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
196206
with:
197207
path: dist
198208
pattern: dist-*
@@ -215,7 +225,7 @@ jobs:
215225
# homebrew recipe and pushing it to the repository:
216226
# 'kitops-ml/homebrew-kitops'
217227
- name: Upload homebrew-files as a build artifact
218-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
228+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
219229
with:
220230
name: homebrew-files
221231
if-no-files-found: error
@@ -251,7 +261,7 @@ jobs:
251261
- name: Generate CLI documentation
252262
shell: bash
253263
env:
254-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
264+
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
255265
TAG_NAME: ${{ inputs.release_tag || github.ref_name}}
256266
run: |
257267
pushd kitops
@@ -283,7 +293,7 @@ jobs:
283293
steps:
284294
- name: Generate a token
285295
id: generate-token
286-
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf ## v2.2.1
296+
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 ## v3.0.0
287297
with:
288298
app-id: ${{ vars.KITOPS_BOT_ID }}
289299
private-key: ${{ secrets.KITOPS_BOT_PRIVATE_KEY }}
@@ -298,7 +308,7 @@ jobs:
298308
token: ${{ steps.generate-token.outputs.token }}
299309

300310
- name: Download the homebrew artifacts to build the homebrew recipe
301-
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
311+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
302312
with:
303313
name: homebrew-files
304314
path: homebrew-files
@@ -363,13 +373,13 @@ jobs:
363373
needs: [release]
364374
steps:
365375
- name: Set up QEMU
366-
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
376+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
367377

368378
- name: Set up Docker Buildx
369-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
379+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
370380

371381
- name: Login to ghcr.io
372-
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
382+
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
373383
with:
374384
registry: ${{ env.REGISTRY }}
375385
username: ${{ github.actor }}
@@ -380,7 +390,7 @@ jobs:
380390

381391
- name: Build and push base Kit container
382392
id: build-kit-container
383-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
393+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
384394
with:
385395
platforms: linux/amd64,linux/arm64
386396
push: true
@@ -398,7 +408,7 @@ jobs:
398408
399409
- name: Build and push Kit init container
400410
id: build-kit-init-container
401-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
411+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
402412
with:
403413
platforms: linux/amd64,linux/arm64
404414
push: true
@@ -416,7 +426,7 @@ jobs:
416426
417427
- name: Build and push Kit KServe container
418428
id: build-kit-serve-container
419-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
429+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
420430
with:
421431
platforms: linux/amd64,linux/arm64
422432
push: true
@@ -434,7 +444,7 @@ jobs:
434444
435445
- name: Build and push Kubeflow Pipeline components container
436446
id: build-kubeflow-container
437-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
447+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
438448
with:
439449
platforms: linux/amd64,linux/arm64
440450
push: true
@@ -451,28 +461,28 @@ jobs:
451461
index:org.opencontainers.image.licenses=Apache-2.0
452462
453463
- name: Generate artifact attestation for base container
454-
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
464+
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
455465
with:
456466
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
457467
subject-digest: ${{ steps.build-kit-container.outputs.digest }}
458468
push-to-registry: true
459469

460470
- name: Generate artifact attestation for kit init container
461-
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
471+
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
462472
with:
463473
subject-name: ${{ env.REGISTRY }}/${{ env.INIT_IMAGE_NAME }}
464474
subject-digest: ${{ steps.build-kit-init-container.outputs.digest }}
465475
push-to-registry: true
466476

467477
- name: Generate artifact attestation for kit kserve container
468-
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
478+
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
469479
with:
470480
subject-name: ${{ env.REGISTRY }}/${{ env.KIT_SERVE_IMAGE }}
471481
subject-digest: ${{ steps.build-kit-serve-container.outputs.digest }}
472482
push-to-registry: true
473483

474484
- name: Generate artifact attestation for kubeflow container
475-
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
485+
uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
476486
with:
477487
subject-name: ${{ env.REGISTRY }}/${{ env.KUBEFLOW_IMAGE }}
478488
subject-digest: ${{ steps.build-kubeflow-container.outputs.digest }}

0 commit comments

Comments
 (0)