From 787cb98a24422f7b192cf960401c0e1a1d07bb96 Mon Sep 17 00:00:00 2001 From: Julius von Kohout <45896133+juliusvonkohout@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:43:47 +0200 Subject: [PATCH] Synchronize kubeflow training operator manifests from v1.8.0-rc.1 (#2769) * Update kubeflow/training-operator manifests from v1.8.0-rc.1 Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> * Update sync-training-operator-manifests.sh Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --------- Signed-off-by: juliusvonkohout <45896133+juliusvonkohout@users.noreply.github.com> --- README.md | 2 +- .../upstream/base/crds/kubeflow.org_mpijobs.yaml | 3 +++ .../upstream/base/crds/kubeflow.org_mxjobs.yaml | 3 +++ .../upstream/base/crds/kubeflow.org_paddlejobs.yaml | 3 +++ .../upstream/base/crds/kubeflow.org_pytorchjobs.yaml | 3 +++ .../upstream/base/crds/kubeflow.org_tfjobs.yaml | 3 +++ .../upstream/base/crds/kubeflow.org_xgboostjobs.yaml | 3 +++ .../upstream/overlays/kubeflow/kustomization.yaml | 2 +- .../upstream/overlays/standalone/kustomization.yaml | 2 +- hack/sync-training-operator-manifests.sh | 4 ++-- 10 files changed, 23 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 08ddf51bf6..0a85c731d4 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ This repo periodically syncs all official Kubeflow components from their respect | Component | Local Manifests Path | Upstream Revision | | - | - | - | -| Training Operator | apps/training-operator/upstream | [v1.8.0-rc.0](https://github.com/kubeflow/training-operator/tree/v1.8.0-rc.0/manifests) | +| Training Operator | apps/training-operator/upstream | [v1.8.0-rc.1](https://github.com/kubeflow/training-operator/tree/v1.8.0-rc.1/manifests) | | Notebook Controller | apps/jupyter/notebook-controller/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/notebook-controller/config) | | PVC Viewer Controller | apps/pvcviewer-roller/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/pvcviewer-controller/config) | | Tensorboard Controller | apps/tensorboard/tensorboard-controller/upstream | [v1.9.0-rc.0](https://github.com/kubeflow/kubeflow/tree/v1.9.0-rc.0/components/tensorboard-controller/config) | diff --git a/apps/training-operator/upstream/base/crds/kubeflow.org_mpijobs.yaml b/apps/training-operator/upstream/base/crds/kubeflow.org_mpijobs.yaml index 7938cd0797..4139d49fef 100644 --- a/apps/training-operator/upstream/base/crds/kubeflow.org_mpijobs.yaml +++ b/apps/training-operator/upstream/base/crds/kubeflow.org_mpijobs.yaml @@ -7330,6 +7330,9 @@ spec: type: string queue: type: string + x-kubernetes-validations: + - message: spec.runPolicy.schedulingPolicy.queue is immutable + rule: self == oldSelf scheduleTimeoutSeconds: format: int32 type: integer diff --git a/apps/training-operator/upstream/base/crds/kubeflow.org_mxjobs.yaml b/apps/training-operator/upstream/base/crds/kubeflow.org_mxjobs.yaml index ead44a5576..470f4a8f1a 100644 --- a/apps/training-operator/upstream/base/crds/kubeflow.org_mxjobs.yaml +++ b/apps/training-operator/upstream/base/crds/kubeflow.org_mxjobs.yaml @@ -7333,6 +7333,9 @@ spec: type: string queue: type: string + x-kubernetes-validations: + - message: spec.runPolicy.schedulingPolicy.queue is immutable + rule: self == oldSelf scheduleTimeoutSeconds: format: int32 type: integer diff --git a/apps/training-operator/upstream/base/crds/kubeflow.org_paddlejobs.yaml b/apps/training-operator/upstream/base/crds/kubeflow.org_paddlejobs.yaml index ee07b19763..c8a5acb8c3 100644 --- a/apps/training-operator/upstream/base/crds/kubeflow.org_paddlejobs.yaml +++ b/apps/training-operator/upstream/base/crds/kubeflow.org_paddlejobs.yaml @@ -7812,6 +7812,9 @@ spec: type: string queue: type: string + x-kubernetes-validations: + - message: spec.runPolicy.schedulingPolicy.queue is immutable + rule: self == oldSelf scheduleTimeoutSeconds: format: int32 type: integer diff --git a/apps/training-operator/upstream/base/crds/kubeflow.org_pytorchjobs.yaml b/apps/training-operator/upstream/base/crds/kubeflow.org_pytorchjobs.yaml index 5286139833..a5c261e124 100644 --- a/apps/training-operator/upstream/base/crds/kubeflow.org_pytorchjobs.yaml +++ b/apps/training-operator/upstream/base/crds/kubeflow.org_pytorchjobs.yaml @@ -7849,6 +7849,9 @@ spec: type: string queue: type: string + x-kubernetes-validations: + - message: spec.runPolicy.schedulingPolicy.queue is immutable + rule: self == oldSelf scheduleTimeoutSeconds: format: int32 type: integer diff --git a/apps/training-operator/upstream/base/crds/kubeflow.org_tfjobs.yaml b/apps/training-operator/upstream/base/crds/kubeflow.org_tfjobs.yaml index c00c720a2e..153243aae6 100644 --- a/apps/training-operator/upstream/base/crds/kubeflow.org_tfjobs.yaml +++ b/apps/training-operator/upstream/base/crds/kubeflow.org_tfjobs.yaml @@ -90,6 +90,9 @@ spec: type: string queue: type: string + x-kubernetes-validations: + - message: spec.runPolicy.schedulingPolicy.queue is immutable + rule: self == oldSelf scheduleTimeoutSeconds: format: int32 type: integer diff --git a/apps/training-operator/upstream/base/crds/kubeflow.org_xgboostjobs.yaml b/apps/training-operator/upstream/base/crds/kubeflow.org_xgboostjobs.yaml index 9553e3b0a3..34237c6aba 100644 --- a/apps/training-operator/upstream/base/crds/kubeflow.org_xgboostjobs.yaml +++ b/apps/training-operator/upstream/base/crds/kubeflow.org_xgboostjobs.yaml @@ -86,6 +86,9 @@ spec: type: string queue: type: string + x-kubernetes-validations: + - message: spec.runPolicy.schedulingPolicy.queue is immutable + rule: self == oldSelf scheduleTimeoutSeconds: format: int32 type: integer diff --git a/apps/training-operator/upstream/overlays/kubeflow/kustomization.yaml b/apps/training-operator/upstream/overlays/kubeflow/kustomization.yaml index 8a3d51790a..71ce5ef7b5 100644 --- a/apps/training-operator/upstream/overlays/kubeflow/kustomization.yaml +++ b/apps/training-operator/upstream/overlays/kubeflow/kustomization.yaml @@ -6,7 +6,7 @@ resources: - kubeflow-training-roles.yaml images: - name: kubeflow/training-operator - newTag: "v1-f8f7363" + newTag: "v1-4485b0a" # TODO (tenzen-y): Once we support cert-manager, we need to remove this secret generation. # REF: https://github.com/kubeflow/training-operator/issues/2049 secretGenerator: diff --git a/apps/training-operator/upstream/overlays/standalone/kustomization.yaml b/apps/training-operator/upstream/overlays/standalone/kustomization.yaml index f59058e4a5..0ecb165a23 100644 --- a/apps/training-operator/upstream/overlays/standalone/kustomization.yaml +++ b/apps/training-operator/upstream/overlays/standalone/kustomization.yaml @@ -6,7 +6,7 @@ resources: - namespace.yaml images: - name: kubeflow/training-operator - newTag: "v1-f8f7363" + newTag: "v1-4485b0a" secretGenerator: - name: training-operator-webhook-cert options: diff --git a/hack/sync-training-operator-manifests.sh b/hack/sync-training-operator-manifests.sh index 9e9c41fcea..f3a336017c 100755 --- a/hack/sync-training-operator-manifests.sh +++ b/hack/sync-training-operator-manifests.sh @@ -15,7 +15,7 @@ set -euxo pipefail IFS=$'\n\t' -COMMIT="v1.8.0-rc.0" # You can use tags as well +COMMIT="v1.8.0-rc.1" # You can use tags as well SRC_DIR=${SRC_DIR:=/tmp/kubeflow-training-operator} BRANCH=${BRANCH:=sync-kubeflow-training-operator-manifests-${COMMIT?}} @@ -64,7 +64,7 @@ DST_DIR=$MANIFESTS_DIR/apps/training-operator/upstream if [ -d "$DST_DIR" ]; then rm -r "$DST_DIR" fi -cp $SRC_DIR/manifests $DST_DIR -r +cp $SRC_DIR/training-operator/manifests $DST_DIR -r echo "Successfully copied all manifests."