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) 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"