Skip to content

Commit 6f80a25

Browse files
dhirajsbdhirajsb
authored
Merge pull request #307 from dhirajsb/chore/merge-kf-main
periodic sync upstream KF to midstream ODH
2 parents 9876aef + 3beb7fd commit 6f80a25

77 files changed

Lines changed: 6278 additions & 9573 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/labeler.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
- changed-files:
2525
- any-glob-to-any-file: "jobs/async-upload/**"
2626

27+
"Area/Model Catalog":
28+
- changed-files:
29+
- any-glob-to-any-file:
30+
- "catalog/**"
31+
- "manifests/kustomize/options/catalog/**"
32+
2733
"Area/Manifests":
2834
- changed-files:
2935
- any-glob-to-any-file: "manifests/**"

‎.github/workflows/async-upload-test.yml‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ jobs:
3939
run:
4040
working-directory: jobs/async-upload
4141
steps:
42-
- uses: actions/checkout@v4
42+
- uses: actions/checkout@v5
4343
- name: Set up Python
4444
uses: actions/setup-python@v5
4545
with:
46-
python-version: "3.10" # refers to the Container image
46+
python-version: "3.11" # refers to the Container image
4747
- name: Install Poetry
4848
run: |
4949
pipx install poetry
@@ -66,11 +66,11 @@ jobs:
6666
run:
6767
working-directory: jobs/async-upload
6868
steps:
69-
- uses: actions/checkout@v4
69+
- uses: actions/checkout@v5
7070
- name: Set up Python
7171
uses: actions/setup-python@v5
7272
with:
73-
python-version: "3.10" # refers to the Container image
73+
python-version: "3.11" # refers to the Container image
7474
- name: Install Poetry
7575
run: |
7676
pipx install poetry
@@ -81,3 +81,34 @@ jobs:
8181
- name: Execute Sample Job E2E test
8282
run: |
8383
make test-integration
84+
check-autogen:
85+
name: Check generated code or files are in sync
86+
runs-on: ubuntu-latest
87+
defaults:
88+
run:
89+
working-directory: jobs/async-upload
90+
steps:
91+
- name: Check out the repository
92+
uses: actions/checkout@v5
93+
with:
94+
fetch-depth: 0
95+
- name: Set up Python
96+
uses: actions/setup-python@v5
97+
with:
98+
python-version: "3.11"
99+
- name: Install Poetry
100+
run: |
101+
pipx install poetry
102+
- name: Install dependencies
103+
run: |
104+
make install
105+
- name: Check if there are uncommitted file changes
106+
run: |
107+
clean=$(git status --porcelain)
108+
if [[ -z "$clean" ]]; then
109+
echo "Empty git status --porcelain: $clean"
110+
else
111+
echo "Uncommitted file changes detected: $clean"
112+
git diff
113+
exit 1
114+
fi

‎.github/workflows/build-and-push-async-upload.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
packages: write
2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131

3232
- name: Set up Docker Buildx
3333
uses: docker/setup-buildx-action@v3

‎.github/workflows/build-and-push-csi-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.head_ref == '' && github.ref == 'refs/heads/main'
3636
run: echo "BUILD_CONTEXT=main" >> $GITHUB_ENV
3737
# checkout branch
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v5
3939
# set image version
4040
- name: Set main-branch environment
4141
if: env.BUILD_CONTEXT == 'main'

‎.github/workflows/build-and-push-image.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ env:
1818
PUSH_IMAGE: true
1919
DOCKER_USER: ${{ secrets.QUAY_USERNAME }}
2020
DOCKER_PWD: ${{ secrets.QUAY_PASSWORD }}
21+
22+
permissions: # default workflow permission, overridden for specific job where required
23+
contents: read
24+
2125
jobs:
2226
prepare:
2327
uses: ./.github/workflows/prepare.yml
@@ -36,7 +40,7 @@ jobs:
3640
if: github.head_ref == '' && github.ref == 'refs/heads/main'
3741
run: echo "BUILD_CONTEXT=main" >> $GITHUB_ENV
3842
# checkout branch
39-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v5
4044
# set image version
4145
- name: Set main-branch environment
4246
if: env.BUILD_CONTEXT == 'main'

