Skip to content

update spark operator#3379

Merged
google-oss-prow[bot] merged 3 commits into
masterfrom
copilot/cleanup-spark-operator-update-script
Mar 3, 2026
Merged

update spark operator#3379
google-oss-prow[bot] merged 3 commits into
masterfrom
copilot/cleanup-spark-operator-update-script

Conversation

Copilot AI commented Mar 3, 2026

Copy link
Copy Markdown
Contributor

This change removes script-local bootstrap logic in the Spark Operator synchronization flow and writes rendered manifests directly to the target resources.yaml. The goal is to keep the sync script focused on rendering/updating manifests without generating kustomization.yaml or managing an intermediate destination variable.

  • Scope

    • Removes conditional kustomization.yaml creation from scripts/synchronize-spark-operator-manifests.sh.
    • Removes DESTINATION_DIRECTORY assignment and mkdir -p for that variable.
    • Keeps render behavior intact while simplifying path handling.
  • Script changes

    • Replaces indirect write (cd into destination, then > resources.yaml) with a direct absolute write to:
      applications/spark/spark-operator/base/resources.yaml.
  • Resulting command pattern

    helm template -n kubeflow --include-crds spark-operator \
      --set "spark.jobNamespaces={}" \
      --set webhook.enable=true \
      --set webhook.port=9443 \
      "${SOURCE_DIRECTORY}/${REPOSITORY_DIRECTORY}/charts/spark-operator-chart" \
      > "${MANIFESTS_DIRECTORY}/${DESTINATION_MANIFESTS_PATH}/resources.yaml"

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Copilot AI self-assigned this Mar 3, 2026
Copilot AI review requested due to automatic review settings March 3, 2026 19:56
Copilot AI removed the request for review from Copilot March 3, 2026 19:56
Signed-off-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Copilot AI requested review from Copilot and removed request for Copilot March 3, 2026 19:59
@google-oss-prow google-oss-prow Bot added size/L and removed size/XS labels Mar 3, 2026
Copilot AI changed the title [WIP] Clean up and update spark operator update script Refactor Spark operator sync script and update manifests to v2.5.0-rc.0 Mar 3, 2026
Signed-off-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Copilot AI requested review from Copilot and removed request for Copilot March 3, 2026 20:07
Copilot AI changed the title Refactor Spark operator sync script and update manifests to v2.5.0-rc.0 Refactor Spark operator sync script and simplify direct manifest output pathing Mar 3, 2026
@juliusvonkohout

Copy link
Copy Markdown
Member

@tarekabouzeid for lgtm

Copilot AI changed the title Refactor Spark operator sync script and simplify direct manifest output pathing Simplify Spark sync script output handling by removing kustomization bootstrap Mar 3, 2026
@juliusvonkohout juliusvonkohout changed the title Simplify Spark sync script output handling by removing kustomization bootstrap update spark operator Mar 3, 2026
@juliusvonkohout juliusvonkohout marked this pull request as ready for review March 3, 2026 20:12
Copilot AI review requested due to automatic review settings March 3, 2026 20:12
@juliusvonkohout

Copy link
Copy Markdown
Member

/approve

@google-oss-prow

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: juliusvonkohout

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the Spark Operator synchronization workflow and bumps the rendered Spark Operator manifests to the v2.5.0-rc.0 upstream revision.

Changes:

  • Simplifies scripts/synchronize-spark-operator-manifests.sh to clone the upstream repo and render Helm output directly into the target resources.yaml path (removing script-local bootstrap/kustomization generation).
  • Updates Spark Operator rendered manifests (resources.yaml) to 2.5.0-rc.0 output, including updated labels/images and RBAC/controller args from the newer chart.
  • Updates the top-level README.md component version matrix for Spark Operator.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
scripts/synchronize-spark-operator-manifests.sh Switches to cloning upstream + direct render to applications/spark/spark-operator/base/resources.yaml, and updates README via shared helper.
applications/spark/spark-operator/base/resources.yaml Regenerated Spark Operator manifests for 2.5.0-rc.0.
README.md Bumps Spark Operator upstream revision link/version in the components table.

REPOSITORY_NAME="kubeflow/spark-operator"
COMMIT=${COMMIT:="2.4.0"}
REPOSITORY_URL="https://github.com/kubeflow/spark-operator.git"
COMMIT="v2.5.0-rc.0"

Copilot AI Mar 3, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

COMMIT is pinned to a release-candidate tag (v2.5.0-rc.0). If this repo generally tracks stable upstream releases, consider updating to the final v2.5.0 (or add a short comment explaining why an RC is intentionally used) to avoid pulling potentially unstable manifests/images into the main branch.

Suggested change
COMMIT="v2.5.0-rc.0"
COMMIT="v2.5.0"

Copilot uses AI. Check for mistakes.
Comment on lines +19 to +23
helm template -n kubeflow --include-crds spark-operator \
--set "spark.jobNamespaces={}" \
--set webhook.enable=true \
--set webhook.port=9443 \
--version ${COMMIT} \
--repo https://kubeflow.github.io/spark-operator > resources.yaml
if [[ "$OSTYPE" == "darwin"* ]]; then
sed -i '' 's/Spark Operator[^|]*|[^|]*applications\/spark\/spark-operator[^|]*|[^|]*\[[0-9]\.[0-9]\.[0-9]\]([^)]*)/Spark Operator | applications\/spark\/spark-operator | ['"${COMMIT}"'](https:\/\/github.com\/kubeflow\/spark-operator\/tree\/v'"${COMMIT}"')/g' "${MANIFESTS_DIRECTORY}/README.md"
else
sed -i 's/Spark Operator.*|.*applications\/spark\/spark-operator[^|]*|.*\[[0-9]\.[0-9]\.[0-9]\]([^)]*)/Spark Operator | applications\/spark\/spark-operator | ['"${COMMIT}"'](https:\/\/github.com\/kubeflow\/spark-operator\/tree\/v'"${COMMIT}"')/g' "${MANIFESTS_DIRECTORY}/README.md"
fi
"${SOURCE_DIRECTORY}/${REPOSITORY_DIRECTORY}/charts/spark-operator-chart" > "${MANIFESTS_DIRECTORY}/${DESTINATION_MANIFESTS_PATH}/resources.yaml"

Copilot AI Mar 3, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The helm template invocation places the chart argument after several flags. To match Helm’s documented helm template [NAME] [CHART] [flags] form (and existing repo usage in tests/helm_kustomize_compare.sh), consider moving the chart path to be the second positional argument immediately after the release name to reduce the chance of flag/arg parsing differences across Helm versions.

Copilot uses AI. Check for mistakes.
@tarekabouzeid

Copy link
Copy Markdown
Member

/lgtm

@google-oss-prow google-oss-prow Bot added the lgtm label Mar 3, 2026
@google-oss-prow google-oss-prow Bot merged commit 3ec6113 into master Mar 3, 2026
17 checks passed
@google-oss-prow google-oss-prow Bot deleted the copilot/cleanup-spark-operator-update-script branch March 3, 2026 20:45
Raakshass added a commit to Raakshass/manifests that referenced this pull request Mar 27, 2026
* Initial plan

* Update kubeflow/spark-operator manifests from v2.5.0-rc.0

Signed-off-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

* Update kubeflow/spark-operator manifests from v2.5.0-rc.0

Signed-off-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

---------

Signed-off-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants