Skip to content

Commit 14c1628

Browse files
committed
keep: Add RHDS fork changes
Signed-off-by: mprahl <mprahl@users.noreply.github.com>
1 parent 697f12f commit 14c1628

3 files changed

Lines changed: 47 additions & 25 deletions

File tree

.tekton/mlflow-pull-request.yaml

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,49 @@ apiVersion: tekton.dev/v1
22
kind: PipelineRun
33
metadata:
44
annotations:
5-
build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/mlflow?rev={{revision}}
5+
build.appstudio.openshift.io/repo: https://github.com/red-hat-data-services/mlflow?rev={{revision}}
66
build.appstudio.redhat.com/commit_sha: '{{revision}}'
77
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
8-
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
9-
pipelinesascode.tekton.dev/cancel-in-progress: "false"
8+
build.appstudio.redhat.com/pull_request_number: "{{pull_request_number}}"
109
pipelinesascode.tekton.dev/max-keep-runs: "3"
11-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
12-
== "master"
13-
creationTimestamp: null
10+
pipelinesascode.tekton.dev/on-comment: "^/build-konflux mlflow"
11+
pipelinesascode.tekton.dev/on-label: "[kfbuild-all, kfbuild-mlflow]"
12+
pipelinesascode.tekton.dev/on-target-branch: "[{{target_branch}}]"
13+
pipelinesascode.tekton.dev/on-event: "[pull_request]"
14+
pipelinesascode.tekton.dev/cancel-in-progress: "true"
1415
labels:
15-
appstudio.openshift.io/application: opendatahub-builds
16-
appstudio.openshift.io/component: mlflow-ci
16+
appstudio.openshift.io/application: automation
17+
appstudio.openshift.io/component: pull-request-pipelines-mlflow
1718
pipelines.appstudio.openshift.io/type: build
1819
name: mlflow-on-pull-request
19-
namespace: open-data-hub-tenant
20+
namespace: rhoai-tenant
2021
spec:
2122
params:
2223
- name: git-url
2324
value: '{{source_url}}'
2425
- name: revision
2526
value: '{{revision}}'
27+
- name: additional-tags
28+
value:
29+
- 'pr-{{pull_request_number}}-into-{{target_branch}}'
30+
- name: additional-labels
31+
value:
32+
- version=on-pr-{{revision}}
33+
- io.openshift.tags=mlflow
2634
- name: output-image
27-
value: quay.io/opendatahub/mlflow:odh-pr
35+
value: quay.io/rhoai/pull-request-pipelines:mlflow-{{revision}}
2836
- name: dockerfile
2937
value: Dockerfile.konflux
3038
- name: path-context
3139
value: .
32-
- name: additional-tags
33-
value:
34-
- 'odh-pr-{{revision}}'
3540
- name: hermetic
3641
value: 'true'
3742
- name: prefetch-input
3843
value: '[{"type": "pip", "path": ".", "requirements_files": ["requirements/konflux-pypi-requirements.txt"]}, {"type": "pip", "path": "requirements", "requirements_files": ["konflux-aipcc-requirements.txt", "konflux-build-aipcc-requirements.txt"], "binary": {"arch": ":all:"}}, {"type": "yarn", "path": "mlflow/server/js"}, {"type": "rpm", "path": "requirements"}]'
44+
- name: build-source-image
45+
value: true
46+
- name: build-image-index
47+
value: true
3948
- name: pipeline-type
4049
value: pull-request
4150
- name: build-platforms
@@ -44,26 +53,29 @@ spec:
4453
- linux-m2xlarge/arm64
4554
- linux/ppc64le
4655
- linux/s390x
56+
- name: image-expires-after
57+
value: 5d
58+
- name: enable-slack-failure-notification
59+
value: "false"
4760
pipelineRef:
4861
resolver: git
4962
params:
5063
- name: url
51-
value: https://github.com/opendatahub-io/odh-konflux-central.git
64+
value: https://github.com/red-hat-data-services/konflux-central.git
5265
- name: revision
53-
value: main
66+
value: '{{ target_branch }}'
5467
- name: pathInRepo
55-
value: pipeline/multi-arch-container-build.yaml
56-
# Extra memory prevents yarn from silently failing/timing out during prefetch.
68+
value: pipelines/multi-arch-container-build.yaml
5769
taskRunSpecs:
5870
- pipelineTaskName: prefetch-dependencies
5971
computeResources:
6072
requests:
6173
cpu: '1'
62-
memory: 6Gi
74+
memory: 5120Mi
6375
limits:
64-
memory: 6Gi
76+
memory: 5120Mi
6577
taskRunTemplate:
66-
serviceAccountName: build-pipeline-mlflow
78+
serviceAccountName: build-pipeline-pull-request-pipelines
6779
workspaces:
6880
- name: git-auth
6981
secret:

