Skip to content

Commit 432c572

Browse files
authored
Merge pull request #7049 from SeldonIO/release-1.19.0-rc.1
chore(): Update licenses and update default image versions in helm values
2 parents e936d87 + 06793f7 commit 432c572

File tree

14 files changed

+319
-13
lines changed

14 files changed

+319
-13
lines changed

executor/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ licenses: licenses/dep.txt
140140
-o licenses/repo.txt \
141141
--manual-dep-repo-mapping ../licenses/dep_repo.manual.csv \
142142
licenses/dep.txt
143+
sed -i '/^None$$/d; s|^https://github.com/golang/go$$|golang/go|' licenses/repo.txt
143144
get-github-license-info -o licenses/license_info.csv licenses/repo.txt \
144145
--branch-refs ../licenses/branch_refs.manual.csv
145146
python -m 'patch_additional_license_info' \

executor/licenses/license.txt

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,37 @@ In consideration of the right to use this License’s text and the “Business S
5353

5454
4. Not to modify this License in any other way.
5555

56+
--------------------------------------------------------------------------------
57+
dmitri.shuralyov.com/gpu/mtl BSD-3-Clause https://dmitri.shuralyov.com/gpu/mtl$file/LICENSE
58+
--------------------------------------------------------------------------------
59+
Copyright (c) 2018 The Go Authors. All rights reserved.
60+
61+
Redistribution and use in source and binary forms, with or without
62+
modification, are permitted provided that the following conditions are
63+
met:
64+
65+
* Redistributions of source code must retain the above copyright
66+
notice, this list of conditions and the following disclaimer.
67+
* Redistributions in binary form must reproduce the above
68+
copyright notice, this list of conditions and the following disclaimer
69+
in the documentation and/or other materials provided with the
70+
distribution.
71+
* Neither the name of Google Inc. nor the names of its
72+
contributors may be used to endorse or promote products derived from
73+
this software without specific prior written permission.
74+
75+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
76+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
77+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
78+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
79+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
80+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
81+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
82+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
83+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
84+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
85+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
86+
5687
--------------------------------------------------------------------------------
5788
Azure/azure-amqp-common-go MIT License https://github.com/Azure/azure-amqp-common-go/blob/master/LICENSE
5889
--------------------------------------------------------------------------------
@@ -27373,6 +27404,37 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2737327404
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2737427405
SOFTWARE.
2737527406

27407+
--------------------------------------------------------------------------------
27408+
golang/go BSD 3-Clause "New" or "Revised" License https://github.com/golang/go/blob/master/LICENSE
27409+
--------------------------------------------------------------------------------
27410+
Copyright 2009 The Go Authors.
27411+
27412+
Redistribution and use in source and binary forms, with or without
27413+
modification, are permitted provided that the following conditions are
27414+
met:
27415+
27416+
* Redistributions of source code must retain the above copyright
27417+
notice, this list of conditions and the following disclaimer.
27418+
* Redistributions in binary form must reproduce the above
27419+
copyright notice, this list of conditions and the following disclaimer
27420+
in the documentation and/or other materials provided with the
27421+
distribution.
27422+
* Neither the name of Google LLC nor the names of its
27423+
contributors may be used to endorse or promote products derived from
27424+
this software without specific prior written permission.
27425+
27426+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
27427+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
27428+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
27429+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
27430+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27431+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
27432+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27433+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27434+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27435+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27436+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27437+
2737627438
--------------------------------------------------------------------------------
2737727439
go-check/check BSD 2-Clause "Simplified" License https://github.com/go-check/check/blob/v1/LICENSE
2737827440
--------------------------------------------------------------------------------

