Skip to content

Commit

Permalink
we have to move since dockerhub introduces a stricter rate limit. 3.9…
Browse files Browse the repository at this point in the history
… is also EOL soon in October 2025

Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com>
  • Loading branch information
juliusvonkohout committed Feb 24, 2025
1 parent ebaaf75 commit 0dac57d
Show file tree
Hide file tree
Showing 166 changed files with 483 additions and 483 deletions.
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY . .
RUN GO111MODULE=on go build -o /bin/apiserver backend/src/apiserver/*.go

# 2. Compile preloaded pipeline samples
FROM python:3.9 as compiler
FROM public.ecr.aws/docker/library/python:3.12 as compiler
RUN apt-get update -y && apt-get install --no-install-recommends -y -q default-jdk python3-setuptools python3-dev jq
RUN wget https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py
COPY backend/requirements.txt .
Expand Down
2 changes: 1 addition & 1 deletion backend/metadata_writer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ml-metadata package depends on tensorflow package
FROM python:3.9
FROM public.ecr.aws/docker/library/python:3.12
COPY backend/metadata_writer/requirements.txt /kfp/metadata_writer/
RUN python3 -m pip install -r /kfp/metadata_writer/requirements.txt

Expand Down
2 changes: 1 addition & 1 deletion backend/metadata_writer/update_requirements.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

# This image should be in sync with Dockerfile.
IMAGE="python:3.9"
IMAGE="public.ecr.aws/docker/library/python:3.12"
../../hack/update-requirements.sh $IMAGE <requirements.in >requirements.txt
2 changes: 1 addition & 1 deletion backend/src/apiserver/config/testdata/sample_pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ deploymentSpec:
'
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
\ *\n\ndef hello_world():\n print('hello')\n\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: pipeline-hello-world
root:
Expand Down
12 changes: 6 additions & 6 deletions backend/src/apiserver/resource/resource_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3431,15 +3431,15 @@ spec:
- name: ENABLE_CACHING
valueFrom:
fieldRef: {fieldPath: 'metadata.labels[''pipelines.kubeflow.org/enable_caching'']'}
- {name: KFP_V2_IMAGE, value: 'python:3.9'}
- {name: KFP_V2_IMAGE, value: 'public.ecr.aws/docker/library/python:3.12'}
- {name: KFP_V2_RUNTIME_INFO, value: '{"inputParameters": {"some_int": {"type":
"INT"}, "uri": {"type": "STRING"}}, "inputArtifacts": {}, "outputParameters":
{"output_parameter_one": {"type": "INT", "path": "/tmp/outputs/output_parameter_one/data"}},
"outputArtifacts": {"output_dataset_one": {"schemaTitle": "system.Dataset",
"instanceSchema": "", "metadataPath": "/tmp/outputs/output_dataset_one/data"}}}'}
envFrom:
- configMapRef: {name: metadata-grpc-configmap, optional: true}
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
volumeMounts:
- {mountPath: /kfp-launcher, name: kfp-launcher}
inputs:
Expand Down Expand Up @@ -3533,15 +3533,15 @@ spec:
- name: ENABLE_CACHING
valueFrom:
fieldRef: {fieldPath: 'metadata.labels[''pipelines.kubeflow.org/enable_caching'']'}
- {name: KFP_V2_IMAGE, value: 'python:3.9'}
- {name: KFP_V2_IMAGE, value: 'public.ecr.aws/docker/library/python:3.12'}
- {name: KFP_V2_RUNTIME_INFO, value: '{"inputParameters": {"num_steps": {"type":
"INT"}}, "inputArtifacts": {"dataset": {"metadataPath": "/tmp/inputs/dataset/data",
"schemaTitle": "system.Dataset", "instanceSchema": ""}}, "outputParameters":
{}, "outputArtifacts": {"model": {"schemaTitle": "system.Model", "instanceSchema":
"", "metadataPath": "/tmp/outputs/model/data"}}}'}
envFrom:
- configMapRef: {name: metadata-grpc-configmap, optional: true}
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
volumeMounts:
- {mountPath: /kfp-launcher, name: kfp-launcher}
inputs:
Expand Down Expand Up @@ -4065,7 +4065,7 @@ deploymentSpec:
_parsed_args = vars(_parser.parse_args())
_outputs = hello_world(**_parsed_args)
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: hello-world
root:
Expand Down Expand Up @@ -4098,7 +4098,7 @@ deploymentSpec:
executors:
exec-hello-world:
container:
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: pipelines/p1/versions/v1
root:
Expand Down
12 changes: 6 additions & 6 deletions backend/src/apiserver/server/pipeline_upload_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ deploymentSpec:
_parsed_args = vars(_parser.parse_args())
_outputs = hello_world(**_parsed_args)
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: hello-world
root:
Expand Down Expand Up @@ -685,7 +685,7 @@ deploymentSpec:
_parsed_args = vars(_parser.parse_args())
_outputs = hello_world(**_parsed_args)
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: hello-world
root:
Expand Down Expand Up @@ -726,7 +726,7 @@ deploymentSpec:
executors:
exec-hello-world:
container:
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: hello-world-
root:
Expand All @@ -751,7 +751,7 @@ deploymentSpec:
executors:
exec-hello-world:
container:
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: hEllo-world
root:
Expand All @@ -776,7 +776,7 @@ deploymentSpec:
executors:
exec-hello-world:
container:
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: more than 128 characters more than 128 characters more than 128 characters more than 128 characters more than 128 characters
root:
Expand All @@ -801,7 +801,7 @@ deploymentSpec:
executors:
exec-hello-world:
container:
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: hello-worl.d
root:
Expand Down
6 changes: 3 additions & 3 deletions backend/src/apiserver/server/test/pipeline_with_volume.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ deploymentSpec:
'
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
\ *\n\ndef comp():\n pass\n\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-comp-2:
container:
args:
Expand All @@ -92,7 +92,7 @@ deploymentSpec:
'
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
\ *\n\ndef comp():\n pass\n\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-comp-3:
container:
args:
Expand All @@ -118,7 +118,7 @@ deploymentSpec:
'
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
\ *\n\ndef comp():\n pass\n\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-createpvc:
container:
image: argostub/createpvc
Expand Down
2 changes: 1 addition & 1 deletion backend/src/apiserver/server/test/v2-hello-world.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"program_path=$(mktemp)\nprintf \"%s\" \"$0\" > \"$program_path\"\npython3 -u \"$program_path\" \"$@\"\n",
"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"
],
"image": "python:3.9"
"image": "public.ecr.aws/docker/library/python:3.12"
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions backend/src/apiserver/server/test/xgboost_sample_pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ deploymentSpec:
\ try:\n os.makedirs(os.path.dirname(output_file))\n except\
\ OSError:\n pass\n with open(output_file, 'w') as f:\n \
\ f.write(_output_serializers[idx](_outputs[idx]))\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-xgboost-predict:
container:
args:
Expand Down Expand Up @@ -344,7 +344,7 @@ deploymentSpec:
_parser.add_argument(\"--predictions\", dest=\"predictions_path\", type=_make_parent_dirs_and_return_path,\
\ required=True, default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
\n_outputs = xgboost_predict(**_parsed_args)\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-xgboost-predict-2:
container:
args:
Expand Down Expand Up @@ -398,7 +398,7 @@ deploymentSpec:
predictions_path\", type=_make_parent_dirs_and_return_path, required=True,\
\ default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
\n_outputs = xgboost_predict(**_parsed_args)\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-xgboost-predict-3:
container:
args:
Expand Down Expand Up @@ -452,7 +452,7 @@ deploymentSpec:
predictions_path\", type=_make_parent_dirs_and_return_path, required=True,\
\ default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
\n_outputs = xgboost_predict(**_parsed_args)\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-xgboost-predict-4:
container:
args:
Expand Down Expand Up @@ -503,7 +503,7 @@ deploymentSpec:
_parser.add_argument(\"--predictions\", dest=\"predictions_path\", type=_make_parent_dirs_and_return_path,\
\ required=True, default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
\n_outputs = xgboost_predict(**_parsed_args)\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-xgboost-train:
container:
args:
Expand Down Expand Up @@ -620,7 +620,7 @@ deploymentSpec:
, dest=\"model_config_path\", type=_make_parent_dirs_and_return_path, required=True,\
\ default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
\n_outputs = xgboost_train(**_parsed_args)\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-xgboost-train-2:
container:
args:
Expand Down Expand Up @@ -737,7 +737,7 @@ deploymentSpec:
, dest=\"model_config_path\", type=_make_parent_dirs_and_return_path, required=True,\
\ default=argparse.SUPPRESS)\n_parsed_args = vars(_parser.parse_args())\n\
\n_outputs = xgboost_train(**_parsed_args)\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: xgboost-sample-pipeline
root:
Expand Down
2 changes: 1 addition & 1 deletion backend/src/apiserver/storage/pipeline_store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,7 @@ executors:
_parsed_args = vars(_parser.parse_args())
_outputs = hello_world(**_parsed_args)
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: hello-world
root:
Expand Down
2 changes: 1 addition & 1 deletion backend/src/apiserver/template/testdata/hello_world.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ deploymentSpec:
_parsed_args = vars(_parser.parse_args())
_outputs = hello_world(**_parsed_args)
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: namespace/n1/pipeline/hello-world
root:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ deploymentSpec:
_parsed_args = vars(_parser.parse_args())
_outputs = hello_world(**_parsed_args)
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
pipelineInfo:
name: hello-world
root:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ deploymentSpec:
'
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
\ *\n\ndef comp():\n pass\n\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-comp-2:
container:
args:
Expand All @@ -94,7 +94,7 @@ deploymentSpec:
'
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
\ *\n\ndef comp():\n pass\n\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-comp-3:
container:
args:
Expand All @@ -120,7 +120,7 @@ deploymentSpec:
'
- "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
\ *\n\ndef comp():\n pass\n\n"
image: python:3.9
image: public.ecr.aws/docker/library/python:3.12
exec-createpvc:
container:
image: argostub/createpvc
Expand Down
14 changes: 7 additions & 7 deletions backend/src/cache/server/mutation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var (
Command: []string{"python"},
Env: []corev1.EnvVar{{
Name: ArgoWorkflowTemplateEnvKey,
Value: `{"name": "Does not matter","container":{"command":["echo", "Hello"],"image":"python:3.9"}}`,
Value: `{"name": "Does not matter","container":{"command":["echo", "Hello"],"image":"public.ecr.aws/docker/library/python:3.12"}}`,
}},
},
},
Expand Down Expand Up @@ -171,7 +171,7 @@ func TestMutatePodIfCachedWithCacheEntryExist(t *testing.T) {
executionCache := &model.ExecutionCache{
ExecutionCacheKey: "1933d178a14bc415466cfd1b3ca2100af975e8c59e1ff9d502fcf18eb5cbd7f7",
ExecutionOutput: "testOutput",
ExecutionTemplate: `{"container":{"command":["echo", "Hello"],"image":"python:3.9"}}`,
ExecutionTemplate: `{"container":{"command":["echo", "Hello"],"image":"public.ecr.aws/docker/library/python:3.12"}}`,
MaxCacheStaleness: -1,
}
fakeClientManager.CacheStore().CreateExecutionCache(executionCache)
Expand All @@ -190,7 +190,7 @@ func TestDefaultImage(t *testing.T) {
executionCache := &model.ExecutionCache{
ExecutionCacheKey: "1933d178a14bc415466cfd1b3ca2100af975e8c59e1ff9d502fcf18eb5cbd7f7",
ExecutionOutput: "testOutput",
ExecutionTemplate: `{"container":{"command":["echo", "Hello"],"image":"python:3.9"}}`,
ExecutionTemplate: `{"container":{"command":["echo", "Hello"],"image":"public.ecr.aws/docker/library/python:3.12"}}`,
MaxCacheStaleness: -1,
}
fakeClientManager.CacheStore().CreateExecutionCache(executionCache)
Expand All @@ -209,7 +209,7 @@ func TestSetImage(t *testing.T) {
executionCache := &model.ExecutionCache{
ExecutionCacheKey: "f5fe913be7a4516ebfe1b5de29bcb35edd12ecc776b2f33f10ca19709ea3b2f0",
ExecutionOutput: "testOutput",
ExecutionTemplate: `{"container":{"command":["echo", "Hello"],"image":"python:3.9"}}`,
ExecutionTemplate: `{"container":{"command":["echo", "Hello"],"image":"public.ecr.aws/docker/library/python:3.12"}}`,
MaxCacheStaleness: -1,
}
fakeClientManager.CacheStore().CreateExecutionCache(executionCache)
Expand All @@ -226,7 +226,7 @@ func TestCacheNodeRestriction(t *testing.T) {
executionCache := &model.ExecutionCache{
ExecutionCacheKey: "f5fe913be7a4516ebfe1b5de29bcb35edd12ecc776b2f33f10ca19709ea3b2f0",
ExecutionOutput: "testOutput",
ExecutionTemplate: `{"container":{"command":["echo", "Hello"],"image":"python:3.9"},"nodeSelector":{"disktype":"ssd"}}`,
ExecutionTemplate: `{"container":{"command":["echo", "Hello"],"image":"public.ecr.aws/docker/library/python:3.12"},"nodeSelector":{"disktype":"ssd"}}`,
MaxCacheStaleness: -1,
}
fakeClientManager.CacheStore().CreateExecutionCache(executionCache)
Expand All @@ -241,7 +241,7 @@ func TestMutatePodIfCachedWithTeamplateCleanup(t *testing.T) {
executionCache := &model.ExecutionCache{
ExecutionCacheKey: "c81988503d55a5817d79bd972017d95c37f72b024e522b4d79787d9f599c0725",
ExecutionOutput: "testOutput",
ExecutionTemplate: `Cache key was calculated from this: {"container":{"command":["echo", "Hello"],"image":"python:3.9"},"outputs":"anything"}`,
ExecutionTemplate: `Cache key was calculated from this: {"container":{"command":["echo", "Hello"],"image":"public.ecr.aws/docker/library/python:3.12"},"outputs":"anything"}`,
MaxCacheStaleness: -1,
}
fakeClientManager.CacheStore().CreateExecutionCache(executionCache)
Expand All @@ -253,7 +253,7 @@ func TestMutatePodIfCachedWithTeamplateCleanup(t *testing.T) {
"name": "Does not matter",
"metadata": "anything",
"container": {
"image": "python:3.9",
"image": "public.ecr.aws/docker/library/python:3.12",
"command": ["echo", "Hello"]
},
"outputs": "anything",
Expand Down
Loading

0 comments on commit 0dac57d

Please sign in to comment.