add druid-operator to apache druid by AdheipSingh · Pull Request #18435 · apache/druid

AdheipSingh · 2025-08-24T06:52:15Z

Fixes #XXXX.

Description

Based on discussion with Druid PMC on threads, i have raised a PR to move druid-operator to druid.

capistrant

Thank you for getting this started. Have left high level comments so far regarding things like Apache headers, files we may want to remove as part of this, etc.

capistrant · 2025-08-26T14:33:42Z

should this be deleted with perhaps a new section added to the base pr template that gives a checklist for PRs that touch druid-operator?

capistrant · 2025-08-26T14:34:14Z

can we delete? Druid repo should have its own stale PR handler if I remember correctly

capistrant · 2025-08-26T14:35:06Z

does this need to be moved into base druid github workflows area?

capistrant · 2025-08-26T14:37:47Z

I assume this needs to be deleted and druid-operator now falls under the core druid LICENSE file, but I'm not up to snuff on the license specifics with project donation to an apache project

capistrant · 2025-08-26T14:38:22Z

Also a candidate for removal I think

capistrant · 2025-08-26T14:45:39Z

@@ -0,0 +1,102 @@
+/*


I'll only comment once per file ext type :) -- all .go source files need the proper apache copy header

Pulled from our java source files:

/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */

capistrant · 2025-08-26T15:01:18Z

I believe all the project YAML files will need the apache copy header.

Example pulled from other druid Yaml file:

# Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. # The ASF licenses this file to You under the Apache License, Version 2.0 # (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. #-------------------------------------------------------------------------

capistrant · 2025-08-26T15:03:07Z

@@ -0,0 +1,7 @@
+FROM alpine:3.17.2


same license requirements for the Dockerfiles in the repo

pulled from existing Dockerfile in repo

# Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information # regarding copyright ownership. The ASF licenses this file # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. #-------------------------------------------------------------------------

capistrant · 2025-08-26T15:04:37Z

same License stuff applies for .sh files

From Druid repo existing script. comment came after shebang line + linebreak

# Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. # The ASF licenses this file to You under the Apache License, Version 2.0 # (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. #-------------------------------------------------------------------------

capistrant · 2025-08-26T15:05:19Z

I'm unfamiliar with .tpl but I do figure we will need apache copy headers in these too 🤔

AdheipSingh · 2025-08-27T16:31:38Z

Thanks for review @capistrant ill address the comments.

himanshug · 2025-08-29T16:52:07Z

Clear and Approved for Apache Donation from my side.

AdheipSingh · 2025-08-31T14:52:05Z

@capistrant - i have addressed all your comments. Regarding .tpl i myself am unsure. This was actually generated as part of repo initialisation.

capistrant · 2025-09-02T16:05:20Z

@AdheipSingh thanks for the updates! I guess there are more files still getting flagged for improper license header in static checks. Once we get this green, it will be easier to see what other things may need to be fixed up.

 druid-operator/e2e/druid-ingestion-test.sh
  druid-operator/e2e/Dockerfile-testpod
  druid-operator/e2e/test-extra-common-config.sh
  druid-operator/e2e/wikipedia-test.sh
  druid-operator/e2e/monitor-task.sh
  druid-operator/README.md
  druid-operator/docs/README.md
  druid-operator/docs/examples.md
  druid-operator/docs/getting_started.md
  druid-operator/docs/druid_cr.md
  druid-operator/docs/dev_doc.md
  druid-operator/docs/api_specifications/druid.md
  druid-operator/docs/kubebuilder_v3_migration.md
  druid-operator/docs/features.md
  druid-operator/tutorials/druid-on-kind/README.md
  druid-operator/PROJECT
  druid-operator/go.mod
  druid-operator/chart/.helmignore
  druid-operator/chart/templates/_helpers.tpl
  druid-operator/chart/templates/NOTES.txt
  druid-operator/ADOPTERS.md
  druid-operator/Makefile
  druid-operator/hack/api-docs/template/members.tpl
  druid-operator/hack/api-docs/template/type.tpl
  druid-operator/hack/api-docs/template/pkg.tpl
  druid-operator/go.sum
  druid-operator/.dockerignore

^ From java 17 static checks listing files missing licenses header. I guess even markdowns need the proper licensing header. You can find examples for each file type in the existing repository. For .tpl probably just copy the content from a java source file with .tpl format for multi-line comments?

AdheipSingh · 2025-09-03T19:53:45Z

@capistrant go.mod and go.sum can't have headers. Rest files i have added.

capistrant · 2025-09-03T22:24:23Z

@capistrant go.mod and go.sum can't have headers. Rest files i have added.