executor/licenses/license_info.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
seldonio/seldon-core,https://github.com/SeldonIO/seldon-core/blob/master/LICENSE,Business Source License 1.1,https://raw.githubusercontent.com/SeldonIO/seldon-core/master/LICENSE
2+
dmitri.shuralyov.com/gpu/mtl,https://dmitri.shuralyov.com/gpu/mtl$file/LICENSE,BSD-3-Clause,https://dmitri.shuralyov.com/gpu/mtl$file/LICENSE
23
Azure/azure-amqp-common-go,https://github.com/Azure/azure-amqp-common-go/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/Azure/azure-amqp-common-go/master/LICENSE
34
Azure/azure-event-hubs-go,https://github.com/Azure/azure-event-hubs-go/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/Azure/azure-event-hubs-go/master/LICENSE
45
Azure/azure-kusto-go,https://github.com/Azure/azure-kusto-go/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/Azure/azure-kusto-go/master/LICENSE
@@ -259,6 +260,7 @@ xiang90/probing,https://github.com/xiang90/probing/blob/master/LICENSE,MIT Licen
259260
xlab/treeprint,https://github.com/xlab/treeprint/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/xlab/treeprint/master/LICENSE
260261
youmark/pkcs8,https://github.com/youmark/pkcs8/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/youmark/pkcs8/master/LICENSE
261262
yuin/goldmark,https://github.com/yuin/goldmark/blob/master/LICENSE,MIT License,https://raw.githubusercontent.com/yuin/goldmark/master/LICENSE
263+
golang/go,https://github.com/golang/go/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/golang/go/master/LICENSE
262264
go-check/check,https://github.com/go-check/check/blob/v1/LICENSE,BSD 2-Clause "Simplified" License,https://raw.githubusercontent.com/go-check/check/v1/LICENSE
263265
go-inf/inf,https://github.com/go-inf/inf/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License,https://raw.githubusercontent.com/go-inf/inf/master/LICENSE
264266
natefinch/lumberjack,https://github.com/natefinch/lumberjack/blob/v2.0/LICENSE,MIT License,https://raw.githubusercontent.com/natefinch/lumberjack/v2.0/LICENSE

executor/licenses/repo.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
seldonio/seldon-core
2-
None
32
https://gotools.org/dmitri.shuralyov.com/gpu/mtl
43
Azure/azure-amqp-common-go
54
Azure/azure-event-hubs-go
@@ -261,7 +260,7 @@ xiang90/probing
261260
xlab/treeprint
262261
youmark/pkcs8
263262
yuin/goldmark
264-
https://github.com/golang/go
263+
golang/go
265264
go-check/check
266265
go-inf/inf
267266
natefinch/lumberjack

helm-charts/seldon-core-analytics/Chart.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ sources:
2828
- https://github.com/SeldonIO/seldon-core
2929
- https://github.com/SeldonIO/seldon-core/tree/master/helm-charts/seldon-core-analytics
3030
version: 1.19.0-dev
31+
deprecated: true

helm-charts/seldon-core-operator/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ helm install seldon-core-operator seldonio/seldon-core-operator --namespace seld
6161
| executor.serviceAccount.name | string | `"default"` | |
6262
| executor.user | int | `8888` | |
6363
| explainer.image | string | `"seldonio/alibiexplainer:1.19.0-dev"` | |
64-
| explainer.image_v2 | string | `"seldonio/mlserver:1.3.5-alibi-explain"` | |
64+
| explainer.image_v2 | string | `"seldonio/mlserver:1.6.1-alibi-explain"` | |
6565
| hostNetwork | bool | `false` | |
6666
| image.pullPolicy | string | `"IfNotPresent"` | |
6767
| image.registry | string | `"docker.io"` | |
@@ -94,17 +94,17 @@ helm install seldon-core-operator seldonio/seldon-core-operator --namespace seld
9494
| predictiveUnit.grpcPort | int | `9500` | |
9595
| predictiveUnit.httpPort | int | `9000` | |
9696
| predictiveUnit.metricsPortName | string | `"metrics"` | |
97-
| predictor_servers.HUGGINGFACE_SERVER.protocols.v2.defaultImageVersion | string | `"1.3.5-huggingface"` | |
97+
| predictor_servers.HUGGINGFACE_SERVER.protocols.v2.defaultImageVersion | string | `"1.7.1-huggingface"` | |
9898
| predictor_servers.HUGGINGFACE_SERVER.protocols.v2.image | string | `"seldonio/mlserver"` | |
9999
| predictor_servers.MLFLOW_SERVER.protocols.seldon.defaultImageVersion | string | `"1.19.0-dev"` | |
100100
| predictor_servers.MLFLOW_SERVER.protocols.seldon.image | string | `"seldonio/mlflowserver"` | |
101-
| predictor_servers.MLFLOW_SERVER.protocols.v2.defaultImageVersion | string | `"1.3.5-mlflow"` | |
101+
| predictor_servers.MLFLOW_SERVER.protocols.v2.defaultImageVersion | string | `"1.7.1-mlflow"` | |
102102
| predictor_servers.MLFLOW_SERVER.protocols.v2.image | string | `"seldonio/mlserver"` | |
103103
| predictor_servers.SKLEARN_SERVER.protocols.seldon.defaultImageVersion | string | `"1.19.0-dev"` | |
104104
| predictor_servers.SKLEARN_SERVER.protocols.seldon.image | string | `"seldonio/sklearnserver"` | |
105-
| predictor_servers.SKLEARN_SERVER.protocols.v2.defaultImageVersion | string | `"1.3.5-sklearn"` | |
105+
| predictor_servers.SKLEARN_SERVER.protocols.v2.defaultImageVersion | string | `"1.7.1-sklearn"` | |
106106
| predictor_servers.SKLEARN_SERVER.protocols.v2.image | string | `"seldonio/mlserver"` | |
107-
| predictor_servers.TEMPO_SERVER.protocols.v2.defaultImageVersion | string | `"1.3.5-slim"` | |
107+
| predictor_servers.TEMPO_SERVER.protocols.v2.defaultImageVersion | string | `"1.7.1-slim"` | |
108108
| predictor_servers.TEMPO_SERVER.protocols.v2.image | string | `"seldonio/mlserver"` | |
109109
| predictor_servers.TENSORFLOW_SERVER.protocols.seldon.defaultImageVersion | string | `"1.19.0-dev"` | |
110110
| predictor_servers.TENSORFLOW_SERVER.protocols.seldon.image | string | `"seldonio/tfserving-proxy"` | |
@@ -114,7 +114,7 @@ helm install seldon-core-operator seldonio/seldon-core-operator --namespace seld
114114
| predictor_servers.TRITON_SERVER.protocols.v2.image | string | `"nvcr.io/nvidia/tritonserver"` | |
115115
| predictor_servers.XGBOOST_SERVER.protocols.seldon.defaultImageVersion | string | `"1.19.0-dev"` | |
116116
| predictor_servers.XGBOOST_SERVER.protocols.seldon.image | string | `"seldonio/xgboostserver"` | |
117-
| predictor_servers.XGBOOST_SERVER.protocols.v2.defaultImageVersion | string | `"1.3.5-xgboost"` | |
117+
| predictor_servers.XGBOOST_SERVER.protocols.v2.defaultImageVersion | string | `"1.7.1-xgboost"` | |
118118
| predictor_servers.XGBOOST_SERVER.protocols.v2.image | string | `"seldonio/mlserver"` | |
119119
| rbac.configmap.create | bool | `true` | |
120120
| rbac.create | bool | `true` | |

