From 8f6acf1b99815de897646213a3123fb802beb483 Mon Sep 17 00:00:00 2001 From: Rafael Vasquez Date: Thu, 13 Apr 2023 16:36:42 -0400 Subject: [PATCH] Updates refs from 0.x to 1.x Signed-off-by: Rafael Vasquez --- .../testdata/servingruntime_controller.golden | 36 +++++++++---------- fvt/scaleToZero/scale_to_zero_test.go | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/controllers/testdata/servingruntime_controller.golden b/controllers/testdata/servingruntime_controller.golden index f30f16c7a..839f8b60f 100644 --- a/controllers/testdata/servingruntime_controller.golden +++ b/controllers/testdata/servingruntime_controller.golden @@ -12,7 +12,7 @@ spec: selector: matchLabels: modelmesh-service: modelmesh-serving - name: modelmesh-serving-mlserver-0.x + name: modelmesh-serving-mlserver-1.x strategy: rollingUpdate: maxSurge: 75% @@ -26,7 +26,7 @@ spec: app.kubernetes.io/managed-by: modelmesh-controller app.kubernetes.io/name: modelmesh-controller modelmesh-service: modelmesh-serving - name: modelmesh-serving-mlserver-0.x + name: modelmesh-serving-mlserver-1.x spec: affinity: nodeAffinity: @@ -104,7 +104,7 @@ spec: value: 127.0.0.1 - name: MLSERVER_GRPC_MAX_MESSAGE_LENGTH value: "-1" - image: mlserver-0:replace + image: mlserver-1:replace imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -168,7 +168,7 @@ spec: - name: MM_PAYLOAD_PROCESSORS value: example:8080/consumer/kserve/v2 example2:8080/consumer/kserve/v2 - name: MM_LABELS - value: mt:lightgbm,mt:lightgbm:3,mt:sklearn,mt:sklearn:0,mt:xgboost,mt:xgboost:1,pv:grpc-v2,rt:mlserver-0.x + value: mt:lightgbm,mt:lightgbm:3,mt:sklearn,mt:sklearn:0,mt:xgboost,mt:xgboost:1,pv:grpc-v2,rt:mlserver-1.x - name: MM_TYPE_CONSTRAINTS_PATH value: /etc/watson/mmesh/config/type_constraints - name: MM_DATAPLANE_CONFIG_PATH @@ -260,7 +260,7 @@ spec: selector: matchLabels: modelmesh-service: modelmesh-serving - name: modelmesh-serving-mlserver-0.x + name: modelmesh-serving-mlserver-1.x strategy: rollingUpdate: maxSurge: 75% @@ -279,7 +279,7 @@ spec: app.kubernetes.io/managed-by: modelmesh-controller app.kubernetes.io/name: modelmesh-controller modelmesh-service: modelmesh-serving - name: modelmesh-serving-mlserver-0.x + name: modelmesh-serving-mlserver-1.x spec: affinity: nodeAffinity: @@ -357,7 +357,7 @@ spec: value: 127.0.0.1 - name: MLSERVER_GRPC_MAX_MESSAGE_LENGTH value: "-1" - image: mlserver-0:replace + image: mlserver-1:replace imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -419,7 +419,7 @@ spec: - name: MM_DEFAULT_VMODEL_OWNER value: ksp - name: MM_LABELS - value: mt:lightgbm,mt:lightgbm:3,mt:sklearn,mt:sklearn:0,mt:xgboost,mt:xgboost:1,pv:grpc-v2,rt:mlserver-0.x + value: mt:lightgbm,mt:lightgbm:3,mt:sklearn,mt:sklearn:0,mt:xgboost,mt:xgboost:1,pv:grpc-v2,rt:mlserver-1.x - name: MM_TYPE_CONSTRAINTS_PATH value: /etc/watson/mmesh/config/type_constraints - name: MM_DATAPLANE_CONFIG_PATH @@ -514,7 +514,7 @@ spec: selector: matchLabels: modelmesh-service: modelmesh-serving - name: modelmesh-serving-mlserver-0.x + name: modelmesh-serving-mlserver-1.x strategy: rollingUpdate: maxSurge: 75% @@ -528,7 +528,7 @@ spec: app.kubernetes.io/managed-by: modelmesh-controller app.kubernetes.io/name: modelmesh-controller modelmesh-service: modelmesh-serving - name: modelmesh-serving-mlserver-0.x + name: modelmesh-serving-mlserver-1.x spec: affinity: nodeAffinity: @@ -580,7 +580,7 @@ spec: value: 127.0.0.1 - name: MLSERVER_GRPC_MAX_MESSAGE_LENGTH value: "-1" - image: mlserver-0:replace + image: mlserver-1:replace imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -693,7 +693,7 @@ spec: - name: MM_DEFAULT_VMODEL_OWNER value: ksp - name: MM_LABELS - value: mt:lightgbm,mt:lightgbm:3,mt:sklearn,mt:sklearn:0,mt:xgboost,mt:xgboost:1,pv:grpc-v2,pv:v2,rt:mlserver-0.x + value: mt:lightgbm,mt:lightgbm:3,mt:sklearn,mt:sklearn:0,mt:xgboost,mt:xgboost:1,pv:grpc-v2,pv:v2,rt:mlserver-1.x - name: MM_TYPE_CONSTRAINTS_PATH value: /etc/watson/mmesh/config/type_constraints - name: MM_DATAPLANE_CONFIG_PATH @@ -773,7 +773,7 @@ spec: secretName: secret status: {} ''' -"Sample Runtime config/runtimes/mlserver-0.x.yaml should be a valid runtime specification" = ''' +"Sample Runtime config/runtimes/mlserver-1.x.yaml should be a valid runtime specification" = ''' apiVersion: apps/v1 kind: Deployment metadata: @@ -785,7 +785,7 @@ spec: selector: matchLabels: modelmesh-service: modelmesh-serving - name: modelmesh-serving-mlserver-0.x + name: modelmesh-serving-mlserver-1.x strategy: rollingUpdate: maxSurge: 75% @@ -799,7 +799,7 @@ spec: app.kubernetes.io/managed-by: modelmesh-controller app.kubernetes.io/name: modelmesh-controller modelmesh-service: modelmesh-serving - name: modelmesh-serving-mlserver-0.x + name: modelmesh-serving-mlserver-1.x spec: affinity: nodeAffinity: @@ -877,7 +877,7 @@ spec: value: 127.0.0.1 - name: MLSERVER_GRPC_MAX_MESSAGE_LENGTH value: "-1" - image: mlserver-0:replace + image: mlserver-1:replace imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -939,7 +939,7 @@ spec: - name: MM_DEFAULT_VMODEL_OWNER value: ksp - name: MM_LABELS - value: mt:lightgbm,mt:lightgbm:3,mt:sklearn,mt:sklearn:0,mt:xgboost,mt:xgboost:1,pv:grpc-v2,rt:mlserver-0.x + value: mt:lightgbm,mt:lightgbm:3,mt:sklearn,mt:sklearn:0,mt:xgboost,mt:xgboost:1,pv:grpc-v2,rt:mlserver-1.x - name: MM_TYPE_CONSTRAINTS_PATH value: /etc/watson/mmesh/config/type_constraints - name: MM_DATAPLANE_CONFIG_PATH @@ -1801,7 +1801,7 @@ spec: containerName: modelserver divisor: "0" resource: requests.memory - image: seldonio/mlserver:0.3.2 + image: seldonio/mlserver:1.2.4 imagePullPolicy: IfNotPresent lifecycle: preStop: diff --git a/fvt/scaleToZero/scale_to_zero_test.go b/fvt/scaleToZero/scale_to_zero_test.go index c2703e856..8944c7f1e 100644 --- a/fvt/scaleToZero/scale_to_zero_test.go +++ b/fvt/scaleToZero/scale_to_zero_test.go @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -29,7 +29,7 @@ var _ = Describe("Scaling of runtime deployments to zero", Ordered, func() { // constants testPredictorObject := NewPredictorForFVT("mlserver-sklearn-predictor.yaml") // runtime expected to serve the test predictor - expectedRuntimeName := "mlserver-0.x" + expectedRuntimeName := "mlserver-1.x" // helper expectation functions // these use the "constants" so are created within the Describe's scope