I see, then I guess we will have to add .<exclude>**/*.mod</exclude> as an exception in the rat plugin conf:

druid/pom.xml

Line 2169 in 90be682

.. a short comment on the line saying .mod files do not support header comments should suffice

yurmix · 2025-09-09T06:51:30Z

go.mod

I do see other projects have license headers in this file:
https://github.com/apache/arrow-go/blob/main/go.mod

For go.sum, I don't think it is possible to add comments.

AdheipSingh · 2025-09-13T14:45:51Z

@capistrant @yurmix
I have done the changes. Please check.

capistrant

awesome to see green CI! I have a few more comments

capistrant · 2025-09-15T19:57:27Z

This template should not be removed

capistrant · 2025-09-15T20:00:09Z

I think this needs to be deleted. Our other modules do not have module level LICENSE files. This module will fall under the overall project LICENSE after donation

capistrant · 2025-09-15T20:16:24Z

nit: it could make sense to sync this up with the parent gitignore and remove duplicates. But probably not the biggest deal

AdheipSingh · 2025-09-16T04:48:08Z

@capistrant all files removed as you suggested.

capistrant · 2025-09-16T19:18:57Z

@capistrant all files removed as you suggested.

@AdheipSingh I'm still seeing .github/pull_request_template.md as being deleted in the latest version. Could you please restore it to original form?

AdheipSingh · 2025-09-17T15:13:33Z

@capistrant I have added the PR template back. Apologies for confusion.

gianm · 2025-09-19T02:09:09Z

FYI, I just raised an IP Clearance vote with the Incubator: https://lists.apache.org/thread/s0nrv9ny396nkll396f30c57o5nvdkd4

gianm · 2025-09-23T23:24:55Z

IP Clearance has passed. @capistrant do you think this is ready to merge from a code point of view? We can fix up most things after merging. The main thing that should be done pre-merging is ensure CI still passes and that license headers are correct. To me this appears done.

gianm · 2025-09-23T23:54:05Z

It doesn't need to block this PR, but the next thing that should be discussed is how we handle releases. I posted on the dev thread about it here: https://lists.apache.org/thread/1r3fmpmdjvmptq9ckn36xq6zdd9hgvmd

@AdheipSingh @yurmix @razinbouzar — please chime in on the thread with your thoughts. As you all have been most involved in the discussions recently, I am assuming one of you will have an opinion on releases 😄

AdheipSingh · 2025-09-25T20:12:27Z

It doesn't need to block this PR, but the next thing that should be discussed is how we handle releases. I posted on the dev thread about it here: https://lists.apache.org/thread/1r3fmpmdjvmptq9ckn36xq6zdd9hgvmd

@AdheipSingh @yurmix @razinbouzar — please chime in on the thread with your thoughts. As you all have been most involved in the discussions recently, I am assuming one of you will have an opinion on releases 😄

Thanks @gianm as always for your support. I will chime in the thread.

capistrant · 2025-09-26T23:33:45Z

@AdheipSingh could you merge master into this once and then pending green CI I will approve and merge. Thank you for all the work getting this ready to merge. We are almost there.

capistrant · 2025-10-09T13:37:52Z

@AdheipSingh checking in here to see again if you could do a quick merge of master into your branch to run on the latest CI workflows as one last check before we merge and move ahead with integrating druid-operator into druid!

AdheipSingh · 2025-10-10T03:33:33Z

@capistrant - i have merged master into my branch

razinbouzar · 2025-10-19T17:35:30Z

@capistrant or @gianm can either of you merge this PR? Two issues have been created to track releases:

razinbouzar · 2026-01-03T04:57:51Z

It would make some sense to have a separate repo with its own release cycle. @capistrant and @AdheipSingh, what else do we need to get this going?

Essentially reverts apache#18435 since the repo has now been moved to https://github.com/apache/druid-operator as part of the ASF donation.

add druid-operator to apache druid

bc0ef1d

capistrant reviewed Aug 26, 2025

View reviewed changes

adding druid operator to apache

501f94a

AdheipSingh requested a review from capistrant August 31, 2025 14:52

Add Apache license headers to remaining files

d913d88

Update go.mod license header and exclude go.sum from rat check

25647be

github-actions Bot added Area - Dependencies GHA labels Sep 13, 2025

Remove druid-operator LICENSE file

d1bbb56

capistrant requested changes Sep 15, 2025

View reviewed changes

restart pull request template in druid

ed87015

yurmix mentioned this pull request Sep 26, 2025

Proposal: Improving druid-operator project governance datainfrahq/druid-operator#212

Closed

Merge upstream master into branch for latest CI workflows

dda86fe

capistrant approved these changes Oct 13, 2025

View reviewed changes

capistrant merged commit e48914c into apache:master Oct 21, 2025
60 checks passed

kgyrtkirk added this to the 36.0.0 milestone Jan 19, 2026

abhishekrb19 mentioned this pull request Feb 18, 2026

Hosting update for the druid-operator repository datainfrahq/druid-operator#250

Open

gianm mentioned this pull request Feb 23, 2026

helm repo update failing because https://charts.datainfra.io/index.yaml is broken datainfrahq/druid-operator#259

Open

abhishekrb19 mentioned this pull request Mar 13, 2026

Remove druid-operator tree from this repo in favor of apache/druid-operator repo #19156

Merged

Conversation

AdheipSingh commented Aug 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Uh oh!

capistrant left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AdheipSingh commented Aug 27, 2025

Uh oh!

himanshug commented Aug 29, 2025

Uh oh!

AdheipSingh commented Aug 31, 2025

Uh oh!

capistrant commented Sep 2, 2025

Uh oh!

AdheipSingh commented Sep 3, 2025

Uh oh!

capistrant commented Sep 3, 2025

Uh oh!

yurmix commented Sep 9, 2025

Uh oh!

AdheipSingh commented Sep 13, 2025

Uh oh!

capistrant left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AdheipSingh commented Sep 16, 2025

Uh oh!

capistrant commented Sep 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AdheipSingh commented Sep 17, 2025

Uh oh!

gianm commented Sep 19, 2025

Uh oh!

gianm commented Sep 23, 2025

Uh oh!

gianm commented Sep 23, 2025

Uh oh!

AdheipSingh commented Sep 25, 2025

Uh oh!

capistrant commented Sep 26, 2025

Uh oh!

capistrant commented Oct 9, 2025

Uh oh!

AdheipSingh commented Oct 10, 2025

Uh oh!

razinbouzar commented Oct 19, 2025

Uh oh!

Uh oh!

razinbouzar commented Jan 3, 2026

Uh oh!

Reviewers

AdheipSingh commented Aug 24, 2025 •

edited

Loading

capistrant commented Sep 16, 2025 •

edited

Loading