Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 components/rclone-storage-initializer/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ the `seldon-rclone-secret` using one of the configurations bellow and use follow

```yaml
storageInitializer:
image: seldonio/rclone-storage-initializer:1.8.0-dev
image: seldonio/rclone-storage-initializer:1.19.0-dev

predictiveUnit:
defaultEnvSecretRefName: seldon-rclone-secret
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/seldon-core-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,4 +201,4 @@ kubeflow: false
# Explainer image
explainer:
image: seldonio/alibiexplainer:1.19.0-dev
image_v2: seldonio/mlserver:1.7.1-alibi-explain
image_v2: seldonio/mlserver:1.6.1-alibi-explain
2 changes: 1 addition & 1 deletion operator/config/manager/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ data:
}
storageInitializer: |-
{
"image" : "seldonio/rclone-storage-initializer:1.14.1",
"image" : "seldonio/rclone-storage-initializer:1.19.0-dev",
"memoryRequest": "100Mi",
"memoryLimit": "1Gi",
"cpuRequest": "100m",
Expand Down
4 changes: 2 additions & 2 deletions operator/controllers/mlserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ var _ = Describe("MLServer helpers", func() {
})

It("creates container with image", func() {
Expect(cServer.Image).To(Equal("seldonio/mlserver:0.1.0"))
Expect(cServer.Image).To(Equal("seldonio/mlserver:latest"))
})
})

Expand All @@ -130,7 +130,7 @@ var _ = Describe("MLServer helpers", func() {
image, err := getMLServerImage(pu)

Expect(err).To(Not(HaveOccurred()))
Expect(image).To(Equal("seldonio/mlserver:0.1.0"))
Expect(image).To(Equal("seldonio/mlserver:latest"))
})
})

Expand Down
2 changes: 1 addition & 1 deletion operator/controllers/model_initializer_injector_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestStorageInitalizerInjector(t *testing.T) {
_, err = mi.InjectModelInitializer(&d, containerName, "gs://mybucket/mymodel", "", "", "")
g.Expect(err).To(BeNil())
g.Expect(len(d.Spec.Template.Spec.InitContainers)).To(Equal(1))
g.Expect(d.Spec.Template.Spec.InitContainers[0].Image).To(Equal("seldonio/rclone-storage-initializer:1.16.0"))
g.Expect(d.Spec.Template.Spec.InitContainers[0].Image).To(Equal("seldonio/rclone-storage-initializer:latest"))
}

func TestStorageInitalizerInjectorWithRelatedImage(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions operator/controllers/seldondeployment_explainers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ var _ = Describe("Create a V2 Seldon Deployment with explainer", func() {
{Name: MLServerModelExtraEnv, Value: explainerExpectedExtraEnvs},
}
Expect(explainerEnvs).Should(Equal(explainerExpectedEnvs))
Expect(depFetched.Spec.Template.Spec.Containers[0].Image).Should(Equal("seldonio/mlserver:0.6.0"))
Expect(depFetched.Spec.Template.Spec.Containers[0].Image).Should(Equal("seldonio/mlserver:latest"))
})

})
Expand Down Expand Up @@ -421,7 +421,7 @@ var _ = Describe("Create a Seldon Deployment with explainer", func() {
Expect(len(depFetched.Spec.Template.Spec.Containers)).Should(Equal(1))
Expect(*depFetched.Spec.Replicas).To(Equal(replicasExplainer))
Expect(*depFetched.Spec.Template.Spec.SecurityContext.RunAsUser).To(Equal(int64(2)))
Expect(depFetched.Spec.Template.Spec.Containers[0].Image).To(Equal("seldonio/alibiexplainer:1.2.0"))
Expect(depFetched.Spec.Template.Spec.Containers[0].Image).To(Equal("seldonio/alibiexplainer:latest"))

//Check svc created
svcKey := types.NamespacedName{
Expand Down
20 changes: 10 additions & 10 deletions operator/controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,43 +68,43 @@ var configs = map[string]string{
},
"seldon": {
"image": "seldonio/tfserving-proxy",
"defaultImageVersion": "1.3.0-dev"
"defaultImageVersion": "latest"
}
}
},
"SKLEARN_SERVER": {
"protocols" : {
"seldon": {
"image": "seldonio/sklearnserver",
"defaultImageVersion": "1.3.0-dev"
"defaultImageVersion": "latest"
},
"v2": {
"image": "seldonio/mlserver",
"defaultImageVersion": "0.1.0"
"defaultImageVersion": "latest"
}
}
},
"XGBOOST_SERVER": {
"protocols" : {
"seldon": {
"image": "seldonio/xgboostserver",
"defaultImageVersion": "1.3.0-dev"
"defaultImageVersion": "latest"
},
"v2": {
"image": "seldonio/mlserver",
"defaultImageVersion": "0.1.0"
"defaultImageVersion": "latest"
}
}
},
"MLFLOW_SERVER": {
"protocols" : {
"seldon": {
"image": "seldonio/mlflowserver",
"defaultImageVersion": "1.3.0-dev"
"defaultImageVersion": "latest"
},
"v2": {
"image": "seldonio/mlserver",
"defaultImageVersion": "0.1.0"
"defaultImageVersion": "latest"
}
}
},
Expand All @@ -119,16 +119,16 @@ var configs = map[string]string{
}`,
"storageInitializer": `
{
"image" : "seldonio/rclone-storage-initializer:1.16.0",
"image" : "seldonio/rclone-storage-initializer:latest",
"memoryRequest": "100Mi",
"memoryLimit": "1Gi",
"cpuRequest": "100m",
"cpuLimit": "1"
}`,
"explainer": `
{
"image" : "seldonio/alibiexplainer:1.2.0",
"image_v2" : "seldonio/mlserver:0.6.0"
"image" : "seldonio/alibiexplainer:latest",
"image_v2" : "seldonio/mlserver:latest"
}`,
}

