Skip to content

Conversation

@ash211
Copy link

@ash211 ash211 commented Mar 20, 2017

Fixes #133

Brings in commits from the upstream branch: https://github.com/apache-spark-on-k8s/spark/tree/branch-2.1-kubernetes

Excludes these commits which were build-related just for upstream:

  • b139b46 Andrew Ash 5 days ago Fix lint-check failures and javadoc8 break
  • 2382ea6 Kimoon Kim 5 days ago Exclude flaky ExternalShuffleServiceSuite from Travis
  • 3636939 Anirudh Ramanathan 7 days ago Fix pom versions

foxish and others added 6 commits March 20, 2017 13:47
* Adding official alpha docker image to docs

* Reorder sections and create a specific one for "advanced"

* Provide limitations and instructions about running on GKE

* Fix title of advanced section: submission

* Improved section on running in the cloud

* Update versioning

* Address comments

* Address comments

(cherry picked from commit e5da90d)
(cherry picked from commit 8c08189)
* Add Apache license to a few files

* Ignore license check on META-INF service

(cherry picked from commit 2a61438)
(cherry picked from commit 8756494)
(cherry picked from commit be109ab)
(cherry picked from commit fece639)
* Allow providing an OAuth token for authenticating against k8s

* Organize imports

* Fix style

* Remove extra newline

* Use OAuth token data instead of a file.

(cherry picked from commit 1aba361)
(cherry picked from commit 35724a3)
…client (squashed) (#192)

* Allow the driver pod's credentials to be shipped through secrets.

* Fix scalastyle

* Change apiserver -> authentication

* Address comments.

Also some quality of life fixes, most notably formatting all of the
documentation strings in config.scala to no longer use triple quotes.
Triple quoted strings are difficult to format consistently.

* Fix scalastyle

* Fix comment

* Remove unnecessary constants

* Remove unnecessary whitespace

* Authentication -> Authenticate

(cherry picked from commit d5502ed)
* Support configuring SSL using PEM files.

* Address some missed comments

* Fix import ordering

* Slight rewording of comments

* Fix scalastyle

(cherry picked from commit 078697f)
@ash211
Copy link
Author

ash211 commented Mar 20, 2017

Do a merge commit, not a squash and merge for this PR

@ash211
Copy link
Author

ash211 commented Mar 20, 2017

Passes!

@ash211 ash211 merged commit c500658 into master Mar 20, 2017
@ash211 ash211 deleted the resync-kube-upstream branch March 20, 2017 23:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants