Skip to content

Revert k8s changes from upstream#300

Closed
ash211 wants to merge 2 commits intork/merge-upstreamfrom
aash/revert-k8s-changes-from-apache
Closed

Revert k8s changes from upstream#300
ash211 wants to merge 2 commits intork/merge-upstreamfrom
aash/revert-k8s-changes-from-apache

Conversation

@ash211
Copy link

@ash211 ash211 commented Jan 15, 2018

We want to stay with what's currently in palantir/master until the version in
apache/master has caught up with what's in the k8s fork. Then we drop the
code from the fork and begin using the Apache stuff again.

The code in apache and spark-on-k8s is largely in different package names which is why this revert ends up largely looking like deletes.

Procedure:

  • git checkout rk/merge-upstream
  • rm -rf resource-managers/kubernetes
  • git checkout palantir/master -- resource-managers/kubernetes
  • (undo version drops in pom.xml files, to preserve 2.4.0-SNAPSHOT)
  • commit

An addition to #299

We want to stay with what's currently in palantir/master until the version in
apache/master has caught up with what's in the k8s fork.  Then we drop the
code from the fork and begin using the Apache stuff again.
@ash211 ash211 mentioned this pull request Jan 15, 2018
@mccheah
Copy link

mccheah commented Jan 15, 2018

Think this makes sense.

@robert3005
Copy link

@ash211 already pushed that to my branch

@ash211 ash211 closed this Jan 15, 2018
@ash211 ash211 deleted the aash/revert-k8s-changes-from-apache branch January 15, 2018 21:14
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.

3 participants