From c50eb45b18ab7bd9509481d953d41d88d0dc55e3 Mon Sep 17 00:00:00 2001 From: GonzaloSaez <11050889+GonzaloSaez@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:55:37 +0100 Subject: [PATCH] Fix E2E Intel MPI integ tests (#676) Signed-off-by: GonzaloSaez <11050889+GonzaloSaez@users.noreply.github.com> --- build/base/intel-builder.Dockerfile | 2 +- build/base/intel.Dockerfile | 2 +- pkg/apis/kubeflow/v2beta1/zz_generated.deepcopy.go | 2 +- pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go | 2 +- pkg/client/applyconfiguration/internal/internal.go | 2 +- pkg/client/applyconfiguration/kubeflow/v2beta1/jobcondition.go | 2 +- pkg/client/applyconfiguration/kubeflow/v2beta1/jobstatus.go | 2 +- pkg/client/applyconfiguration/kubeflow/v2beta1/mpijob.go | 2 +- pkg/client/applyconfiguration/kubeflow/v2beta1/mpijobspec.go | 2 +- pkg/client/applyconfiguration/kubeflow/v2beta1/replicaspec.go | 2 +- pkg/client/applyconfiguration/kubeflow/v2beta1/replicastatus.go | 2 +- pkg/client/applyconfiguration/kubeflow/v2beta1/runpolicy.go | 2 +- .../applyconfiguration/kubeflow/v2beta1/schedulingpolicy.go | 2 +- pkg/client/applyconfiguration/utils.go | 2 +- pkg/client/clientset/versioned/clientset.go | 2 +- pkg/client/clientset/versioned/fake/clientset_generated.go | 2 +- pkg/client/clientset/versioned/fake/doc.go | 2 +- pkg/client/clientset/versioned/fake/register.go | 2 +- pkg/client/clientset/versioned/scheme/doc.go | 2 +- pkg/client/clientset/versioned/scheme/register.go | 2 +- pkg/client/clientset/versioned/typed/kubeflow/v2beta1/doc.go | 2 +- .../clientset/versioned/typed/kubeflow/v2beta1/fake/doc.go | 2 +- .../typed/kubeflow/v2beta1/fake/fake_kubeflow_client.go | 2 +- .../versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go | 2 +- .../versioned/typed/kubeflow/v2beta1/generated_expansion.go | 2 +- .../versioned/typed/kubeflow/v2beta1/kubeflow_client.go | 2 +- pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go | 2 +- pkg/client/informers/externalversions/factory.go | 2 +- pkg/client/informers/externalversions/generic.go | 2 +- .../externalversions/internalinterfaces/factory_interfaces.go | 2 +- pkg/client/informers/externalversions/kubeflow/interface.go | 2 +- .../informers/externalversions/kubeflow/v2beta1/interface.go | 2 +- .../informers/externalversions/kubeflow/v2beta1/mpijob.go | 2 +- pkg/client/listers/kubeflow/v2beta1/expansion_generated.go | 2 +- pkg/client/listers/kubeflow/v2beta1/mpijob.go | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/build/base/intel-builder.Dockerfile b/build/base/intel-builder.Dockerfile index f9072ad..83f0da5 100644 --- a/build/base/intel-builder.Dockerfile +++ b/build/base/intel-builder.Dockerfile @@ -18,7 +18,7 @@ RUN apt update \ && apt install -y --no-install-recommends \ libstdc++-12-dev binutils procps clang \ intel-oneapi-compiler-dpcpp-cpp \ - intel-oneapi-mpi-devel \ + intel-oneapi-mpi-devel-2021.13 \ && rm -rf /var/lib/apt/lists/* ENV I_MPI_CC=clang I_MPI_CXX=clang++ diff --git a/build/base/intel.Dockerfile b/build/base/intel.Dockerfile index e87a0e9..a3d8b9d 100644 --- a/build/base/intel.Dockerfile +++ b/build/base/intel.Dockerfile @@ -19,7 +19,7 @@ RUN apt update \ && apt update \ && apt install -y --no-install-recommends \ dnsutils \ - intel-oneapi-mpi \ + intel-oneapi-mpi-2021.13 \ && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /entrypoint.sh diff --git a/pkg/apis/kubeflow/v2beta1/zz_generated.deepcopy.go b/pkg/apis/kubeflow/v2beta1/zz_generated.deepcopy.go index e85549f..f4bed7c 100644 --- a/pkg/apis/kubeflow/v2beta1/zz_generated.deepcopy.go +++ b/pkg/apis/kubeflow/v2beta1/zz_generated.deepcopy.go @@ -1,7 +1,7 @@ //go:build !ignore_autogenerated // +build !ignore_autogenerated -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go b/pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go index 1e377e1..1c7f666 100644 --- a/pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go +++ b/pkg/apis/kubeflow/v2beta1/zz_generated.defaults.go @@ -1,7 +1,7 @@ //go:build !ignore_autogenerated // +build !ignore_autogenerated -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/internal/internal.go b/pkg/client/applyconfiguration/internal/internal.go index d4bae37..392d06d 100644 --- a/pkg/client/applyconfiguration/internal/internal.go +++ b/pkg/client/applyconfiguration/internal/internal.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/kubeflow/v2beta1/jobcondition.go b/pkg/client/applyconfiguration/kubeflow/v2beta1/jobcondition.go index d44bd9a..3729f08 100644 --- a/pkg/client/applyconfiguration/kubeflow/v2beta1/jobcondition.go +++ b/pkg/client/applyconfiguration/kubeflow/v2beta1/jobcondition.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/kubeflow/v2beta1/jobstatus.go b/pkg/client/applyconfiguration/kubeflow/v2beta1/jobstatus.go index 005ae22..6e3123e 100644 --- a/pkg/client/applyconfiguration/kubeflow/v2beta1/jobstatus.go +++ b/pkg/client/applyconfiguration/kubeflow/v2beta1/jobstatus.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/kubeflow/v2beta1/mpijob.go b/pkg/client/applyconfiguration/kubeflow/v2beta1/mpijob.go index 9785378..6948de1 100644 --- a/pkg/client/applyconfiguration/kubeflow/v2beta1/mpijob.go +++ b/pkg/client/applyconfiguration/kubeflow/v2beta1/mpijob.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/kubeflow/v2beta1/mpijobspec.go b/pkg/client/applyconfiguration/kubeflow/v2beta1/mpijobspec.go index 65b3f3d..6c4d8f9 100644 --- a/pkg/client/applyconfiguration/kubeflow/v2beta1/mpijobspec.go +++ b/pkg/client/applyconfiguration/kubeflow/v2beta1/mpijobspec.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/kubeflow/v2beta1/replicaspec.go b/pkg/client/applyconfiguration/kubeflow/v2beta1/replicaspec.go index c14df1c..073e6f9 100644 --- a/pkg/client/applyconfiguration/kubeflow/v2beta1/replicaspec.go +++ b/pkg/client/applyconfiguration/kubeflow/v2beta1/replicaspec.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/kubeflow/v2beta1/replicastatus.go b/pkg/client/applyconfiguration/kubeflow/v2beta1/replicastatus.go index 36d1609..722178d 100644 --- a/pkg/client/applyconfiguration/kubeflow/v2beta1/replicastatus.go +++ b/pkg/client/applyconfiguration/kubeflow/v2beta1/replicastatus.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/kubeflow/v2beta1/runpolicy.go b/pkg/client/applyconfiguration/kubeflow/v2beta1/runpolicy.go index c87a840..7d216e0 100644 --- a/pkg/client/applyconfiguration/kubeflow/v2beta1/runpolicy.go +++ b/pkg/client/applyconfiguration/kubeflow/v2beta1/runpolicy.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/kubeflow/v2beta1/schedulingpolicy.go b/pkg/client/applyconfiguration/kubeflow/v2beta1/schedulingpolicy.go index a08f967..d7c1add 100644 --- a/pkg/client/applyconfiguration/kubeflow/v2beta1/schedulingpolicy.go +++ b/pkg/client/applyconfiguration/kubeflow/v2beta1/schedulingpolicy.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/applyconfiguration/utils.go b/pkg/client/applyconfiguration/utils.go index a4a8b40..210aa6e 100644 --- a/pkg/client/applyconfiguration/utils.go +++ b/pkg/client/applyconfiguration/utils.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index ddcb299..189d847 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index a01effe..05637bb 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/fake/doc.go b/pkg/client/clientset/versioned/fake/doc.go index 90b7845..3c95e65 100644 --- a/pkg/client/clientset/versioned/fake/doc.go +++ b/pkg/client/clientset/versioned/fake/doc.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index ecb01d8..11af053 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/scheme/doc.go b/pkg/client/clientset/versioned/scheme/doc.go index a9f49ab..3c7f71f 100644 --- a/pkg/client/clientset/versioned/scheme/doc.go +++ b/pkg/client/clientset/versioned/scheme/doc.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 0c28704..74e273e 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/doc.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/doc.go index 9be95f1..1b04572 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/doc.go +++ b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/doc.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/doc.go index 5f1ad32..9820517 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/doc.go +++ b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/doc.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_kubeflow_client.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_kubeflow_client.go index 7b07f33..4637a5d 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_kubeflow_client.go +++ b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_kubeflow_client.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go index 640f29e..b324967 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go +++ b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/fake/fake_mpijob.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/generated_expansion.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/generated_expansion.go index 54b586c..cf45625 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/generated_expansion.go +++ b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/generated_expansion.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go index 45007d5..47c71b4 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go +++ b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/kubeflow_client.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go index 9daf195..2d466c2 100644 --- a/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go +++ b/pkg/client/clientset/versioned/typed/kubeflow/v2beta1/mpijob.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index 9c49453..4dd1667 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 31bb1e4..ecacab8 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 3e51338..2626295 100644 --- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/informers/externalversions/kubeflow/interface.go b/pkg/client/informers/externalversions/kubeflow/interface.go index bc3bff2..5835b3e 100644 --- a/pkg/client/informers/externalversions/kubeflow/interface.go +++ b/pkg/client/informers/externalversions/kubeflow/interface.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go b/pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go index 3ca58b9..035be48 100644 --- a/pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go +++ b/pkg/client/informers/externalversions/kubeflow/v2beta1/interface.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go b/pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go index 5237102..daa10be 100644 --- a/pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go +++ b/pkg/client/informers/externalversions/kubeflow/v2beta1/mpijob.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/listers/kubeflow/v2beta1/expansion_generated.go b/pkg/client/listers/kubeflow/v2beta1/expansion_generated.go index f95269f..0891d51 100644 --- a/pkg/client/listers/kubeflow/v2beta1/expansion_generated.go +++ b/pkg/client/listers/kubeflow/v2beta1/expansion_generated.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/pkg/client/listers/kubeflow/v2beta1/mpijob.go b/pkg/client/listers/kubeflow/v2beta1/mpijob.go index 351bf4b..301d6ce 100644 --- a/pkg/client/listers/kubeflow/v2beta1/mpijob.go +++ b/pkg/client/listers/kubeflow/v2beta1/mpijob.go @@ -1,4 +1,4 @@ -// Copyright 2024 The Kubeflow Authors. +// Copyright 2025 The Kubeflow Authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.