Replace v2alpha with v2

Signed-off-by: Yuki Iwai <[email protected]>
kubeflow · Aug 30, 2024 · 1a86170 · 1a86170
1 parent efa6c8d
commit 1a86170
Show file tree

Hide file tree

Showing 32 changed files with 52 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -38,11 +38,11 @@ help: ## Display this help.
 
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=training-operator webhook paths="./pkg/apis/kubeflow.org/v1/..." \
-		output:crd:artifacts:config=manifests/base/v1/crds \
-		output:rbac:artifacts:config=manifests/base/v1/rbac \
-		output:webhook:artifacts:config=manifests/v1/base/webhook
+		output:crd:artifacts:config=manifests/base/crds \
+		output:rbac:artifacts:config=manifests/base/rbac \
+		output:webhook:artifacts:config=manifests/base/webhook
 	$(CONTROLLER_GEN) "crd:generateEmbeddedObjectMeta=true" paths="./pkg/apis/kubeflow.org/v2alpha1/..." \
-		output:crd:artifacts:config=manifests/base/v2alpha1/crds
+		output:crd:artifacts:config=manifests/v2/base/crds
 
 generate: controller-gen ## Generate apidoc, sdk and code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate/boilerplate.go.txt" paths="./pkg/apis/..."
@@ -97,10 +97,10 @@ docker-push: ## Push docker image with the manager.
 ##@ Deployment
 
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build manifests/base/v1/crds | kubectl apply -f -
+	$(KUSTOMIZE) build manifests/base/crds | kubectl apply -f -
 
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build manifests/base/v1/crds | kubectl delete -f -
+	$(KUSTOMIZE) build manifests/base/crds | kubectl delete -f -
 
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd manifests/overlays/standalone && $(KUSTOMIZE) edit set image kubeflow/training-operator=${IMG}

