feat: Move policy/v1beta1 to policy/v1 for K8s 1.25+ compatability

.github/workflows/docker-image.yml

@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: Druid Operator
 
 on:
   push:
@@ -18,5 +18,5 @@ jobs:
       run: make lint
     - name: Run helm template
       run: make template
-    - name: Build the Docker image
-      run: docker build . -t druidio/druid-operator:$(date +%s)
+    - name: Run e2e tests
+      run: make e2e

LICENSE

@@ -11,3 +11,17 @@ 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.
+---
+Copyright 2023 Cloudnatively Services, Pvt Ltd
+
+Licensed 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.

Makefile

@@ -1,7 +1,20 @@
+# IMG TAG
+IMG_TAG ?= "latest"
 # Image URL to use all building/pushing image targets
-IMG ?= "druid-operator:latest"
+IMG ?= "druid-operator"
+# Local Image URL to be pushed to kind registery
+IMG_KIND ?= "localhost:5001/druid-operator"
+# NAMESPACE for druid operator e2e
+NAMESPACE_DRUID_OPERATOR ?= "druid-operator"
+# NAMESPACE for zk operator e2e
+NAMESPACE_ZK_OPERATOR ?= "zk-operator"
+# NAMESPACE for zk operator e2e
+NAMESPACE_MINIO_OPERATOR ?= "minio-operator"
+# NAMESPACE for druid app e2e
+NAMESPACE_DRUID ?= "druid"
+
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.24.2
+ENVTEST_K8S_VERSION = 1.25.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -77,11 +90,11 @@ template:
 
 .PHONY: docker-build
 docker-build: test ## Build docker image with the manager.
-	docker build -t ${IMG} .
+	docker build -t ${IMG}:${IMG_TAG} .
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.
-	docker push ${IMG}
+	docker push ${IMG}:${IMG_TAG}
 
 ##@ Deployment
 
@@ -99,7 +112,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}:${IMG_TAG}
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
 .PHONY: undeploy
@@ -137,3 +150,50 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
 	test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+
+## e2e deployment
+.PHONY: e2e
+e2e: 
+	e2e/e2e.sh
+
+## Build Kind
+.PHONY: kind 
+kind: ## Bootstrap Kind Locally
+	sh e2e/kind.sh
+
+## Make Docker build for kind registery
+.PHONY: docker-build-local
+docker-build-local: ## Build docker image with the manager.
+	docker build -t ${IMG_KIND}:${IMG_TAG} .
+
+## Make Docker push locally to kind registery
+.PHONY: docker-push-local
+docker-push-local: ## Build docker image with the manager.
+	docker push ${IMG_KIND}:${IMG_TAG}
+
+## Helm install to deploy the druid operator
+.PHONY: helm-install-druid-operator
+helm-install-druid-operator: ## helm upgrade/install
+	helm upgrade --install \
+	--namespace ${NAMESPACE_DRUID_OPERATOR} \
+	--create-namespace \
+	${NAMESPACE_DRUID_OPERATOR} chart/ \
+	--set image.repository=${IMG_KIND} \
+	--set image.tag=${IMG_TAG}
+
+## Helm deploy minio operator and minio
+.PHONY: helm-minio-install
+helm-minio-install:
+	helm repo add minio https://operator.min.io/
+	helm repo update minio
+	helm upgrade --install \
+	--namespace ${NAMESPACE_MINIO_OPERATOR} \
+	--create-namespace \
+	 ${NAMESPACE_MINIO_OPERATOR} minio/operator \
+	-f e2e/configs/minio-operator-override.yaml
+	helm upgrade --install \
+	--namespace ${NAMESPACE_DRUID} \
+	--create-namespace \
+  	${NAMESPACE_DRUID}-minio minio/tenant \
+	-f e2e/configs/minio-tenant-override.yaml
+

README.md

@@ -1,5 +1,5 @@
 # Kubernetes Operator for Apache Druid
-![Build Status](https://github.com/druid-io/druid-operator/actions/workflows/docker-image.yml/badge.svg) ![Docker pull](https://img.shields.io/docker/pulls/druidio/druid-operator.svg) [![Latest Version](https://img.shields.io/github/tag/druid-io/druid-operator)](https://github.com/druid-io/druid-operator/releases)
+![Build Status](https://github.com/datainfrahq/druid-operator/actions/workflows/docker-image.yml/badge.svg) ![Docker pull](https://img.shields.io/docker/pulls/druidio/druid-operator.svg) [![Latest Version](https://img.shields.io/github/tag/druid-io/druid-operator)](https://github.com/druid-io/druid-operator/releases)
 
 - druid-operator provisions and manages [Apache Druid](https://druid.apache.org/) cluster on kubernetes.
 - druid-operator is designed to provision and manage [Apache Druid](https://druid.apache.org/) in distributed mode only.
@@ -14,11 +14,12 @@
 - ```Druid``` CR belongs to api Group ```druid.apache.org``` and version ```v1alpha1```
 
 ### Notifications
-- Users may experience HPA issues with druid-operator with release 0.0.5, as described in the [issue]( https://github.com/druid-io/druid-operator/issues/160). 
+- Users may experience HPA issues with druid-operator with release 0.0.5, as described in the [issue]( https://github.com/druid-io/druid-operator/issues/160).
 - The latest release 0.0.6 has fixes for the above issue.
 - The operator has moved from HPA apiVersion autoscaling/v2beta1 to autoscaling/v2beta2 API users will need to update there HPA Specs according v2beta2 api in order to work with the latest druid-operator release.
 - Users may experience pvc deletion [issue](https://github.com/druid-io/druid-operator/issues/186) in release 0.0.6, this issue has been fixed in patch release 0.0.6.1.
 - druid-operator has moved Ingress apiVersion networking/v1beta1 to networking/v1. Users will need to update there Ingress Spec in the druid CR according networking/v1 syntax. In case users are using schema validated CRD, the CRD will also be needed to be updated.
+- druid-operator has moved PodDisruptionBudget apiVersion policy/v1beta1 to policy/v1. Users will need to update there Kubernetes versions to 1.21+ to use druid-operator-0.0.10+.
 
 ### Note
 Apache®, [Apache Druid, Druid®](https://druid.apache.org/) are either registered trademarks or trademarks of the Apache Software Foundation in the United States and/or other countries. This project, druid-operator, is not an Apache Software Foundation project.

apis/druid/v1alpha1/druid_types.go

@@ -7,7 +7,7 @@ import (
 	autoscalev2beta2 "k8s.io/api/autoscaling/v2beta2"
 	v1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
-	"k8s.io/api/policy/v1beta1"
+	policyv1 "k8s.io/api/policy/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -208,7 +208,7 @@ type DruidNodeSpec struct {
 	PodLabels map[string]string `json:"podLabels,omitempty"`
 
 	// Optional
-	PodDisruptionBudgetSpec *v1beta1.PodDisruptionBudgetSpec `json:"podDisruptionBudgetSpec,omitempty"`
+	PodDisruptionBudgetSpec *policyv1.PodDisruptionBudgetSpec `json:"podDisruptionBudgetSpec,omitempty"`
 
 	// Required
 	RuntimeProperties string `json:"runtime.properties"`