Expand Down
30 changes: 30 additions & 0 deletions release.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,26 @@ def update_alibi_detect_image(
print(err)


def update_rclone_image(
fpath, current_seldon_core_version, seldon_core_version, debug=False
):
fpath = os.path.realpath(fpath)
if debug:
print("processing [{}]".format(fpath))
args = [
"sed",
"-i",
f"s|seldonio/rclone-storage-initializer:{current_seldon_core_version}|seldonio/rclone-storage-initializer:{seldon_core_version}|",
fpath,
]
err, out = run_command(args, debug)

if err is None:
print(f"updated rclone-storage-initializer version in {fpath}")
else:
print(f"error updating rclone-storage-initializer version in {fpath}")
print(err)

def update_echo_model_image(
fpath, current_seldon_core_version, seldon_core_version, debug=False
):
Expand Down Expand Up @@ -464,6 +484,7 @@ def set_version(
abtest_yaml_file,
mab_yaml_file,
model_uri_updates,
rclone_update_files,
debug=False,
):
update_python_wrapper_fixed_versions(seldon_core_version, debug)
Expand Down Expand Up @@ -558,6 +579,9 @@ def set_version(
for fpath in alibi_detect_image_files:
update_alibi_detect_image(fpath, current_seldon_core_version, seldon_core_version)

for fpath in rclone_update_files:
update_rclone_image(fpath, current_seldon_core_version, seldon_core_version)

# update echo image references
for fpath in echo_model_image_files:
update_echo_model_image(fpath, current_seldon_core_version, seldon_core_version)
Expand Down Expand Up @@ -631,6 +655,11 @@ def main(argv):
"examples/feedback/feedback-metrics-server/README.md",
]

RCLONE_FILES = [
"components/rclone-storage-initializer/readme.md",
"operator/config/manager/configmap.yaml",
]

ECHO_MODEL_FILES = [
"examples/models/metrics/metrics.ipynb",
]
Expand All @@ -650,6 +679,7 @@ def main(argv):
AB_VALUES_YAML_FILE,
MAB_VALUES_YAML_FILE,
MODEL_URI_UPDATES,
RCLONE_FILES,
opts.debug,
)

Expand Down
Loading