diff --git a/...ts/base/v1/crds/kubeflow.org_jaxjobs.yaml → ...fests/base/crds/kubeflow.org_jaxjobs.yaml b/...ts/base/v1/crds/kubeflow.org_jaxjobs.yaml → ...fests/base/crds/kubeflow.org_jaxjobs.yaml
diff --git a/...ts/base/v1/crds/kubeflow.org_mpijobs.yaml → ...fests/base/crds/kubeflow.org_mpijobs.yaml b/...ts/base/v1/crds/kubeflow.org_mpijobs.yaml → ...fests/base/crds/kubeflow.org_mpijobs.yaml
diff --git a/...base/v1/crds/kubeflow.org_paddlejobs.yaml → ...ts/base/crds/kubeflow.org_paddlejobs.yaml b/...base/v1/crds/kubeflow.org_paddlejobs.yaml → ...ts/base/crds/kubeflow.org_paddlejobs.yaml
diff --git a/...ase/v1/crds/kubeflow.org_pytorchjobs.yaml → ...s/base/crds/kubeflow.org_pytorchjobs.yaml b/...ase/v1/crds/kubeflow.org_pytorchjobs.yaml → ...s/base/crds/kubeflow.org_pytorchjobs.yaml
diff --git a/...sts/base/v1/crds/kubeflow.org_tfjobs.yaml → manifests/base/crds/kubeflow.org_tfjobs.yaml b/...sts/base/v1/crds/kubeflow.org_tfjobs.yaml → manifests/base/crds/kubeflow.org_tfjobs.yaml
diff --git a/...ase/v1/crds/kubeflow.org_xgboostjobs.yaml → ...s/base/crds/kubeflow.org_xgboostjobs.yaml b/...ase/v1/crds/kubeflow.org_xgboostjobs.yaml → ...s/base/crds/kubeflow.org_xgboostjobs.yaml
diff --git a/manifests/base/v1/crds/kustomization.yaml → manifests/base/crds/kustomization.yaml b/manifests/base/v1/crds/kustomization.yaml → manifests/base/crds/kustomization.yaml
diff --git a/manifests/base/v1/deployment.yaml → manifests/base/deployment.yaml b/manifests/base/v1/deployment.yaml → manifests/base/deployment.yaml
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./crds
+  - ./rbac/cluster-role-binding.yaml
+  - ./rbac/role.yaml
+  - ./rbac/service-account.yaml
+  - ./webhook
+  - service.yaml
+  - deployment.yaml
diff --git a/...ts/base/v1/rbac/cluster-role-binding.yaml → ...fests/base/rbac/cluster-role-binding.yaml b/...ts/base/v1/rbac/cluster-role-binding.yaml → ...fests/base/rbac/cluster-role-binding.yaml
diff --git a/manifests/base/v1/rbac/role.yaml → manifests/base/rbac/role.yaml b/manifests/base/v1/rbac/role.yaml → manifests/base/rbac/role.yaml
diff --git a/manifests/base/v1/rbac/service-account.yaml → manifests/base/rbac/service-account.yaml b/manifests/base/v1/rbac/service-account.yaml → manifests/base/rbac/service-account.yaml
diff --git a/manifests/base/v1/service.yaml → manifests/base/service.yaml b/manifests/base/v1/service.yaml → manifests/base/service.yaml
diff --git a/manifests/base/v1/kustomization.yaml b/manifests/base/v1/kustomization.yaml
diff --git a/manifests/base/v2alpha1/crds/kustomization.yaml b/manifests/base/v2alpha1/crds/kustomization.yaml
diff --git a/manifests/base/v1/webhook/kustomization.yaml → manifests/base/webhook/kustomization.yaml b/manifests/base/v1/webhook/kustomization.yaml → manifests/base/webhook/kustomization.yaml
diff --git a/...ests/base/v1/webhook/kustomizeconfig.yaml → manifests/base/webhook/kustomizeconfig.yaml b/...ests/base/v1/webhook/kustomizeconfig.yaml → manifests/base/webhook/kustomizeconfig.yaml
diff --git a/manifests/base/v1/webhook/manifests.yaml → manifests/base/webhook/manifests.yaml b/manifests/base/v1/webhook/manifests.yaml → manifests/base/webhook/manifests.yaml
diff --git a/manifests/base/v1/webhook/patch.yaml → manifests/base/webhook/patch.yaml b/manifests/base/v1/webhook/patch.yaml → manifests/base/webhook/patch.yaml
diff --git a/manifests/overlays/kubeflow/kustomization.yaml b/manifests/overlays/kubeflow/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-  - ../../base/v1
+  - ../../base
   - kubeflow-training-roles.yaml
 images:
   - name: kubeflow/training-operator

diff --git a/manifests/overlays/standalone/kustomization.yaml b/manifests/overlays/standalone/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-  - ../../base/v1
+  - ../../base
   - namespace.yaml
 images:
   - name: kubeflow/training-operator

diff --git a/...kubeflow.org_clustertrainingruntimes.yaml → ...kubeflow.org_clustertrainingruntimes.yaml b/...kubeflow.org_clustertrainingruntimes.yaml → ...kubeflow.org_clustertrainingruntimes.yaml
diff --git a/...1/crds/kubeflow.org_trainingruntimes.yaml → ...e/crds/kubeflow.org_trainingruntimes.yaml b/...1/crds/kubeflow.org_trainingruntimes.yaml → ...e/crds/kubeflow.org_trainingruntimes.yaml
diff --git a/...v2alpha1/crds/kubeflow.org_trainjobs.yaml → .../v2/base/crds/kubeflow.org_trainjobs.yaml b/...v2alpha1/crds/kubeflow.org_trainjobs.yaml → .../v2/base/crds/kubeflow.org_trainjobs.yaml
diff --git a/pkg/controller.v1/common/job.go b/pkg/controller.v1/common/job.go
@@ -421,7 +421,7 @@ func (jc *JobController) CleanupJob(runPolicy *apiv1.RunPolicy, jobStatus apiv1.
 	currentTime := time.Now()
 	metaObject, _ := job.(metav1.Object)
 	ttl := runPolicy.TTLSecondsAfterFinished
-	if ttl == nil {
+	if ttl == nil || trainutil.IsJobSuspended(runPolicy) {
 		return nil
 	}
 	duration := time.Second * time.Duration(*ttl)

diff --git a/pkg/controller.v1/mpi/suite_test.go b/pkg/controller.v1/mpi/suite_test.go
@@ -60,7 +60,7 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "v1", "crds")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "crds")},
 		ErrorIfCRDPathMissing: true,
 	}
 