‎.github/workflows/build-and-push-ui-images-standalone.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Build and Push UI Standalone Image
2+
# this workflow builds an image to support local testing
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
tags:
8+
- 'v*'
9+
paths:
10+
- 'clients/ui/**'
11+
- '!LICENSE*'
12+
- '!DOCKERFILE*'
13+
- '!**.gitignore'
14+
- '!**.md'
15+
- '!**.txt'
16+
env:
17+
IMG_REGISTRY: ghcr.io
18+
IMG_ORG: kubeflow
19+
IMG_UI_REPO: model-registry/ui-standalone # this image is intended for local development, not production
20+
DOCKER_USER: ${{ github.actor }}
21+
DOCKER_PWD: ${{ secrets.GITHUB_TOKEN }}
22+
jobs:
23+
build-and-push:
24+
runs-on: ubuntu-latest
25+
permissions:
26+
contents: read
27+
packages: write
28+
steps:
29+
- name: Checkout repository
30+
uses: actions/checkout@v5
31+
32+
- name: Set up Docker Buildx
33+
uses: docker/setup-buildx-action@v3
34+
35+
- name: Log in to the Container registry
36+
uses: docker/login-action@v3
37+
with:
38+
registry: ${{ env.IMG_REGISTRY }}
39+
username: ${{ env.DOCKER_USER }}
40+
password: ${{ env.DOCKER_PWD }}
41+
42+
- name: Set main-branch environment
43+
if: github.ref == 'refs/heads/main'
44+
run: |
45+
commit_sha=${{ github.sha }}
46+
tag=main-${commit_sha:0:7}
47+
echo "VERSION=${tag}" >> $GITHUB_ENV
48+
49+
- name: Set tag environment
50+
if: startsWith(github.ref, 'refs/tags/v')
51+
run: |
52+
echo "VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
53+
54+
- name: Extract metadata (tags, labels) for Docker
55+
id: meta
56+
uses: docker/metadata-action@v5
57+
with:
58+
images: "${{ env.IMG_REGISTRY }}/${{ env.IMG_ORG }}/${{ env.IMG_UI_REPO }}"
59+
tags: |
60+
type=ref,event=branch
61+
type=ref,event=pr
62+
type=semver,pattern={{version}}
63+
type=semver,pattern={{major}}.{{minor}}
64+
type=sha
65+
type=raw,value=${{ env.VERSION }},enable=${{ env.VERSION != '' }}
66+
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
67+
68+
- name: Build and push Docker image
69+
uses: docker/build-push-action@v6
70+
with:
71+
context: ./clients/ui
72+
push: true
73+
tags: ${{ steps.meta.outputs.tags }}
74+
labels: ${{ steps.meta.outputs.labels }}
75+
build-args: |
76+
DEPLOYMENT_MODE=standalone
77+
STYLE_THEME=mui-theme
78+
cache-from: type=gha
79+
cache-to: type=gha,mode=max

‎.github/workflows/build-and-push-ui-images.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Build and Push UI Image
2+
# this workflow builds an image to support local testing
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
tags:
8+
- 'v*'
9+
paths:
10+
- 'clients/ui/**'
11+
- '!LICENSE*'
12+
- '!DOCKERFILE*'
13+
- '!**.gitignore'
14+
- '!**.md'
15+
- '!**.txt'
16+
env:
17+
IMG_REGISTRY: ghcr.io
18+
IMG_ORG: kubeflow
19+
IMG_UI_REPO: model-registry/ui # this image is intended for local development, not production
20+
DOCKER_USER: ${{ github.actor }}
21+
DOCKER_PWD: ${{ secrets.GITHUB_TOKEN }}
22+
jobs:
23+
build-and-push:
24+
runs-on: ubuntu-latest
25+
permissions:
26+
contents: read
27+
packages: write
28+
steps:
29+
- name: Checkout repository
30+
uses: actions/checkout@v5
31+
32+
- name: Set up Docker Buildx
33+
uses: docker/setup-buildx-action@v3
34+
35+
- name: Log in to the Container registry
36+
uses: docker/login-action@v3
37+
with:
38+
registry: ${{ env.IMG_REGISTRY }}
39+
username: ${{ env.DOCKER_USER }}
40+
password: ${{ env.DOCKER_PWD }}
41+
42+
- name: Set main-branch environment
43+
if: github.ref == 'refs/heads/main'
44+
run: |
45+
commit_sha=${{ github.sha }}
46+
tag=main-${commit_sha:0:7}
47+
echo "VERSION=${tag}" >> $GITHUB_ENV
48+
49+
- name: Set tag environment
50+
if: startsWith(github.ref, 'refs/tags/v')
51+
run: |
52+
echo "VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
53+
54+
- name: Extract metadata (tags, labels) for Docker
55+
id: meta
56+
uses: docker/metadata-action@v5
57+
with:
58+
images: "${{ env.IMG_REGISTRY }}/${{ env.IMG_ORG }}/${{ env.IMG_UI_REPO }}"
59+
tags: |
60+
type=ref,event=branch
61+
type=ref,event=pr
62+
type=semver,pattern={{version}}
63+
type=semver,pattern={{major}}.{{minor}}
64+
type=sha
65+
type=raw,value=${{ env.VERSION }},enable=${{ env.VERSION != '' }}
66+
type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
67+
68+
- name: Build and push Docker image
69+
uses: docker/build-push-action@v6
70+
with:
71+
context: ./clients/ui
72+
push: true
73+
tags: ${{ steps.meta.outputs.tags }}
74+
labels: ${{ steps.meta.outputs.labels }}
75+
build-args: |
76+
DEPLOYMENT_MODE=kubeflow
77+
STYLE_THEME=mui-theme
78+
cache-from: type=gha
79+
cache-to: type=gha,mode=max

‎.github/workflows/build-image-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build-and-test-image:
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
- name: Generate Tag
3030
shell: bash
3131
id: tags

‎.github/workflows/build-image-ui-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
# checkout branch
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
- name: Build UI Image
3030
shell: bash
3131
run: ./scripts/build_deploy.sh

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
- name: Setup Go
3030
uses: actions/setup-go@v5
3131
with:

0 commit comments

Comments
 (0)