-
Notifications
You must be signed in to change notification settings - Fork 504
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for building without zookeeper #2448
Conversation
Signed-off-by: Charles Pretzer <[email protected]>
…merd Signed-off-by: Charles Pretzer <[email protected]>
Signed-off-by: Charles Pretzer <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you include instructions in the description for how to build the nozk configuration? Have you been able to confirm the nozk artifacts don't contain the zk jars?
project/LinkerdBuild.scala
Outdated
@@ -522,6 +542,29 @@ object LinkerdBuild extends Base { | |||
.settings(inConfig(OpenJ9)(OpenJ9Settings)) | |||
.configDependsOn(Dcos)(dcosBootstrap) | |||
.settings(inConfig(Dcos)(DcosSettings)) | |||
.configDependsOn(NoZk)(BundleProjectsNoZk: _*) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we have to put the NoZk config onto this all
project?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, I left this by oversight
project/Deps.scala
Outdated
val curatorDiscovery = "org.apache.curator" % "curator-x-discovery" % "4.1.0" | ||
val curatorFramework = "org.apache.curator" % "curator-framework" % "5.2.0" | ||
val curatorClient = "org.apache.curator" % "curator-client" % "5.2.0" | ||
val curatorDiscovery = "org.apache.curator" % "curator-x-discovery" % "5.2.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need to bump deps as part of this change? I thought we were just adding a nozk configuration.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I bumped this dep in order to get a version of Curator that doesn't rely on Zookeeper as a downstream dependency. It's easy enough to roll this back, and I left it because all the tests passed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what about the netty and boringssl bumps below? is bumping those versions necessary? I'd prefer to change as little as possible.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adleong I've rolled back the dependency versions, so please have a look and let me know if there are additional changes required
Signed-off-by: Charles Pretzer <[email protected]>
Signed-off-by: Charles Pretzer <[email protected]>
Signed-off-by: Charles Pretzer <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks pretty good
project/Deps.scala
Outdated
val curatorDiscovery = "org.apache.curator" % "curator-x-discovery" % "4.1.0" | ||
val curatorFramework = "org.apache.curator" % "curator-framework" % "5.2.0" | ||
val curatorClient = "org.apache.curator" % "curator-client" % "5.2.0" | ||
val curatorDiscovery = "org.apache.curator" % "curator-x-discovery" % "5.2.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what about the netty and boringssl bumps below? is bumping those versions necessary? I'd prefer to change as little as possible.
Signed-off-by: Charles Pretzer <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, @cpretzer, looks great!
Hi, will there be a new release containing this feature in the near future? |
@adleong will there be a release of zookeeperless linkerd in the near future? |
nozk
config to namerd and linkerd projectsThis change adds support for building the linkerd and namerd binaries without ZooKeeper to remove the dependency on log4j
Closes #2440