diff --git a/pkg/controller.v1/paddlepaddle/paddlepaddle_controller_suite_test.go b/pkg/controller.v1/paddlepaddle/paddlepaddle_controller_suite_test.go
@@ -64,10 +64,10 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "v1", "crds")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "crds")},
 		ErrorIfCRDPathMissing: true,
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
-			Paths: []string{filepath.Join("..", "..", "..", "manifests", "base", "v1", "webhook", "manifests.yaml")},
+			Paths: []string{filepath.Join("..", "..", "..", "manifests", "base", "webhook", "manifests.yaml")},
 		},
 	}
 

diff --git a/pkg/controller.v1/pytorch/pytorchjob_controller_suite_test.go b/pkg/controller.v1/pytorch/pytorchjob_controller_suite_test.go
@@ -65,10 +65,10 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "v1", "crds")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "crds")},
 		ErrorIfCRDPathMissing: true,
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
-			Paths: []string{filepath.Join("..", "..", "..", "manifests", "base", "v1", "webhook", "manifests.yaml")},
+			Paths: []string{filepath.Join("..", "..", "..", "manifests", "base", "webhook", "manifests.yaml")},
 		},
 	}
 

diff --git a/pkg/controller.v1/tensorflow/job_test.go b/pkg/controller.v1/tensorflow/job_test.go
@@ -663,6 +663,30 @@ var _ = Describe("Test for controller.v1/common", func() {
 			wantTFJobIsRemoved: false,
 			wantErr:            false,
 		}),
+		Entry("No error with completionTime is nil if suspended", &cleanUpCases{
+			tfJob: tftestutil.NewTFJobWithCleanupJobDelay(1, 2, 0, nil),
+			runPolicy: &kubeflowv1.RunPolicy{
+				TTLSecondsAfterFinished: nil,
+				Suspend:                 ptr.To(true),
+			},
+			jobStatus: kubeflowv1.JobStatus{
+				CompletionTime: nil,
+			},
+			wantTFJobIsRemoved: false,
+			wantErr:            false,
+		}),
+		Entry("No error with TTL is set and completionTime is nil, if suspended", &cleanUpCases{
+			tfJob: tftestutil.NewTFJobWithCleanupJobDelay(1, 2, 0, ptr.To[int32](10)),
+			runPolicy: &kubeflowv1.RunPolicy{
+				TTLSecondsAfterFinished: ptr.To[int32](10),
+				Suspend:                 ptr.To(true),
+			},
+			jobStatus: kubeflowv1.JobStatus{
+				CompletionTime: nil,
+			},
+			wantTFJobIsRemoved: false,
+			wantErr:            false,
+		}),
 		Entry("Error is occurred since completionTime is nil", &cleanUpCases{
 			tfJob: tftestutil.NewTFJobWithCleanupJobDelay(1, 2, 0, ptr.To[int32](10)),
 			runPolicy: &kubeflowv1.RunPolicy{

diff --git a/pkg/controller.v1/tensorflow/suite_test.go b/pkg/controller.v1/tensorflow/suite_test.go
@@ -67,10 +67,10 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "v1", "crds")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "crds")},
 		ErrorIfCRDPathMissing: true,
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
-			Paths: []string{filepath.Join("..", "..", "..", "manifests", "base", "v1", "webhook", "manifests.yaml")},
+			Paths: []string{filepath.Join("..", "..", "..", "manifests", "base", "webhook", "manifests.yaml")},
 		},
 	}
 

diff --git a/pkg/controller.v1/xgboost/suite_test.go b/pkg/controller.v1/xgboost/suite_test.go
@@ -64,10 +64,10 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "v1", "crds")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "manifests", "base", "crds")},
 		ErrorIfCRDPathMissing: true,
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
-			Paths: []string{filepath.Join("..", "..", "..", "manifests", "base", "v1", "webhook", "manifests.yaml")},
+			Paths: []string{filepath.Join("..", "..", "..", "manifests", "base", "webhook", "manifests.yaml")},
 		},
 	}