Skip to content

Commit 2ccd057

Browse files
zazulamzazulam
authored
chore: update py image refs to 3.11 (#12383)
* chore: update py image refs to 3.11 Signed-off-by: zazulam <[email protected]> * chore: address sdk test failures Signed-off-by: zazulam <[email protected]> * chore: regen & update stubs for k8s and backend tests Signed-off-by: zazulam <[email protected]> * chore: add regen proto_test files Signed-off-by: zazulam <[email protected]> --------- Signed-off-by: zazulam <[email protected]>
1 parent 71d1296 commit 2ccd057

File tree

306 files changed

+1945
-1930
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+1945
-1930
lines changed

‎.github/actions/kfp-k8s/action.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,12 @@ runs:
4646
if: ${{ steps.generate-kfp-kubernetes-proto-files.outcome == 'success' }}
4747
run: |
4848
pip install -e ./kubernetes_platform/python[dev] --find-links=sdk/python/dist
49+
50+
# testing reinstalling kfp package from source with no deps
51+
- name: Reinstall kfp from source with no deps
52+
id: reinstall-kfp
53+
shell: bash
54+
if: ${{ steps.install-kfp-kubernetes.outcome == 'success' }}
55+
working-directory: ./sdk/python
56+
run: |
57+
pip install . -I --no-deps

‎backend/metadata_writer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ml-metadata package depends on tensorflow package
2-
FROM python:3.9
2+
FROM python:3.11
33
COPY backend/metadata_writer/requirements.txt /kfp/metadata_writer/
44
RUN python3 -m pip install -r /kfp/metadata_writer/requirements.txt
55

‎backend/metadata_writer/update_requirements.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

33
# This image should be in sync with Dockerfile.
4-
IMAGE="python:3.9"
4+
IMAGE="python:3.11"
55
../../hack/update-requirements.sh $IMAGE <requirements.in >requirements.txt

‎backend/src/apiserver/config/testdata/sample_pipeline.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ deploymentSpec:
3232
'
3333
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
3434
\ *\n\ndef hello_world():\n print('hello')\n\n"
35-
image: python:3.9
35+
image: python:3.11
3636
pipelineInfo:
3737
name: pipeline-hello-world
3838
root:

‎backend/src/apiserver/resource/resource_manager_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3479,15 +3479,15 @@ spec:
34793479
- name: ENABLE_CACHING
34803480
valueFrom:
34813481
fieldRef: {fieldPath: 'metadata.labels[''pipelines.kubeflow.org/enable_caching'']'}
3482-
- {name: KFP_V2_IMAGE, value: 'python:3.9'}
3482+
- {name: KFP_V2_IMAGE, value: 'python:3.11'}
34833483
- {name: KFP_V2_RUNTIME_INFO, value: '{"inputParameters": {"some_int": {"type":
34843484
"INT"}, "uri": {"type": "STRING"}}, "inputArtifacts": {}, "outputParameters":
34853485
{"output_parameter_one": {"type": "INT", "path": "/tmp/outputs/output_parameter_one/data"}},
34863486
"outputArtifacts": {"output_dataset_one": {"schemaTitle": "system.Dataset",
34873487
"instanceSchema": "", "metadataPath": "/tmp/outputs/output_dataset_one/data"}}}'}
34883488
envFrom:
34893489
- configMapRef: {name: metadata-grpc-configmap, optional: true}
3490-
image: python:3.9
3490+
image: python:3.11
34913491
volumeMounts:
34923492
- {mountPath: /kfp-launcher, name: kfp-launcher}
34933493
inputs:
@@ -3581,15 +3581,15 @@ spec:
35813581
- name: ENABLE_CACHING
35823582
valueFrom:
35833583
fieldRef: {fieldPath: 'metadata.labels[''pipelines.kubeflow.org/enable_caching'']'}
3584-
- {name: KFP_V2_IMAGE, value: 'python:3.9'}
3584+
- {name: KFP_V2_IMAGE, value: 'python:3.11'}
35853585
- {name: KFP_V2_RUNTIME_INFO, value: '{"inputParameters": {"num_steps": {"type":
35863586
"INT"}}, "inputArtifacts": {"dataset": {"metadataPath": "/tmp/inputs/dataset/data",
35873587
"schemaTitle": "system.Dataset", "instanceSchema": ""}}, "outputParameters":
35883588
{}, "outputArtifacts": {"model": {"schemaTitle": "system.Model", "instanceSchema":
35893589
"", "metadataPath": "/tmp/outputs/model/data"}}}'}
35903590
envFrom:
35913591
- configMapRef: {name: metadata-grpc-configmap, optional: true}
3592-
image: python:3.9
3592+
image: python:3.11
35933593
volumeMounts:
35943594
- {mountPath: /kfp-launcher, name: kfp-launcher}
35953595
inputs:
@@ -4113,7 +4113,7 @@ deploymentSpec:
41134113
_parsed_args = vars(_parser.parse_args())
41144114
41154115
_outputs = hello_world(**_parsed_args)
4116-
image: python:3.9
4116+
image: python:3.11
41174117
pipelineInfo:
41184118
name: hello-world
41194119
root:
@@ -4146,7 +4146,7 @@ deploymentSpec:
41464146
executors:
41474147
exec-hello-world:
41484148
container:
4149-
image: python:3.9
4149+
image: python:3.11
41504150
pipelineInfo:
41514151
name: pipelines/p1/versions/v1
41524152
root:

