Skip to content

helm: Stop helm chart from failing if zkHosts is not set#13746

Merged
abhishekagarwal87 merged 1 commit intoapache:masterfrom
jwitko:helm/remove-unnecessary-zkHost-requirement
Feb 8, 2023
Merged

helm: Stop helm chart from failing if zkHosts is not set#13746
abhishekagarwal87 merged 1 commit intoapache:masterfrom
jwitko:helm/remove-unnecessary-zkHost-requirement

Conversation

@jwitko
Copy link
Copy Markdown
Contributor

@jwitko jwitko commented Feb 3, 2023

Fixes #13745

Description

If a user deploying via the Apache Druid helm chart is while using druid-kubernetes-extensions then there is no need to set a zookeeper host however the helm chart will fail if the user does not.

This change will remove the requirement for setting a zookeeper host and adds a comment to the values file to help helm chart consumers understand.

Alternatives

An alternative design could have been to look for the druid config settings required in the documentation and base the conditional off of those but since they can be set at a per-process or global config level I thought it better to keep it simple.

Release note

Fixed: Helm chart no longer requires a ZooKeeper host be set for users using druid-kubernetes-extensions

This PR has:

  • been self-reviewed.
  • added documentation for new or modified features or behaviors.
  • a release note entry in the PR description.
  • added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
  • added or updated version, license, or notice information in licenses.yaml
  • added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
  • added unit tests or modified existing tests to cover new code paths, ensuring the threshold for code coverage is met.
  • added integration tests.
  • been tested in a test Druid cluster.

Comment thread helm/druid/templates/configmap.yaml Outdated
{{- if .Values.zookeeper.enabled }}
druid_zk_service_host: {{ .Release.Name }}-zookeeper-headless:2181
{{- else }}
{{- else .Values.zkHosts }}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure this should be:

Suggested change
{{- else .Values.zkHosts }}
{{- else if .Values.zkHosts }}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yes I thought I had that. Thank you for catching. Will fix now.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@jwitko jwitko force-pushed the helm/remove-unnecessary-zkHost-requirement branch from 719aff7 to 92fb8d8 Compare February 3, 2023 16:50
Copy link
Copy Markdown
Contributor

@a2l007 a2l007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you for fixing this @jwitko!

@abhishekagarwal87
Copy link
Copy Markdown
Contributor

@jwitko - can you pull the changes from the master branch? That might fix the build failures.

@jwitko jwitko force-pushed the helm/remove-unnecessary-zkHost-requirement branch from 92fb8d8 to 301ba72 Compare February 7, 2023 15:09
@jwitko
Copy link
Copy Markdown
Contributor Author

jwitko commented Feb 7, 2023

@jwitko - can you pull the changes from the master branch? That might fix the build failures.
@abhishekagarwal87 I have rebased and should be up to date with the upstream master branch. Once this is merged I'll do the same to #13747

@a2l007
Copy link
Copy Markdown
Contributor

a2l007 commented Feb 7, 2023

@jwitko Thanks, Going forward please avoid rebasing and force pushing for commits after submitting the PR, since this makes it harder for the reviewers to see what has changed between commits.

@jwitko
Copy link
Copy Markdown
Contributor Author

jwitko commented Feb 7, 2023

@jwitko Thanks, Going forward please avoid rebasing and force pushing for commits after submitting the PR, since this makes it harder for the reviewers to see what has changed between commits.

sure no problem. what is preferred? git merge upstream/master ?

@a2l007
Copy link
Copy Markdown
Contributor

a2l007 commented Feb 7, 2023

@jwitko Thanks, Going forward please avoid rebasing and force pushing for commits after submitting the PR, since this makes it harder for the reviewers to see what has changed between commits.

sure no problem. what is preferred? git merge upstream/master ?

Yes

@abhishekagarwal87 abhishekagarwal87 merged commit 5934d5f into apache:master Feb 8, 2023
@abhishekagarwal87
Copy link
Copy Markdown
Contributor

Thank you @jwitko for your contribution.

@jwitko jwitko deleted the helm/remove-unnecessary-zkHost-requirement branch February 8, 2023 14:03
@clintropolis clintropolis added this to the 26.0 milestone Apr 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Helm chart forces zookeeper hosts to be set even if using druid-kubernetes-extensions

5 participants