Skip to content

Commit

Permalink
Merge remote-tracking branch 'kubeflow/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	pkg/controller/sparkapplication/controller.go
  • Loading branch information
ben-tzionlmb committed Apr 17, 2024
2 parents de42d2b + dede190 commit d9ccd87
Show file tree
Hide file tree
Showing 135 changed files with 2,221 additions and 1,989 deletions.
46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
name: Bug report
about: Create a report to help us improve
title: '[BUG] Brief description of the issue'
labels: bug
---

## Description
Please provide a clear and concise description of the issue you are encountering, and a reproduction of your configuration.

If your request is for a new feature, please use the `Feature request` template.

- [ ] ✋ I have searched the open/closed issues and my issue is not listed.

## Reproduction Code [Required]

<!-- REQUIRED -->

Steps to reproduce the behavior:


## Expected behavior

<!-- A clear and concise description of what you expected to happen -->

## Actual behavior

<!-- A clear and concise description of what actually happened -->

### Terminal Output Screenshot(s)

<!-- Optional but helpful -->


## Environment & Versions

- Spark Operator App version:
- Helm Chart Version:
- Kubernetes Version:
- Apache Spark version:

## Additional context

<!-- Add any other context about the problem here -->


32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Feature request
about: Suggest an idea for this project
title: '[FEATURE] Brief description of the feature'
labels: enhancement
---

<!--- Please keep this note for the community --->

### Community Note

* Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request
* Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request
* If you are interested in working on this issue or have submitted a pull request, please leave a comment

<!--- Thank you for keeping this note for the community --->

#### What is the outcome that you are trying to reach?

<!-- A clear and concise description of what the problem is. -->

#### Describe the solution you would like

<!-- A clear and concise description of what you want to happen. -->

#### Describe alternatives you have considered

<!-- A clear and concise description of any alternative solutions or features you've considered. -->

#### Additional context

<!-- Add any other context or screenshots about the feature request here. -->
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Question
about: I have a Question
title: '[QUESTION] Brief description of the Question'
labels: question
---

- [ ] ✋ I have searched the open/closed issues and my issue is not listed.

#### Please describe your question here

<!-- Provide as much information as possible to explain your question -->

#### Provide a link to the example/module related to the question

<!-- Please provide the link to the example related to this question from this repo -->

#### Additional context

<!-- Add any other context or screenshots about the question here -->
38 changes: 38 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
### 🛑 Important:
Please open an issue to discuss significant work before you start. We appreciate your contributions and don't want your efforts to go to waste!

For guidelines on how to contribute, please review the [CONTRIBUTING.md](CONTRIBUTING.md) document.

## Purpose of this PR
Provide a clear and concise description of the changes. Explain the motivation behind these changes and link to relevant issues or discussions.

**Proposed changes:**
- <Change 1>
- <Change 2>
- <Change 3>

## Change Category
Indicate the type of change by marking the applicable boxes:

- [ ] Bugfix (non-breaking change which fixes an issue)
- [ ] Feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that could affect existing functionality)
- [ ] Documentation update

### Rationale

<!-- Provide reasoning for the changes if not already covered in the description above. -->


## Checklist
Before submitting your PR, please review the following:

- [ ] I have conducted a self-review of my own code.
- [ ] I have updated documentation accordingly.
- [ ] I have added tests that prove my changes are effective or that my feature works.
- [ ] Existing unit tests pass locally with my changes.

### Additional Notes

<!-- Include any additional notes or context that could be helpful for the reviewers here. -->

53 changes: 26 additions & 27 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ on:
- master

jobs:

build-api-docs:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: "0"

Expand Down Expand Up @@ -43,12 +42,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: "0"

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"

Expand All @@ -60,12 +59,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: "0"

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"

Expand All @@ -80,7 +79,7 @@ jobs:

- name: Build Spark-Operator Docker Image
run: |
docker build -t gcr.io/spark-operator/spark-operator:latest .
docker build -t docker.io/kubeflow/spark-operator:latest .
- name: Check changes in resources used in docker file
run: |
Expand All @@ -90,7 +89,7 @@ jobs:
if ! git diff --quiet origin/master -- $resource; then
## And the appVersion hasn't been updated
if ! git diff origin/master -- charts/spark-operator-chart/Chart.yaml | grep +appVersion; then
echo "resource used in gcr.io/spark-operator/spark-operator has changed in $resource, need to update the appVersion in charts/spark-operator-chart/Chart.yaml"
echo "resource used in docker.io/kubeflow/spark-operator has changed in $resource, need to update the appVersion in charts/spark-operator-chart/Chart.yaml"
git diff origin/master -- $resource;
echo "failing the build... " && false
fi
Expand All @@ -101,14 +100,14 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: "0"

- name: Install Helm
uses: azure/setup-helm@v1
uses: azure/setup-helm@v4
with:
version: v3.7.1
version: v3.14.3

- name: Produce the helm documentation
run: |
Expand All @@ -119,7 +118,7 @@ jobs:
fi
- name: Set up chart-testing
uses: helm/chart-testing-action@v2.0.1
uses: helm/chart-testing-action@v2.6.1

- name: Print chart-testing version information
run: ct version
Expand All @@ -139,48 +138,48 @@ jobs:
run: make detect-crds-drift

- name: setup minikube
uses: manusa/actions-setup-minikube@v2.4.2
uses: manusa/actions-setup-minikube@v2.10.0
with:
minikube version: "v1.24.0"
kubernetes version: "v1.20.8"
minikube version: v1.32.0
kubernetes version: v1.28.8
start args: --memory 6g --cpus=2 --addons ingress
github token: ${{ inputs.github-token }}

- name: Run chart-testing (install)
run: |
docker build -t ghcr.io/googlecloudplatform/spark-operator:local .
minikube image load ghcr.io/googlecloudplatform/spark-operator:local
docker build -t docker.io/kubeflow/spark-operator:local .
minikube image load docker.io/kubeflow/spark-operator:local
ct install
integration-test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout source code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: "0"

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version-file: "go.mod"

- name: setup minikube
uses: manusa/actions-setup-minikube@v2.4.2
uses: manusa/actions-setup-minikube@v2.10.0
with:
minikube version: "v1.24.0"
kubernetes version: "v1.20.8"
minikube version: v1.32.0
kubernetes version: v1.28.8
start args: --memory 6g --cpus=2 --addons ingress
github token: ${{ inputs.github-token }}

- name: Build local spark-operator docker image for minikube testing
run: |
docker build -t gcr.io/spark-operator/spark-operator:local .
minikube image load gcr.io/spark-operator/spark-operator:local
docker build -t docker.io/kubeflow/spark-operator:local .
minikube image load docker.io/kubeflow/spark-operator:local
# The integration tests are currently broken see: https://github.com/GoogleCloudPlatform/spark-on-k8s-operator/issues/1416
# The integration tests are currently broken see: https://github.com/kubeflow/spark-operator/issues/1416
# - name: Run chart-testing (integration test)
# run: make integation-test
# run: make integration-test

- name: Setup tmate session
if: failure()
Expand Down
Loading

0 comments on commit d9ccd87

Please sign in to comment.