‎backend/src/apiserver/server/pipeline_upload_server_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,24 @@ const (
4747
func TestUploadPipeline(t *testing.T) {
4848
// TODO(v2): when we add a field to distinguish between v1 and v2 template, verify it's in the response
4949
tt := []struct {
50-
name string
51-
spec []byte
50+
name string
51+
spec []byte
5252
apiVersion string
5353
}{{
54-
name: "upload argo workflow YAML",
55-
spec: []byte("apiVersion: argoproj.io/v1alpha1\nkind: Workflow"),
54+
name: "upload argo workflow YAML",
55+
spec: []byte("apiVersion: argoproj.io/v1alpha1\nkind: Workflow"),
5656
apiVersion: "v1beta1",
5757
}, {
58-
name: "upload argo workflow YAML",
59-
spec: []byte("apiVersion: argoproj.io/v1alpha1\nkind: Workflow"),
58+
name: "upload argo workflow YAML",
59+
spec: []byte("apiVersion: argoproj.io/v1alpha1\nkind: Workflow"),
6060
apiVersion: "v2beta1",
6161
}, {
62-
name: "upload pipeline v2 job in proto yaml",
63-
spec: []byte(v2SpecHelloWorld),
62+
name: "upload pipeline v2 job in proto yaml",
63+
spec: []byte(v2SpecHelloWorld),
6464
apiVersion: "v1beta1",
6565
}, {
66-
name: "upload pipeline v2 job in proto yaml",
67-
spec: []byte(v2SpecHelloWorld),
66+
name: "upload pipeline v2 job in proto yaml",
67+
spec: []byte(v2SpecHelloWorld),
6868
apiVersion: "v2beta1",
6969
}}
7070
for _, test := range tt {
@@ -732,7 +732,7 @@ deploymentSpec:
732732
_parsed_args = vars(_parser.parse_args())
733733
734734
_outputs = hello_world(**_parsed_args)
735-
image: python:3.9
735+
image: python:3.11
736736
pipelineInfo:
737737
name: hello-world
738738
root:
@@ -789,7 +789,7 @@ deploymentSpec:
789789
_parsed_args = vars(_parser.parse_args())
790790
791791
_outputs = hello_world(**_parsed_args)
792-
image: python:3.9
792+
image: python:3.11
793793
pipelineInfo:
794794
name: hello-world
795795
root:
@@ -830,7 +830,7 @@ deploymentSpec:
830830
executors:
831831
exec-hello-world:
832832
container:
833-
image: python:3.9
833+
image: python:3.11
834834
pipelineInfo:
835835
name: hello-world-
836836
root:
@@ -855,7 +855,7 @@ deploymentSpec:
855855
executors:
856856
exec-hello-world:
857857
container:
858-
image: python:3.9
858+
image: python:3.11
859859
pipelineInfo:
860860
name: hEllo-world
861861
root:
@@ -880,7 +880,7 @@ deploymentSpec:
880880
executors:
881881
exec-hello-world:
882882
container:
883-
image: python:3.9
883+
image: python:3.11
884884
pipelineInfo:
885885
name: more than 128 characters more than 128 characters more than 128 characters more than 128 characters more than 128 characters
886886
root:
@@ -905,7 +905,7 @@ deploymentSpec:
905905
executors:
906906
exec-hello-world:
907907
container:
908-
image: python:3.9
908+
image: python:3.11
909909
pipelineInfo:
910910
name: hello-worl.d
911911
root:

‎backend/src/apiserver/server/test/pipeline_with_volume.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ deploymentSpec:
6666
'
6767
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
6868
\ *\n\ndef comp():\n pass\n\n"
69-
image: python:3.9
69+
image: python:3.11
7070
exec-comp-2:
7171
container:
7272
args:
@@ -92,7 +92,7 @@ deploymentSpec:
9292
'
9393
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
9494
\ *\n\ndef comp():\n pass\n\n"
95-
image: python:3.9
95+
image: python:3.11
9696
exec-comp-3:
9797
container:
9898
args:
@@ -118,7 +118,7 @@ deploymentSpec:
118118
'
119119
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
120120
\ *\n\ndef comp():\n pass\n\n"
121-
image: python:3.9
121+
image: python:3.11
122122
exec-createpvc:
123123
container:
124124
image: argostub/createpvc

‎backend/src/apiserver/server/test/v2-hello-world.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"program_path=$(mktemp)\nprintf \"%s\" \"$0\" > \"$program_path\"\npython3 -u \"$program_path\" \"$@\"\n",
2323
"def hello_world(text):\n print(text)\n return text\n\nimport argparse\n_parser = argparse.ArgumentParser(prog='Hello world', description='')\n_parser.add_argument(\"--text\", dest=\"text\", type=str, required=True, default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\n_outputs = hello_world(**_parsed_args)\n"
2424
],
25-
"image": "python:3.9"
25+
"image": "python:3.11"
2626
}
2727
}
2828
}

‎backend/src/apiserver/server/test/xgboost_sample_pipeline.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ deploymentSpec:
293293
\ try:\n os.makedirs(os.path.dirname(output_file))\n except\
294294
\ OSError:\n pass\n with open(output_file, 'w') as f:\n \
295295
\ f.write(_output_serializers[idx](_outputs[idx]))\n"
296-
image: python:3.9
296+
image: python:3.11
297297
exec-xgboost-predict:
298298
container:
299299
args:
@@ -344,7 +344,7 @@ deploymentSpec:
344344
_parser.add_argument(\"--predictions\", dest=\"predictions_path\", type=_make_parent_dirs_and_return_path,\
345345
\ required=True, default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
346346
\n_outputs = xgboost_predict(**_parsed_args)\n"
347-
image: python:3.9
347+
image: python:3.11
348348
exec-xgboost-predict-2:
349349
container:
350350
args:
@@ -398,7 +398,7 @@ deploymentSpec:
398398
predictions_path\", type=_make_parent_dirs_and_return_path, required=True,\
399399
\ default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
400400
\n_outputs = xgboost_predict(**_parsed_args)\n"
401-
image: python:3.9
401+
image: python:3.11
402402
exec-xgboost-predict-3:
403403
container:
404404
args:
@@ -452,7 +452,7 @@ deploymentSpec:
452452
predictions_path\", type=_make_parent_dirs_and_return_path, required=True,\
453453
\ default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
454454
\n_outputs = xgboost_predict(**_parsed_args)\n"
455-
image: python:3.9
455+
image: python:3.11
456456
exec-xgboost-predict-4:
457457
container:
458458
args:
@@ -503,7 +503,7 @@ deploymentSpec:
503503
_parser.add_argument(\"--predictions\", dest=\"predictions_path\", type=_make_parent_dirs_and_return_path,\
504504
\ required=True, default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
505505
\n_outputs = xgboost_predict(**_parsed_args)\n"
506-
image: python:3.9
506+
image: python:3.11
507507
exec-xgboost-train:
508508
container:
509509
args:
@@ -620,7 +620,7 @@ deploymentSpec:
620620
, dest=\"model_config_path\", type=_make_parent_dirs_and_return_path, required=True,\
621621
\ default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
622622
\n_outputs = xgboost_train(**_parsed_args)\n"
623-
image: python:3.9
623+
image: python:3.11
624624
exec-xgboost-train-2:
625625
container:
626626
args:
@@ -737,7 +737,7 @@ deploymentSpec:
737737
, dest=\"model_config_path\", type=_make_parent_dirs_and_return_path, required=True,\
738738
\ default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
739739
\n_outputs = xgboost_train(**_parsed_args)\n"
740-
image: python:3.9
740+
image: python:3.11
741741
pipelineInfo:
742742
name: xgboost-sample-pipeline
743743
root:

‎backend/src/apiserver/storage/pipeline_store_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,7 @@ executors:
19361936
_parsed_args = vars(_parser.parse_args())
19371937
19381938
_outputs = hello_world(**_parsed_args)
1939-
image: python:3.9
1939+
image: python:3.11
19401940
pipelineInfo:
19411941
name: hello-world
19421942
root:

0 commit comments

Comments
 (0)