From cd0b997c2f2384aa87c58b27d36612194f6f1c05 Mon Sep 17 00:00:00 2001 From: Razin Bouzar Date: Sat, 28 Feb 2026 15:28:56 -0500 Subject: [PATCH 1/6] Adding Apache Rat to ci/cd License headers auditing should be included as part of ci/cd builds. This includes adding the Apache Rat audit tool and adds license headers --- .dockerignore | 17 +++++++++++++++++ Makefile | 30 ++++++++++++++++++++++++++++++ chart/.helmignore | 17 +++++++++++++++++ go.mod | 17 +++++++++++++++++ 4 files changed, 81 insertions(+) diff --git a/.dockerignore b/.dockerignore index 0f046820..97a57a69 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,20 @@ +# 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. + # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file # Ignore build and test binaries. bin/ diff --git a/Makefile b/Makefile index 4027938b..cd597da7 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,8 @@ NAMESPACE_MINIO_OPERATOR ?= "minio-operator" MINIO_VERSION ?= "6.0.4" # NAMESPACE for druid app e2e NAMESPACE_DRUID ?= "druid" +# Set to false to skip the Apache RAT license audit +ENABLE_RAT ?= true # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.26.0 @@ -103,6 +105,22 @@ test: manifests generate fmt vet envtest ## Run tests. e2e: ## Runs e2e tests e2e/e2e.sh +ifeq ($(ENABLE_RAT),true) +.PHONY: rat +rat: rat-jar ## Run Apache RAT license audit (set ENABLE_RAT=false to skip). + java -jar $(RAT_JAR) \ + --input-exclude-std GIT \ + --input-exclude "**/*.png" \ + --input-exclude "**/*.sum" \ + --input-exclude "**/zz_generated.*.go" \ + --input-exclude "**/PROJECT" \ + -- . +else +.PHONY: rat +rat: ## Run Apache RAT license audit (set ENABLE_RAT=false to skip). + @echo "Skipping Apache RAT license audit (ENABLE_RAT=false)" +endif + .PHONY: docker-build-local-test docker-build-local-test: ## Build docker image with the manager for test on kind. docker build -t ${IMG_KIND}:${TEST_IMG_TAG} -f e2e/Dockerfile-testpod . @@ -247,11 +265,13 @@ KUSTOMIZE ?= $(LOCALBIN)/kustomize CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen GEN_CRD_API_REFERENCE_DOCS = $(LOCALBIN)/gen-crd-api-reference-docs ENVTEST ?= $(LOCALBIN)/setup-envtest +RAT_JAR ?= $(LOCALBIN)/apache-rat.jar ## Tool Versions KUSTOMIZE_VERSION ?= v3.8.7 CONTROLLER_TOOLS_VERSION ?= v0.14.0 GEN_CRD_API_REF_VERSION ?= v0.3.0 +RAT_VERSION ?= 0.17 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize @@ -278,3 +298,13 @@ $(ENVTEST): $(LOCALBIN) gen-crd-api-reference-docs: $(GEN_CRD_API_REFERENCE_DOCS) $(GEN_CRD_API_REFERENCE_DOCS): $(LOCALBIN) GOBIN=$(LOCALBIN) go install github.com/ahmetb/gen-crd-api-reference-docs@$(GEN_CRD_API_REF_VERSION) + +.PHONY: rat-jar +rat-jar: $(RAT_JAR) ## Download Apache RAT jar locally if necessary. +$(RAT_JAR): $(LOCALBIN) + mkdir -p /tmp/rat-download && \ + curl -sSL "https://dlcdn.apache.org/creadur/apache-rat-$(RAT_VERSION)/apache-rat-$(RAT_VERSION)-bin.tar.gz" \ + -o /tmp/rat-download/rat.tar.gz && \ + tar -xzf /tmp/rat-download/rat.tar.gz -C /tmp/rat-download && \ + mv /tmp/rat-download/apache-rat-$(RAT_VERSION)/apache-rat-$(RAT_VERSION).jar $(RAT_JAR) && \ + rm -rf /tmp/rat-download diff --git a/chart/.helmignore b/chart/.helmignore index 0e8a0eb3..fa5198e3 100644 --- a/chart/.helmignore +++ b/chart/.helmignore @@ -1,3 +1,20 @@ +# 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. + # Patterns to ignore when building packages. # This supports shell glob matching, relative path matching, and # negation (prefixed with !). Only one pattern per line. diff --git a/go.mod b/go.mod index 01f34480..9af90909 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,20 @@ +// 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. + module github.com/datainfrahq/druid-operator go 1.20 From e155a6121d7b669a7522ab60b58fe38bc4234598 Mon Sep 17 00:00:00 2001 From: Razin Bouzar Date: Sat, 28 Feb 2026 19:48:53 -0500 Subject: [PATCH 2/6] Update permissions All six e2e/*.sh scripts were stored in git with mode 100644 (not executable), which caused the CI failure. Fixed with git update-index --chmod=+x to set mode 100755 in the git index, and chmod +x locally to match. --- e2e/druid-ingestion-test.sh | 0 e2e/e2e.sh | 0 e2e/kind.sh | 0 e2e/monitor-task.sh | 0 e2e/test-extra-common-config.sh | 0 e2e/wikipedia-test.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 e2e/druid-ingestion-test.sh mode change 100644 => 100755 e2e/e2e.sh mode change 100644 => 100755 e2e/kind.sh mode change 100644 => 100755 e2e/monitor-task.sh mode change 100644 => 100755 e2e/test-extra-common-config.sh mode change 100644 => 100755 e2e/wikipedia-test.sh diff --git a/e2e/druid-ingestion-test.sh b/e2e/druid-ingestion-test.sh old mode 100644 new mode 100755 diff --git a/e2e/e2e.sh b/e2e/e2e.sh old mode 100644 new mode 100755 diff --git a/e2e/kind.sh b/e2e/kind.sh old mode 100644 new mode 100755 diff --git a/e2e/monitor-task.sh b/e2e/monitor-task.sh old mode 100644 new mode 100755 diff --git a/e2e/test-extra-common-config.sh b/e2e/test-extra-common-config.sh old mode 100644 new mode 100755 diff --git a/e2e/wikipedia-test.sh b/e2e/wikipedia-test.sh old mode 100644 new mode 100755 From b4e879013521dce80e69b8e971dd423d3dc9d450 Mon Sep 17 00:00:00 2001 From: Razin Bouzar Date: Sun, 1 Mar 2026 23:01:31 -0500 Subject: [PATCH 3/6] Fix for kind dependency for failing builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit e2e/e2e.sh Two changes: 1. kind upgraded from v0.21.0 to v0.31.0 — the version previously installed was outdated. v0.31.0 is the current stable release. 2. PATH export added after go install — go install puts the kind binary in $(go env GOPATH)/bin, but that directory isn't always on $PATH in CI environments. Without this export, the kind command wouldn't be found immediately after install. 3. make kind-load-local and make kind-load-local-test added after the respective docker push calls — explained below under Makefile. --- e2e/kind.sh The containerdConfigPatches block was removed. That block configured a registry mirror inside the kind cluster so pods could pull images from the local registry at localhost:5001. It worked with containerd v1.x, but kindest/node:v1.35.0 (kind v0.31.0's default node image) ships with containerd v2.2.0, which removed that configuration API entirely. Applying the v1.x TOML patch to a v2.x containerd causes containerd to fail on startup, which in turn causes the kubelet to time out — the error seen in both local and CI runs. --- Makefile Two new targets added, and CONTROLLER_TOOLS_VERSION bumped: 1. kind-load-local and kind-load-local-test — these run kind load docker-image, which injects a local Docker image directly into the kind cluster's containerd image store, bypassing the need for a registry mirror entirely. This replaces what containerdConfigPatches used to do: instead of configuring containerd to pull from the local registry over the network, the image is pre-loaded directly. The chart already sets imagePullPolicy: IfNotPresent, so Kubernetes uses the pre-loaded image without attempting a network pull. 2. CONTROLLER_TOOLS_VERSION bumped from v0.14.0 to v0.20.1 — v0.14.0 depends on golang.org/x/tools@v0.16.1, which fails to compile with Go 1.25+ due to a negative array length constant bug. v0.20.1 is compatible. --- Makefile | 10 +++++++++- e2e/e2e.sh | 9 ++++++--- e2e/kind.sh | 5 ----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index cd597da7..75964331 100644 --- a/Makefile +++ b/Makefile @@ -129,6 +129,10 @@ docker-build-local-test: ## Build docker image with the manager for test on kind docker-push-local-test: ## Push docker image with the manager to kind registry. docker push ${IMG_KIND}:${TEST_IMG_TAG} +.PHONY: kind-load-local-test +kind-load-local-test: ## Load test docker image into kind cluster directly (no registry mirror needed). + kind load docker-image ${IMG_KIND}:${TEST_IMG_TAG} + .PHONY: deploy-testjob deploy-testjob: ## Run a wikipedia test pod kubectl create job wiki-test --image=${IMG_KIND}:${TEST_IMG_TAG} -- sh /wikipedia-test.sh @@ -194,6 +198,10 @@ docker-build-local: ## Build docker image with the manager for kind registry. docker-push-local: ## Push docker image with the manager to kind registry. docker push ${IMG_KIND}:${IMG_TAG} +.PHONY: kind-load-local +kind-load-local: ## Load docker image into kind cluster directly (no registry mirror needed). + kind load docker-image ${IMG_KIND}:${IMG_TAG} + # PLATFORMS defines the target platforms for the manager image be build to provide support to multiple # architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to: # - able to use docker buildx . More info: https://docs.docker.com/build/buildx/ @@ -269,7 +277,7 @@ RAT_JAR ?= $(LOCALBIN)/apache-rat.jar ## Tool Versions KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.14.0 +CONTROLLER_TOOLS_VERSION ?= v0.20.1 GEN_CRD_API_REF_VERSION ?= v0.3.0 RAT_VERSION ?= 0.17 diff --git a/e2e/e2e.sh b/e2e/e2e.sh index 9c0568fa..4696696c 100755 --- a/e2e/e2e.sh +++ b/e2e/e2e.sh @@ -20,7 +20,8 @@ set -o errexit set -x # Get Kind -go install sigs.k8s.io/kind@v0.21.0 +go install sigs.k8s.io/kind@v0.31.0 +export PATH="$(go env GOPATH)/bin:$PATH" # minio statefulset name MINIO_STS_NAME=myminio-minio # druid namespace @@ -33,12 +34,14 @@ make vet make kind # build local docker druid operator image make docker-build-local -# push to kind registry +# push to kind registry and load directly into kind cluster make docker-push-local +make kind-load-local # build local docker test image make docker-build-local-test -# push to kind registry +# push to kind registry and load directly into kind cluster make docker-push-local-test +make kind-load-local-test # try to install the CRD with make make install # install druid-operator diff --git a/e2e/kind.sh b/e2e/kind.sh index b7850e97..c23a93ea 100755 --- a/e2e/kind.sh +++ b/e2e/kind.sh @@ -36,14 +36,9 @@ then kubectl config use-context kind-kind else -# create a cluster with the local registry enabled in containerd cat < Date: Mon, 2 Mar 2026 22:06:50 -0500 Subject: [PATCH 4/6] Create .asf.yaml --- .asf.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .asf.yaml diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 00000000..48467377 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,34 @@ +# note: documentation can be found here https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features + +github: + description: 'Apache Druid Operator: a Kubernetes operator for Apache Druid.' + homepage: https://druid.apache.org/ + + # Attempt to make the auto-generated github emails more easily readable in email clients. + # Configuration adapted from https://github.com/apache/plc4x/blob/develop/.asf.yaml. + custom_subjects: + new_pr: "[PR] {title} ({repository})" + close_pr: "Re: [PR] {title} ({repository})" + comment_pr: "Re: [PR] {title} ({repository})" + diffcomment: "Re: [PR] {title} ({repository})" + merge_pr: "Re: [PR] {title} ({repository})" + new_issue: "[I] {title} ({repository})" + comment_issue: "Re: [I] {title} ({repository})" + close_issue: "Re: [I] {title} ({repository})" + catchall: "[GH] {title} ({repository})" + new_discussion: "[D] {title} ({repository})" + edit_discussion: "Re: [D] {title} ({repository})" + close_discussion: "Re: [D] {title} ({repository})" + close_discussion_with_comment: "Re: [D] {title} ({repository})" + reopen_discussion: "Re: [D] {title} ({repository})" + new_comment_discussion: "Re: [D] {title} ({repository})" + edit_comment_discussion: "Re: [D] {title} ({repository})" + delete_comment_discussion: "Re: [D] {title} ({repository})" + +notifications: + commits: commits@druid.apache.org + issues: commits@druid.apache.org + discussions: commits@druid.apache.org + pullrequests_status: commits@druid.apache.org + pullrequests_comment: commits@druid.apache.org + pullrequests_bot_dependabot: commits@druid.apache.org From 4eefd9c4d706294e726ee396ec841daae5136cae Mon Sep 17 00:00:00 2001 From: Razin Bouzar Date: Thu, 5 Mar 2026 18:14:48 -0500 Subject: [PATCH 5/6] Remove references to datainfrahq repo --- PROJECT | 6 +-- apis/druid/v1alpha1/druid_types.go | 4 +- apis/druid/v1alpha1/druidingestion_types.go | 4 +- chart/templates/NOTES.txt | 2 +- controllers/druid/additional_containers.go | 4 +- .../druid/additional_containers_test.go | 4 +- controllers/druid/configuration.go | 4 +- controllers/druid/deep_storage_dep_mgmt.go | 6 +-- controllers/druid/druid_controller.go | 4 +- controllers/druid/druid_controller_test.go | 4 +- controllers/druid/dynamic_config.go | 10 ++--- controllers/druid/finalizers.go | 4 +- controllers/druid/finalizers_test.go | 4 +- controllers/druid/handler.go | 4 +- controllers/druid/handler_test.go | 4 +- controllers/druid/interface.go | 4 +- controllers/druid/metadata_store_dep_mgmt.go | 6 +-- controllers/druid/ordering.go | 4 +- controllers/druid/ordering_test.go | 4 +- controllers/druid/status.go | 4 +- controllers/druid/suite_test.go | 2 +- controllers/druid/util_test.go | 4 +- controllers/druid/volume_expansion.go | 4 +- controllers/druid/volume_expansion_test.go | 4 +- controllers/druid/zookeeper_dep_mgmt.go | 6 +-- controllers/druid/zookeeper_dep_mgmt_test.go | 4 +- controllers/ingestion/ingestion_controller.go | 6 +-- controllers/ingestion/reconciler.go | 38 ++++++++----------- controllers/ingestion/reconciler_test.go | 6 +-- docs/api_specifications/druid.md | 8 ++-- docs/kubebuilder_v3_migration.md | 4 +- go.mod | 3 +- go.sum | 2 - main.go | 8 ++-- pkg/druidapi/druidapi.go | 4 +- pkg/druidapi/druidapi_test.go | 4 +- 36 files changed, 94 insertions(+), 103 deletions(-) diff --git a/PROJECT b/PROJECT index 3e13bd8a..e5e1c46e 100644 --- a/PROJECT +++ b/PROJECT @@ -7,7 +7,7 @@ layout: - go.kubebuilder.io/v3 multigroup: true projectName: druid-operator -repo: github.com/datainfrahq/druid-operator +repo: github.com/apache/druid-operator resources: - api: crdVersion: v1 @@ -16,7 +16,7 @@ resources: domain: apache.org group: druid kind: Druid - path: github.com/datainfrahq/druid-operator/apis/druid/v1alpha1 + path: github.com/apache/druid-operator/apis/druid/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -25,6 +25,6 @@ resources: domain: apache.org group: druid kind: DruidIngestion - path: github.com/datainfrahq/druid-operator/apis/druid/v1alpha1 + path: github.com/apache/druid-operator/apis/druid/v1alpha1 version: v1alpha1 version: "3" diff --git a/apis/druid/v1alpha1/druid_types.go b/apis/druid/v1alpha1/druid_types.go index ca2ea28e..34c68a1d 100644 --- a/apis/druid/v1alpha1/druid_types.go +++ b/apis/druid/v1alpha1/druid_types.go @@ -7,7 +7,7 @@ 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 + 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 @@ -21,7 +21,7 @@ package v1alpha1 import ( "encoding/json" - druidapi "github.com/datainfrahq/druid-operator/pkg/druidapi" + druidapi "github.com/apache/druid-operator/pkg/druidapi" appsv1 "k8s.io/api/apps/v1" autoscalev2 "k8s.io/api/autoscaling/v2" v1 "k8s.io/api/core/v1" diff --git a/apis/druid/v1alpha1/druidingestion_types.go b/apis/druid/v1alpha1/druidingestion_types.go index 3109ef23..72c57e3a 100644 --- a/apis/druid/v1alpha1/druidingestion_types.go +++ b/apis/druid/v1alpha1/druidingestion_types.go @@ -7,7 +7,7 @@ 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 + 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 @@ -19,7 +19,7 @@ under the License. package v1alpha1 import ( - druidapi "github.com/datainfrahq/druid-operator/pkg/druidapi" + druidapi "github.com/apache/druid-operator/pkg/druidapi" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/chart/templates/NOTES.txt b/chart/templates/NOTES.txt index 1e1ad41f..5746d744 100644 --- a/chart/templates/NOTES.txt +++ b/chart/templates/NOTES.txt @@ -17,4 +17,4 @@ # under the License. # -Refer to https://github.com/datainfrahq/druid-operator/blob/master/docs/README.md to get started. +Refer to https://github.com/apache/druid-operator/blob/master/docs/README.md to get started. diff --git a/controllers/druid/additional_containers.go b/controllers/druid/additional_containers.go index 0ef40b48..ab6d0d6d 100644 --- a/controllers/druid/additional_containers.go +++ b/controllers/druid/additional_containers.go @@ -7,7 +7,7 @@ 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 + 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 @@ -21,7 +21,7 @@ package druid import ( "fmt" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" v1 "k8s.io/api/core/v1" ) diff --git a/controllers/druid/additional_containers_test.go b/controllers/druid/additional_containers_test.go index fe32a789..3c0f5fac 100644 --- a/controllers/druid/additional_containers_test.go +++ b/controllers/druid/additional_containers_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/apps/v1" diff --git a/controllers/druid/configuration.go b/controllers/druid/configuration.go index d4510646..adf47e5c 100644 --- a/controllers/druid/configuration.go +++ b/controllers/druid/configuration.go @@ -7,7 +7,7 @@ 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 + 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 @@ -22,7 +22,7 @@ import ( "context" "fmt" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/druid/deep_storage_dep_mgmt.go b/controllers/druid/deep_storage_dep_mgmt.go index 52c27fe6..d21ae7d9 100644 --- a/controllers/druid/deep_storage_dep_mgmt.go +++ b/controllers/druid/deep_storage_dep_mgmt.go @@ -7,7 +7,7 @@ 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 + 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 @@ -23,8 +23,8 @@ import ( "fmt" "reflect" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" - "github.com/datainfrahq/druid-operator/controllers/druid/ext" + "github.com/apache/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/controllers/druid/ext" ) var deepStorageExtTypes = map[string]reflect.Type{} diff --git a/controllers/druid/druid_controller.go b/controllers/druid/druid_controller.go index f176917a..b91dc14a 100644 --- a/controllers/druid/druid_controller.go +++ b/controllers/druid/druid_controller.go @@ -7,7 +7,7 @@ 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 + 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 @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/reconcile" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" ) // DruidReconciler reconciles a Druid object diff --git a/controllers/druid/druid_controller_test.go b/controllers/druid/druid_controller_test.go index 5e63a1b3..457defa7 100644 --- a/controllers/druid/druid_controller_test.go +++ b/controllers/druid/druid_controller_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -22,7 +22,7 @@ import ( "fmt" "time" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/controllers/druid/dynamic_config.go b/controllers/druid/dynamic_config.go index 72963c97..6cfd170a 100644 --- a/controllers/druid/dynamic_config.go +++ b/controllers/druid/dynamic_config.go @@ -7,7 +7,7 @@ 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 + 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 @@ -23,10 +23,10 @@ import ( "fmt" "net/http" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" - druidapi "github.com/datainfrahq/druid-operator/pkg/druidapi" - internalhttp "github.com/datainfrahq/druid-operator/pkg/http" - "github.com/datainfrahq/druid-operator/pkg/util" + "github.com/apache/druid-operator/apis/druid/v1alpha1" + druidapi "github.com/apache/druid-operator/pkg/druidapi" + internalhttp "github.com/apache/druid-operator/pkg/http" + "github.com/apache/druid-operator/pkg/util" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/controllers/druid/finalizers.go b/controllers/druid/finalizers.go index 768803a4..0cb9feab 100644 --- a/controllers/druid/finalizers.go +++ b/controllers/druid/finalizers.go @@ -7,7 +7,7 @@ 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 + 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 @@ -23,7 +23,7 @@ import ( "encoding/json" "fmt" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" diff --git a/controllers/druid/finalizers_test.go b/controllers/druid/finalizers_test.go index 7a9d6a68..9bb57d1a 100644 --- a/controllers/druid/finalizers_test.go +++ b/controllers/druid/finalizers_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -21,7 +21,7 @@ package druid import ( "time" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/druid/handler.go b/controllers/druid/handler.go index 992eefaa..b236ef44 100644 --- a/controllers/druid/handler.go +++ b/controllers/druid/handler.go @@ -7,7 +7,7 @@ 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 + 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 @@ -33,7 +33,7 @@ import ( autoscalev2 "k8s.io/api/autoscaling/v2" networkingv1 "k8s.io/api/networking/v1" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" policyv1 "k8s.io/api/policy/v1" diff --git a/controllers/druid/handler_test.go b/controllers/druid/handler_test.go index d31fed6a..88d4d834 100644 --- a/controllers/druid/handler_test.go +++ b/controllers/druid/handler_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -30,7 +30,7 @@ import ( corev1 "k8s.io/api/core/v1" policyv1 "k8s.io/api/policy/v1" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" ) // +kubebuilder:docs-gen:collapse=Imports diff --git a/controllers/druid/interface.go b/controllers/druid/interface.go index 90f2d84a..10966320 100644 --- a/controllers/druid/interface.go +++ b/controllers/druid/interface.go @@ -7,7 +7,7 @@ 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 + 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 @@ -23,7 +23,7 @@ import ( "fmt" "reflect" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/controllers/druid/metadata_store_dep_mgmt.go b/controllers/druid/metadata_store_dep_mgmt.go index fdeb0d8c..5a5875e4 100644 --- a/controllers/druid/metadata_store_dep_mgmt.go +++ b/controllers/druid/metadata_store_dep_mgmt.go @@ -7,7 +7,7 @@ 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 + 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 @@ -23,8 +23,8 @@ import ( "fmt" "reflect" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" - "github.com/datainfrahq/druid-operator/controllers/druid/ext" + "github.com/apache/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/controllers/druid/ext" ) var metadataStoreExtTypes = map[string]reflect.Type{} diff --git a/controllers/druid/ordering.go b/controllers/druid/ordering.go index 9f6dc476..b2881245 100644 --- a/controllers/druid/ordering.go +++ b/controllers/druid/ordering.go @@ -7,7 +7,7 @@ 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 + 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 @@ -18,7 +18,7 @@ under the License. */ package druid -import "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" +import "github.com/apache/druid-operator/apis/druid/v1alpha1" var ( druidServicesOrder = []string{historical, overlord, middleManager, indexer, broker, coordinator, router} diff --git a/controllers/druid/ordering_test.go b/controllers/druid/ordering_test.go index 77fbe80a..d48212b7 100644 --- a/controllers/druid/ordering_test.go +++ b/controllers/druid/ordering_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -21,7 +21,7 @@ package druid import ( "time" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/druid/status.go b/controllers/druid/status.go index 8a97b0af..da940e84 100644 --- a/controllers/druid/status.go +++ b/controllers/druid/status.go @@ -7,7 +7,7 @@ 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 + 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 @@ -24,7 +24,7 @@ import ( "fmt" "reflect" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/druid/suite_test.go b/controllers/druid/suite_test.go index c65aaafb..81d311b9 100644 --- a/controllers/druid/suite_test.go +++ b/controllers/druid/suite_test.go @@ -35,7 +35,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/log/zap" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/controllers/druid/util_test.go b/controllers/druid/util_test.go index 07d86a72..56524080 100644 --- a/controllers/druid/util_test.go +++ b/controllers/druid/util_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -25,7 +25,7 @@ import ( . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" ) // +kubebuilder:docs-gen:collapse=Imports diff --git a/controllers/druid/volume_expansion.go b/controllers/druid/volume_expansion.go index b768768a..9f19e154 100644 --- a/controllers/druid/volume_expansion.go +++ b/controllers/druid/volume_expansion.go @@ -7,7 +7,7 @@ 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 + 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 @@ -23,7 +23,7 @@ import ( "errors" "fmt" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" storage "k8s.io/api/storage/v1" diff --git a/controllers/druid/volume_expansion_test.go b/controllers/druid/volume_expansion_test.go index 9e97dd10..a4ec364c 100644 --- a/controllers/druid/volume_expansion_test.go +++ b/controllers/druid/volume_expansion_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -21,7 +21,7 @@ package druid import ( "time" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/types" diff --git a/controllers/druid/zookeeper_dep_mgmt.go b/controllers/druid/zookeeper_dep_mgmt.go index 1e72617b..59595c77 100644 --- a/controllers/druid/zookeeper_dep_mgmt.go +++ b/controllers/druid/zookeeper_dep_mgmt.go @@ -7,7 +7,7 @@ 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 + 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 @@ -23,8 +23,8 @@ import ( "fmt" "reflect" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" - "github.com/datainfrahq/druid-operator/controllers/druid/ext" + "github.com/apache/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/controllers/druid/ext" ) var zkExtTypes = map[string]reflect.Type{} diff --git a/controllers/druid/zookeeper_dep_mgmt_test.go b/controllers/druid/zookeeper_dep_mgmt_test.go index ae645246..d6ed0c84 100644 --- a/controllers/druid/zookeeper_dep_mgmt_test.go +++ b/controllers/druid/zookeeper_dep_mgmt_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" ) // +kubebuilder:docs-gen:collapse=Imports diff --git a/controllers/ingestion/ingestion_controller.go b/controllers/ingestion/ingestion_controller.go index b0ec3e0d..33bc5bfd 100644 --- a/controllers/ingestion/ingestion_controller.go +++ b/controllers/ingestion/ingestion_controller.go @@ -7,7 +7,7 @@ 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 + 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 @@ -32,8 +32,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" ) // IngestionReconciler diff --git a/controllers/ingestion/reconciler.go b/controllers/ingestion/reconciler.go index e7bf5d5d..09f5eb94 100644 --- a/controllers/ingestion/reconciler.go +++ b/controllers/ingestion/reconciler.go @@ -7,7 +7,7 @@ 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 + 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 @@ -27,12 +27,11 @@ import ( "reflect" "time" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" - "github.com/datainfrahq/druid-operator/controllers/druid" - druidapi "github.com/datainfrahq/druid-operator/pkg/druidapi" - internalhttp "github.com/datainfrahq/druid-operator/pkg/http" - "github.com/datainfrahq/druid-operator/pkg/util" - "github.com/datainfrahq/operator-runtime/builder" + "github.com/apache/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/controllers/druid" + druidapi "github.com/apache/druid-operator/pkg/druidapi" + internalhttp "github.com/apache/druid-operator/pkg/http" + "github.com/apache/druid-operator/pkg/util" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -69,11 +68,7 @@ func (r *DruidIngestionReconciler) do(ctx context.Context, di *v1alpha1.DruidIng return err } - build := builder.NewBuilder( - builder.ToNewBuilderRecorder(builder.BuilderRecorder{Recorder: r.Recorder, ControllerName: "DruidIngestionController"}), - ) - - _, err = r.CreateOrUpdate(di, svcName, *build, internalhttp.Auth{BasicAuth: basicAuth}) + _, err = r.CreateOrUpdate(di, svcName, internalhttp.Auth{BasicAuth: basicAuth}) if err != nil { return err } @@ -110,14 +105,14 @@ func (r *DruidIngestionReconciler) do(ctx context.Context, di *v1alpha1.DruidIng return err } if respShutDownTask.StatusCode != 200 { - build.Recorder.GenericEvent( + r.Recorder.Event( di, v1.EventTypeWarning, fmt.Sprintf("Resp [%s], StatusCode [%d]", string(respShutDownTask.ResponseBody), respShutDownTask.StatusCode), DruidIngestionControllerShutDownFail, ) } else { - build.Recorder.GenericEvent( + r.Recorder.Event( di, v1.EventTypeNormal, fmt.Sprintf("Resp [%s], StatusCode [%d]", string(respShutDownTask.ResponseBody), respShutDownTask.StatusCode), @@ -364,7 +359,6 @@ func (r *DruidIngestionReconciler) UpdateRules( func (r *DruidIngestionReconciler) CreateOrUpdate( di *v1alpha1.DruidIngestion, svcName string, - build builder.Builder, auth internalhttp.Auth, ) (controllerutil.OperationResult, error) { @@ -420,13 +414,13 @@ func (r *DruidIngestionReconciler) CreateOrUpdate( if err != nil { return controllerutil.OperationResultNone, err } - build.Recorder.GenericEvent( + r.Recorder.Event( di, v1.EventTypeNormal, fmt.Sprintf("Resp [%s]", string(respCreateTask.ResponseBody)), DruidIngestionControllerCreateSuccess, ) - build.Recorder.GenericEvent( + r.Recorder.Event( di, v1.EventTypeNormal, fmt.Sprintf("Resp [%s], Result [%s]", string(respCreateTask.ResponseBody), result), @@ -449,7 +443,7 @@ func (r *DruidIngestionReconciler) CreateOrUpdate( if err != nil { return controllerutil.OperationResultNone, err } - build.Recorder.GenericEvent( + r.Recorder.Event( di, v1.EventTypeWarning, fmt.Sprintf("Resp [%s], Status", string(respCreateTask.ResponseBody)), @@ -501,13 +495,13 @@ func (r *DruidIngestionReconciler) CreateOrUpdate( if err != nil { return controllerutil.OperationResultNone, err } - build.Recorder.GenericEvent( + r.Recorder.Event( di, v1.EventTypeNormal, fmt.Sprintf("Resp [%s]", string(respUpdateSpec.ResponseBody)), DruidIngestionControllerUpdateSuccess, ) - build.Recorder.GenericEvent( + r.Recorder.Event( di, v1.EventTypeNormal, fmt.Sprintf("Resp [%s], Result [%s]", string(respUpdateSpec.ResponseBody), result), @@ -534,7 +528,7 @@ func (r *DruidIngestionReconciler) CreateOrUpdate( if err != nil { return controllerutil.OperationResultNone, err } - build.Recorder.GenericEvent( + r.Recorder.Event( di, v1.EventTypeNormal, "compaction updated", @@ -564,7 +558,7 @@ func (r *DruidIngestionReconciler) CreateOrUpdate( if err != nil { return controllerutil.OperationResultNone, err } - build.Recorder.GenericEvent( + r.Recorder.Event( di, v1.EventTypeNormal, "rules updated", diff --git a/controllers/ingestion/reconciler_test.go b/controllers/ingestion/reconciler_test.go index cec5d5de..b55beb3e 100644 --- a/controllers/ingestion/reconciler_test.go +++ b/controllers/ingestion/reconciler_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -23,9 +23,9 @@ import ( "net/http/httptest" "testing" - "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" + "github.com/apache/druid-operator/apis/druid/v1alpha1" - internalhttp "github.com/datainfrahq/druid-operator/pkg/http" + internalhttp "github.com/apache/druid-operator/pkg/http" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/runtime" diff --git a/docs/api_specifications/druid.md b/docs/api_specifications/druid.md index aeebb857..687e50f0 100644 --- a/docs/api_specifications/druid.md +++ b/docs/api_specifications/druid.md @@ -891,7 +891,7 @@ k8s.io/apimachinery/pkg/runtime.RawExtension auth
-github.com/datainfrahq/druid-operator/pkg/druidapi.Auth +github.com/apache/druid-operator/pkg/druidapi.Auth @@ -1147,7 +1147,7 @@ IngestionSpec auth
-github.com/datainfrahq/druid-operator/pkg/druidapi.Auth +github.com/apache/druid-operator/pkg/druidapi.Auth @@ -1232,7 +1232,7 @@ IngestionSpec auth
-github.com/datainfrahq/druid-operator/pkg/druidapi.Auth +github.com/apache/druid-operator/pkg/druidapi.Auth @@ -2721,7 +2721,7 @@ k8s.io/apimachinery/pkg/runtime.RawExtension auth
-github.com/datainfrahq/druid-operator/pkg/druidapi.Auth +github.com/apache/druid-operator/pkg/druidapi.Auth diff --git a/docs/kubebuilder_v3_migration.md b/docs/kubebuilder_v3_migration.md index 875b3c0f..ba2566af 100644 --- a/docs/kubebuilder_v3_migration.md +++ b/docs/kubebuilder_v3_migration.md @@ -133,7 +133,7 @@ There are two ways you can choose to deploy the new YAMLs: ```shell # Set the tag you want for the controller cd config/manager -kustomize edit set image controller=datainfrahq/druid-operator:${IMG_TAG} +kustomize edit set image controller=apache/druid-operator:${IMG_TAG} # Back to root and apply cd ../../ kustomize build config/default | kubectl apply -f - @@ -152,7 +152,7 @@ kustomize edit set namespace druid-operator cd ../../ # Set the tag you want for the controller cd config/manager -kustomize edit set image controller=datainfrahq/druid-operator:${IMG_TAG} +kustomize edit set image controller=apache/druid-operator:${IMG_TAG} cd ../../ ``` 2. Apply the YAMLs diff --git a/go.mod b/go.mod index 9af90909..c8127cde 100644 --- a/go.mod +++ b/go.mod @@ -15,12 +15,11 @@ // specific language governing permissions and limitations // under the License. -module github.com/datainfrahq/druid-operator +module github.com/apache/druid-operator go 1.20 require ( - github.com/datainfrahq/operator-runtime v0.0.2-0.20230425161705-667c247a660b github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v1.2.4 github.com/onsi/ginkgo/v2 v2.9.5 diff --git a/go.sum b/go.sum index 43ed29b7..4b8f85b5 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,6 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/datainfrahq/operator-runtime v0.0.2-0.20230425161705-667c247a660b h1:BuG3c4Gh7l44zBdEGiwXQHwI0f2nZ3igBjpByr89928= -github.com/datainfrahq/operator-runtime v0.0.2-0.20230425161705-667c247a660b/go.mod h1:Pd4ny0zdmpQIBYtZnK1knh0DFqUQ6LIdi71DsAXDr3E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/main.go b/main.go index 8d13dba1..03bcb189 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ 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 + 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 @@ -23,7 +23,7 @@ import ( "os" "strings" - "github.com/datainfrahq/druid-operator/controllers/druid" + "github.com/apache/druid-operator/controllers/druid" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -36,8 +36,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - druidv1alpha1 "github.com/datainfrahq/druid-operator/apis/druid/v1alpha1" - druidingestioncontrollers "github.com/datainfrahq/druid-operator/controllers/ingestion" + druidv1alpha1 "github.com/apache/druid-operator/apis/druid/v1alpha1" + druidingestioncontrollers "github.com/apache/druid-operator/controllers/ingestion" //+kubebuilder:scaffold:imports ) diff --git a/pkg/druidapi/druidapi.go b/pkg/druidapi/druidapi.go index 7a635fe5..3cf4749b 100644 --- a/pkg/druidapi/druidapi.go +++ b/pkg/druidapi/druidapi.go @@ -7,7 +7,7 @@ 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 + 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 @@ -25,7 +25,7 @@ import ( "net/url" "path" - internalhttp "github.com/datainfrahq/druid-operator/pkg/http" + internalhttp "github.com/apache/druid-operator/pkg/http" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/druidapi/druidapi_test.go b/pkg/druidapi/druidapi_test.go index 91a173b2..ebcb6dbd 100644 --- a/pkg/druidapi/druidapi_test.go +++ b/pkg/druidapi/druidapi_test.go @@ -7,7 +7,7 @@ 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 + 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 @@ -20,7 +20,7 @@ package druidapi import ( "context" - internalhttp "github.com/datainfrahq/druid-operator/pkg/http" + internalhttp "github.com/apache/druid-operator/pkg/http" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" From a6c0d1fbe36e973c13422f8f8ebf651e3a7889a0 Mon Sep 17 00:00:00 2001 From: Razin Bouzar Date: Thu, 5 Mar 2026 18:36:22 -0500 Subject: [PATCH 6/6] Delete MAINTAINERS.md --- MAINTAINERS.md | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 MAINTAINERS.md diff --git a/MAINTAINERS.md b/MAINTAINERS.md deleted file mode 100644 index 6eb02c57..00000000 --- a/MAINTAINERS.md +++ /dev/null @@ -1,28 +0,0 @@ - -# Maintainers for the druid operator project. - -- [Adheip Singh](https://github.com/AdheipSingh) -- [TessaIO](https://github.com/TessaIO) - -# Collaborators for the druid operator project - -- [Itamar Marom](https://github.com/itamar-marom) -- [Cyril Corbon](https://github.com/cyril-corbon) -- [Avtar Singh](https://github.com/avtarOPS)