From 9fe71125e596b577f9e28157686d0d014c504c7b Mon Sep 17 00:00:00 2001
From: Andrey Velichkevich <andrey.velichkevich@gmail.com>
Date: Wed, 15 Jan 2025 23:52:47 +0000
Subject: [PATCH] Create third-party dir for JobSet

Signed-off-by: Andrey Velichkevich <andrey.velichkevich@gmail.com>
---
 .../v2/overlays/manager/kustomization.yaml    | 20 +++----------------
 .../jobset}/jobset_manager_config.yaml        |  0
 .../v2/third-party/jobset/kustomization.yaml  | 19 ++++++++++++++++++
 .../jobset}/patches/jobset_config_patch.yaml  |  0
 .../patches/jobset_remove_namespace.yaml      |  0
 5 files changed, 22 insertions(+), 17 deletions(-)
 rename manifests/v2/{overlays/manager => third-party/jobset}/jobset_manager_config.yaml (100%)
 create mode 100644 manifests/v2/third-party/jobset/kustomization.yaml
 rename manifests/v2/{overlays/manager => third-party/jobset}/patches/jobset_config_patch.yaml (100%)
 rename manifests/v2/{overlays/manager => third-party/jobset}/patches/jobset_remove_namespace.yaml (100%)

diff --git a/manifests/v2/overlays/manager/kustomization.yaml b/manifests/v2/overlays/manager/kustomization.yaml
index bf37ae448e..8e3b9873df 100644
--- a/manifests/v2/overlays/manager/kustomization.yaml
+++ b/manifests/v2/overlays/manager/kustomization.yaml
@@ -10,30 +10,16 @@ resources:
   - ../../base/manager
   - ../../base/rbac
   - ../../base/webhook
-  - https://github.com/kubernetes-sigs/jobset/releases/download/v0.7.2/manifests.yaml
+  - ../../third-party/jobset # Comment this line if JobSet is installed on the Kubernetes cluster.
 
 # Update the Kubeflow Training manager image tag.
 images:
   - name: kubeflow/training-operator-v2
     newTag: latest
 
-# Disable postfix for Secret and ConfigMap
-generatorOptions:
-  disableNameSuffixHash: true
-
 # Secret for the Kubeflow Training webhook.
 secretGenerator:
   - name: training-operator-v2-webhook-cert
     namespace: kubeflow-system
-
-# Config for the JobSet manager.
-# TODO (andreyvelich): Remove this when this is released: https://github.com/kubernetes-sigs/jobset/issues/720
-configMapGenerator:
-  - files:
-      - jobset_manager_config.yaml
-    name: jobset-manager-config
-
-# Add required patches.
-patchesStrategicMerge:
-  - patches/jobset_remove_namespace.yaml # Remove namespace from the JobSet release manifests.
-  - patches/jobset_config_patch.yaml # Add custom manager config to the JobSet.
+    options:
+      disableNameSuffixHash: true
diff --git a/manifests/v2/overlays/manager/jobset_manager_config.yaml b/manifests/v2/third-party/jobset/jobset_manager_config.yaml
similarity index 100%
rename from manifests/v2/overlays/manager/jobset_manager_config.yaml
rename to manifests/v2/third-party/jobset/jobset_manager_config.yaml
diff --git a/manifests/v2/third-party/jobset/kustomization.yaml b/manifests/v2/third-party/jobset/kustomization.yaml
new file mode 100644
index 0000000000..6722d86e97
--- /dev/null
+++ b/manifests/v2/third-party/jobset/kustomization.yaml
@@ -0,0 +1,19 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - https://github.com/kubernetes-sigs/jobset/releases/download/v0.7.2/manifests.yaml
+
+# Config for the JobSet manager.
+# TODO (andreyvelich): Remove this when this is released: https://github.com/kubernetes-sigs/jobset/issues/720
+configMapGenerator:
+  - name: jobset-manager-config
+    files:
+      - jobset_manager_config.yaml
+    options:
+      disableNameSuffixHash: true
+
+# Add required patches.
+patchesStrategicMerge:
+  - patches/jobset_remove_namespace.yaml # Remove namespace from the JobSet release manifests.
+  - patches/jobset_config_patch.yaml # Add custom manager config to the JobSet.
diff --git a/manifests/v2/overlays/manager/patches/jobset_config_patch.yaml b/manifests/v2/third-party/jobset/patches/jobset_config_patch.yaml
similarity index 100%
rename from manifests/v2/overlays/manager/patches/jobset_config_patch.yaml
rename to manifests/v2/third-party/jobset/patches/jobset_config_patch.yaml
diff --git a/manifests/v2/overlays/manager/patches/jobset_remove_namespace.yaml b/manifests/v2/third-party/jobset/patches/jobset_remove_namespace.yaml
similarity index 100%
rename from manifests/v2/overlays/manager/patches/jobset_remove_namespace.yaml
rename to manifests/v2/third-party/jobset/patches/jobset_remove_namespace.yaml