helm-charts/seldon-openvino/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ sources:
88
- https://github.com/SeldonIO/seldon-core/tree/master/helm-charts/seldon-openvino
99
keywords:
1010
- kubernetes
11-
- machine-learning
11+
- machine-learning

licenses/3rd-party-summary.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
1 Apache Software License; BSD License
88
15 BSD 2-Clause Simplified License
99
7 BSD-3-Clause
10-
75 BSD 3-Clause New or Revised License
10+
77 BSD 3-Clause New or Revised License
1111
8 BSD License
1212
3 Business Source License 1.1
1313
1 Creative Commons Attribution 4.0 International Public License

licenses/additional_license_info.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
https://github.com/kr/logfmt/blob/master/Readme,MIT License
2+
https://dmitri.shuralyov.com/gpu/mtl$file/LICENSE,BSD 3-Clause
23
https://github.com/googleapis/google-cloud-go/blob/master/LICENSE,Apache License 2.0
34
https://github.com/ghodss/yaml/blob/master/LICENSE,MIT License
45
https://github.com/go-openapi/spec/blob/master/LICENSE,Apache License 2.0
@@ -101,7 +102,7 @@ https://github.com/samuel/go-zookeeper/blob/master/LICENSE,BSD 3-Clause "New" or
101102
https://github.com/tsenart/go-tsz/blob/master/LICENSE,Apache License 2.0
102103
https://github.com/ajstarks/svgo/blob/master/LICENSE,Creative Commons Attribution 4.0 International Public License
103104
https://github.com/golang/freetype/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License
104-
https://api.github.com/repos/square/go-jose/license,Apache License 2.0
105+
https://github.com/square/go-jose/blob/v2.5.1/LICENSE,Apache License 2.0
105106
https://github.com/antlr/antlr4/blob/master/LICENSE.txt,BSD 3-Clause "New" or "Revised" License
106107
https://github.com/munnerz/goautoneg/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License
107108
https://github.com/ulikunitz/unixtime/blob/master/LICENSE,BSD 3-Clause "New" or "Revised" License

operator/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ licenses: licenses/dep.txt
228228
-o licenses/repo.txt \
229229
--manual-dep-repo-mapping ../licenses/dep_repo.manual.csv \
230230
licenses/dep.txt
231+
sed -i '/^None$$/d; s|^https://github.com/golang/go$$|golang/go|' licenses/repo.txt
231232
get-github-license-info -o licenses/license_info.csv licenses/repo.txt \
232233
--branch-refs ../licenses/branch_refs.manual.csv
233234
python -m 'patch_additional_license_info' \

0 commit comments

Comments
 (0)