Skip to content

Commit 28a9abf

Browse files
authored
chore(operator): Change prepackaged servers tags in tests (#7020)
* Change prepackaged servers tags in tests * Uncomment * Change configmap image tags to latest in tests to signify that those are not relevant * Add rclone-related files to the release script to change the tag
1 parent 6624eeb commit 28a9abf

File tree

8 files changed

+48
-18
lines changed

8 files changed

+48
-18
lines changed

components/rclone-storage-initializer/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ the `seldon-rclone-secret` using one of the configurations bellow and use follow
2727

2828
```yaml
2929
storageInitializer:
30-
image: seldonio/rclone-storage-initializer:1.8.0-dev
30+
image: seldonio/rclone-storage-initializer:1.19.0-dev
3131

3232
predictiveUnit:
3333
defaultEnvSecretRefName: seldon-rclone-secret

helm-charts/seldon-core-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,4 @@ kubeflow: false
201201
# Explainer image
202202
explainer:
203203
image: seldonio/alibiexplainer:1.19.0-dev
204-
image_v2: seldonio/mlserver:1.7.1-alibi-explain
204+
image_v2: seldonio/mlserver:1.6.1-alibi-explain

operator/config/manager/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ data:
9292
}
9393
storageInitializer: |-
9494
{
95-
"image" : "seldonio/rclone-storage-initializer:1.14.1",
95+
"image" : "seldonio/rclone-storage-initializer:1.19.0-dev",
9696
"memoryRequest": "100Mi",
9797
"memoryLimit": "1Gi",
9898
"cpuRequest": "100m",

operator/controllers/mlserver_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ var _ = Describe("MLServer helpers", func() {
109109
})
110110

111111
It("creates container with image", func() {
112-
Expect(cServer.Image).To(Equal("seldonio/mlserver:0.1.0"))
112+
Expect(cServer.Image).To(Equal("seldonio/mlserver:latest"))
113113
})
114114
})
115115

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

132132
Expect(err).To(Not(HaveOccurred()))
133-
Expect(image).To(Equal("seldonio/mlserver:0.1.0"))
133+
Expect(image).To(Equal("seldonio/mlserver:latest"))
134134
})
135135
})
136136

operator/controllers/model_initializer_injector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestStorageInitalizerInjector(t *testing.T) {
3535
_, err = mi.InjectModelInitializer(&d, containerName, "gs://mybucket/mymodel", "", "", "")
3636
g.Expect(err).To(BeNil())
3737
g.Expect(len(d.Spec.Template.Spec.InitContainers)).To(Equal(1))
38-
g.Expect(d.Spec.Template.Spec.InitContainers[0].Image).To(Equal("seldonio/rclone-storage-initializer:1.16.0"))
38+
g.Expect(d.Spec.Template.Spec.InitContainers[0].Image).To(Equal("seldonio/rclone-storage-initializer:latest"))
3939
}
4040

4141
func TestStorageInitalizerInjectorWithRelatedImage(t *testing.T) {

operator/controllers/seldondeployment_explainers_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ var _ = Describe("Create a V2 Seldon Deployment with explainer", func() {
317317
{Name: MLServerModelExtraEnv, Value: explainerExpectedExtraEnvs},
318318
}
319319
Expect(explainerEnvs).Should(Equal(explainerExpectedEnvs))
320-
Expect(depFetched.Spec.Template.Spec.Containers[0].Image).Should(Equal("seldonio/mlserver:0.6.0"))
320+
Expect(depFetched.Spec.Template.Spec.Containers[0].Image).Should(Equal("seldonio/mlserver:latest"))
321321
})
322322

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

426426
//Check svc created
427427
svcKey := types.NamespacedName{

operator/controllers/suite_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,43 +68,43 @@ var configs = map[string]string{
6868
},
6969
"seldon": {
7070
"image": "seldonio/tfserving-proxy",
71-
"defaultImageVersion": "1.3.0-dev"
71+
"defaultImageVersion": "latest"
7272
}
7373
}
7474
},
7575
"SKLEARN_SERVER": {
7676
"protocols" : {
7777
"seldon": {
7878
"image": "seldonio/sklearnserver",
79-
"defaultImageVersion": "1.3.0-dev"
79+
"defaultImageVersion": "latest"
8080
},
8181
"v2": {
8282
"image": "seldonio/mlserver",
83-
"defaultImageVersion": "0.1.0"
83+
"defaultImageVersion": "latest"
8484
}
8585
}
8686
},
8787
"XGBOOST_SERVER": {
8888
"protocols" : {
8989
"seldon": {
9090
"image": "seldonio/xgboostserver",
91-
"defaultImageVersion": "1.3.0-dev"
91+
"defaultImageVersion": "latest"
9292
},
9393
"v2": {
9494
"image": "seldonio/mlserver",
95-
"defaultImageVersion": "0.1.0"
95+
"defaultImageVersion": "latest"
9696
}
9797
}
9898
},
9999
"MLFLOW_SERVER": {
100100
"protocols" : {
101101
"seldon": {
102102
"image": "seldonio/mlflowserver",
103-
"defaultImageVersion": "1.3.0-dev"
103+
"defaultImageVersion": "latest"
104104
},
105105
"v2": {
106106
"image": "seldonio/mlserver",
107-
"defaultImageVersion": "0.1.0"
107+
"defaultImageVersion": "latest"
108108
}
109109
}
110110
},
@@ -119,16 +119,16 @@ var configs = map[string]string{
119119
}`,
120120
"storageInitializer": `
121121
{
122-
"image" : "seldonio/rclone-storage-initializer:1.16.0",
122+
"image" : "seldonio/rclone-storage-initializer:latest",
123123
"memoryRequest": "100Mi",
124124
"memoryLimit": "1Gi",
125125
"cpuRequest": "100m",
126126
"cpuLimit": "1"
127127
}`,
128128
"explainer": `
129129
{
130-
"image" : "seldonio/alibiexplainer:1.2.0",
131-
"image_v2" : "seldonio/mlserver:0.6.0"
130+
"image" : "seldonio/alibiexplainer:latest",
131+
"image_v2" : "seldonio/mlserver:latest"
132132
}`,
133133
}
134134

