Skip to content
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

Merged
merged 7 commits into from
Mar 29, 2022
Merged

Conversation

cpretzer
Copy link
Contributor

  • Add nozk config to namerd and linkerd projects
  • Update Apache Curator version to 5.2.0

This change adds support for building the linkerd and namerd binaries without ZooKeeper to remove the dependency on log4j

Closes #2440

Copy link
Member

@adleong adleong left a 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?

@@ -522,6 +542,29 @@ object LinkerdBuild extends Base {
.settings(inConfig(OpenJ9)(OpenJ9Settings))
.configDependsOn(Dcos)(dcosBootstrap)
.settings(inConfig(Dcos)(DcosSettings))
.configDependsOn(NoZk)(BundleProjectsNoZk: _*)
Copy link
Member

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?

Copy link
Contributor Author

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/LinkerdBuild.scala Outdated Show resolved Hide resolved
project/LinkerdBuild.scala Outdated Show resolved Hide resolved
project/LinkerdBuild.scala Outdated Show resolved Hide resolved
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"
Copy link
Member

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.

Copy link
Contributor Author

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.

Copy link
Member

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.

Copy link
Contributor Author

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

project/LinkerdBuild.scala Outdated Show resolved Hide resolved
project/plugins.sbt Outdated Show resolved Hide resolved
Copy link
Member

@adleong adleong left a 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

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"
Copy link
Member

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.

project/LinkerdBuild.scala Show resolved Hide resolved
Copy link
Member

@adleong adleong left a 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!

@cpretzer cpretzer merged commit dd4d4d2 into main Mar 29, 2022
@DrCapt
Copy link

DrCapt commented Apr 6, 2022

Hi, will there be a new release containing this feature in the near future?

@DrCapt
Copy link

DrCapt commented May 9, 2022

@adleong will there be a release of zookeeperless linkerd in the near future?

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.

Request upgrade of all log4j 1.x to at least log4j 2.17.1, or patch vulnerabilities
3 participants