Merge pull request #294 from kserve/main

[pull] main from kserve:main
opendatahub-io · May 29, 2024 · 589dbac · 589dbac
2 parents 218f476 + 31ebe73
commit 589dbac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/controllers/modelmesh/runtime.go b/controllers/modelmesh/runtime.go
@@ -345,17 +345,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"},
 			},
 		},
 	}

diff --git a/controllers/testdata/servingruntime_controller.golden b/controllers/testdata/servingruntime_controller.golden
@@ -38,6 +38,7 @@ spec:
                 values:
                 - amd64
                 - arm64
+                - s390x
       containers:
       - command:
         - /opt/app/mlserver-adapter
@@ -350,6 +351,7 @@ spec:
                 values:
                 - amd64
                 - arm64
+                - s390x
       containers:
       - command:
         - /opt/app/mlserver-adapter
@@ -658,6 +660,7 @@ spec:
                 values:
                 - amd64
                 - arm64
+                - s390x
       containers:
       - env:
         - name: REST_PROXY_LISTEN_PORT
@@ -988,6 +991,7 @@ spec:
                 values:
                 - amd64
                 - arm64
+                - s390x
       containers:
       - command:
         - /opt/app/mlserver-adapter
@@ -1293,6 +1297,7 @@ spec:
                 values:
                 - amd64
                 - arm64
+                - s390x
       containers:
       - command:
         - /opt/app/ovms-adapter
@@ -1590,6 +1595,7 @@ spec:
                 values:
                 - amd64
                 - arm64
+                - s390x
       containers:
       - command:
         - /opt/app/torchserve-adapter
@@ -1890,6 +1896,7 @@ spec:
                 values:
                 - amd64
                 - arm64
+                - s390x
       containers:
       - command:
         - /opt/app/triton-adapter
@@ -2205,6 +2212,7 @@ spec:
                 values:
                 - amd64
                 - arm64
+                - s390x
       containers:
       - env:
         - name: MODEL_DIRECTORY_PATH