release.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,26 @@ def update_alibi_detect_image(
280280
print(err)
281281

282282

283+
def update_rclone_image(
284+
fpath, current_seldon_core_version, seldon_core_version, debug=False
285+
):
286+
fpath = os.path.realpath(fpath)
287+
if debug:
288+
print("processing [{}]".format(fpath))
289+
args = [
290+
"sed",
291+
"-i",
292+
f"s|seldonio/rclone-storage-initializer:{current_seldon_core_version}|seldonio/rclone-storage-initializer:{seldon_core_version}|",
293+
fpath,
294+
]
295+
err, out = run_command(args, debug)
296+
297+
if err is None:
298+
print(f"updated rclone-storage-initializer version in {fpath}")
299+
else:
300+
print(f"error updating rclone-storage-initializer version in {fpath}")
301+
print(err)
302+
283303
def update_echo_model_image(
284304
fpath, current_seldon_core_version, seldon_core_version, debug=False
285305
):
@@ -464,6 +484,7 @@ def set_version(
464484
abtest_yaml_file,
465485
mab_yaml_file,
466486
model_uri_updates,
487+
rclone_update_files,
467488
debug=False,
468489
):
469490
update_python_wrapper_fixed_versions(seldon_core_version, debug)
@@ -558,6 +579,9 @@ def set_version(
558579
for fpath in alibi_detect_image_files:
559580
update_alibi_detect_image(fpath, current_seldon_core_version, seldon_core_version)
560581

582+
for fpath in rclone_update_files:
583+
update_rclone_image(fpath, current_seldon_core_version, seldon_core_version)
584+
561585
# update echo image references
562586
for fpath in echo_model_image_files:
563587
update_echo_model_image(fpath, current_seldon_core_version, seldon_core_version)
@@ -631,6 +655,11 @@ def main(argv):
631655
"examples/feedback/feedback-metrics-server/README.md",
632656
]
633657

658+
RCLONE_FILES = [
659+
"components/rclone-storage-initializer/readme.md",
660+
"operator/config/manager/configmap.yaml",
661+
]
662+
634663
ECHO_MODEL_FILES = [
635664
"examples/models/metrics/metrics.ipynb",
636665
]
@@ -650,6 +679,7 @@ def main(argv):
650679
AB_VALUES_YAML_FILE,
651680
MAB_VALUES_YAML_FILE,
652681
MODEL_URI_UPDATES,
682+
RCLONE_FILES,
653683
opts.debug,
654684
)
655685

0 commit comments

Comments
 (0)