.tekton/mlflow-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ spec:
5858
computeResources:
5959
requests:
6060
cpu: '1'
61-
memory: 6Gi
61+
memory: 4608Mi
6262
limits:
63-
memory: 6Gi
63+
memory: 4608Mi
6464
taskRunTemplate:
6565
serviceAccountName: build-pipeline-mlflow
6666
workspaces:

Dockerfile.konflux

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/nodejs-20:9.7 AS ui-builder
1+
FROM registry.access.redhat.com/ubi9/nodejs-20:9.7@sha256:74cc7b1d13592b1e425074f434b90e470ab209da85fd1fdb8e6e9e4cabaec51a AS ui-builder
22
WORKDIR /opt/app-root/src
33
USER 0
44
COPY --chown=1001:0 mlflow/server/js/ .
@@ -20,7 +20,7 @@ RUN if [ -f /cachi2/cachi2.env ]; then \
2020
&& NODE_OPTIONS="--max_old_space_size=3072" yarn build \
2121
&& NODE_OPTIONS="--max_old_space_size=3072" MLFLOW_API_BASE_URL=/mlflow yarn build:federated
2222

23-
FROM registry.access.redhat.com/ubi9/python-312:9.7 AS python-builder
23+
FROM registry.access.redhat.com/ubi9/python-312:9.7@sha256:ff373f4b42b662e99954adea770ca87b4ea963186cc752174ccb94aa08fa702d AS python-builder
2424
WORKDIR /src
2525
USER 0
2626
COPY --chown=1001:0 . .
@@ -34,7 +34,7 @@ RUN if [ -f /cachi2/cachi2.env ]; then . /cachi2/cachi2.env; fi && \
3434
python -m build --wheel --outdir /tmp/dist libs/skinny && \
3535
python -m build --wheel --outdir /tmp/dist .
3636

37-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
37+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7@sha256:12db9874bd753eb98b1ab3d840e75de5d6842ac0604fbd68c012adefe97140be
3838
ARG MLFLOW_VERSION=3.3.2
3939
ENV PYTHONDONTWRITEBYTECODE=1 \
4040
PYTHONUNBUFFERED=1 \
@@ -78,3 +78,13 @@ EXPOSE 5000
7878
# Default command. Override in Kubernetes as needed.
7979
USER 1001
8080
CMD ["python3.12", "-m", "mlflow", "server", "--host", "0.0.0.0", "--port", "5000", "--app-name", "kubernetes-auth", "--enable-workspaces", "--workspace-store-uri", "kubernetes://", "--serve-artifacts"]
81+
82+
LABEL com.redhat.component="odh-mlflow-rhel9" \
83+
name="rhoai/odh-mlflow-rhel9" \
84+
description="odh-mlflow" \
85+
summary="odh-mlflow" \
86+
maintainer="['managed-open-data-hub@redhat.com']" \
87+
io.openshift.expose-services="" \
88+
io.k8s.display-name="odh-mlflow" \
89+
io.k8s.description="odh-mlflow" \
90+
com.redhat.license_terms="https://www.redhat.com/licenses/Red_Hat_Standard_EULA_20191108.pdf"

0 commit comments

Comments
 (0)