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.

Sign up for GitHub

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

Jump to bottom

[pull] main from kserve:main #294

Merged
merged 2 commits into from
May 29, 2024
Merged

[pull] main from kserve:main #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
028f646
chore: Use latest ubi image tag (#506)
spolti May 27, 2024
31ebe73
feat: add S390x support in affinity rule (#503)
modassarrana89 May 28, 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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
###############################################################################
# Stage 2: Copy build assets to create the smallest final runtime image
###############################################################################
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 AS runtime
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS runtime

ARG USER=2000
ARG IMAGE_VERSION
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.develop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
###############################################################################

# TODO: replace the "go_toolset" build stage once ubi8/go-toolset:1.21 is available
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9 as go-toolset
# the go-toolset 1.21 is based on ubi9, we need to update it in the base image as well.
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as go-toolset

# https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
# We need TARGETOS and TARGETARCH (not BUILDOS and BUILDARCH) since the developer
Expand Down
6 changes: 2 additions & 4 deletions controllers/modelmesh/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,17 +341,15 @@ func addDomainSocketMount(rts *kserveapi.ServingRuntimeSpec, c *corev1.Container
func (m *Deployment) addPassThroughPodFieldsToDeployment(deployment *appsv1.Deployment) error {
rts := m.SRSpec
// these fields map directly to pod spec fields
// supported architectures are "amd64" and "arm64", "ppc64le"
// and "s390x" are not supported by tensorflow
// (https://github.com/kserve/modelmesh-runtime-adapter/pull/38#discussion_r1156749259)
// supported architectures are "amd64", "arm64" and "s390x"
deployment.Spec.Template.Spec.NodeSelector = rts.NodeSelector
deployment.Spec.Template.Spec.Tolerations = rts.Tolerations
archNodeSelector := corev1.NodeSelectorTerm{
MatchExpressions: []corev1.NodeSelectorRequirement{
{
Key: "kubernetes.io/arch",
Operator: corev1.NodeSelectorOpIn,
Values: []string{"amd64", "arm64"},
Values: []string{"amd64", "arm64", "s390x"},
},
},
}
Expand Down
8 changes: 8 additions & 0 deletions controllers/testdata/servingruntime_controller.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ spec:
values:
- amd64
- arm64
- s390x
containers:
- command:
- /opt/app/mlserver-adapter
Expand Down Expand Up @@ -292,6 +293,7 @@ spec:
values:
- amd64
- arm64
- s390x
containers:
- command:
- /opt/app/mlserver-adapter
Expand Down Expand Up @@ -542,6 +544,7 @@ spec:
values:
- amd64
- arm64
- s390x
containers:
- env:
- name: REST_PROXY_LISTEN_PORT
Expand Down Expand Up @@ -814,6 +817,7 @@ spec:
values:
- amd64
- arm64
- s390x
containers:
- command:
- /opt/app/mlserver-adapter
Expand Down Expand Up @@ -1061,6 +1065,7 @@ spec:
values:
- amd64
- arm64
- s390x
containers:
- command:
- /opt/app/ovms-adapter
Expand Down Expand Up @@ -1300,6 +1305,7 @@ spec:
values:
- amd64
- arm64
- s390x
containers:
- command:
- /opt/app/torchserve-adapter
Expand Down Expand Up @@ -1542,6 +1548,7 @@ spec:
values:
- amd64
- arm64
- s390x
containers:
- command:
- /opt/app/triton-adapter
Expand Down Expand Up @@ -1799,6 +1806,7 @@ spec:
values:
- amd64
- arm64
- s390x
containers:
- env:
- name: MODEL_DIRECTORY_PATH
Expand Down