added SupervisorSpec CRD

.gitignore

@@ -78,3 +78,7 @@ tags
 .idea*
 .idea/*
 # End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
+
+# dev files
+cluster.yaml
+supervisor-spec.yaml

.tool-versions

@@ -0,0 +1 @@
+kubebuilder 3.9.1

Makefile

@@ -96,9 +96,19 @@ deploy-testjob: ## Run a wikipedia test pod
 
 .PHONY: helm-install-druid-operator
 helm-install-druid-operator: ## Helm install to deploy the druid operator
+	helm upgrade --install \
+	--namespace zookeeper \
+	--create-namespace \
+	zookeeper bitnami/zookeeper
 	helm upgrade --install \
 	--namespace ${NAMESPACE_DRUID_OPERATOR} \
 	--create-namespace \
+	--set auth.username=druid \
+	--set auth.password=druid \
+	--set auth.database=druid \
+	mysql bitnami/mysql
+	helm upgrade --install \
+	--namespace ${NAMESPACE_DRUID_OPERATOR} \
 	${NAMESPACE_DRUID_OPERATOR} chart/ \
 	--set image.repository=${IMG_KIND} \
 	--set image.tag=${IMG_TAG}

PROJECT

@@ -18,4 +18,8 @@ resources:
   kind: Druid
   path: github.com/datainfrahq/druid-operator/apis/druid/v1alpha1
   version: v1alpha1
+- group: druid
+  kind: SupervisorSpec
+  path: github.com/datainfrahq/druid-operator/apis/supervisorspec/v1alpha1
+  version: v1alpha1
 version: "3"

README.md

@@ -33,6 +33,9 @@ Feel free to join Kubernetes slack and join [druid-operator](https://kubernetes.
 - The operator supports CR of type ```Druid```.
 - ```Druid``` CR belongs to api Group ```druid.apache.org``` and version ```v1alpha1```
 
+- The operator supports CR of type ```SupervisorSpec```.
+- ```SupervisorSpec``` CR belongs to api Group ```druid.apache.org``` and version ```v1alpha1```
+
 ### Druid Operator Architecture
 
 ![Druid Operator](docs/images/druid-operator.png?raw=true "Druid Operator")

apis/druid/v1alpha1/supervisorspec_types.go

@@ -0,0 +1,45 @@
+/*
+
+ */
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
+// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
+
+// SupervisorSpecSpec defines the desired state of SupervisorSpec
+type SupervisorSpecSpec struct {
+	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+
+	// Foo is an example field of SupervisorSpec. Edit supervisorspec_types.go to remove/update
+	ClusterRef     string `json:"clusterRef,omitempty"`
+	SupervisorSpec string `json:"supervisorSpec,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// SupervisorSpec is the Schema for the supervisorspecs API
+type SupervisorSpec struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec SupervisorSpecSpec `json:"spec,omitempty"`
+}
+
+//+kubebuilder:object:root=true
+
+// SupervisorSpecList contains a list of SupervisorSpec
+type SupervisorSpecList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []SupervisorSpec `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&SupervisorSpec{}, &SupervisorSpecList{})
+}

chart/templates/crds/druid.apache.org_supervisorspecs.yaml

@@ -0,0 +1,47 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.11.2
+  creationTimestamp: null
+  name: supervisorspecs.druid.apache.org
+spec:
+  group: druid.apache.org
+  names:
+    kind: SupervisorSpec
+    listKind: SupervisorSpecList
+    plural: supervisorspecs
+    singular: supervisorspec
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: SupervisorSpec is the Schema for the supervisorspecs API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: SupervisorSpecSpec defines the desired state of SupervisorSpec
+            properties:
+              clusterRef:
+                description: Foo is an example field of SupervisorSpec. Edit supervisorspec_types.go
+                  to remove/update
+                type: string
+              supervisorSpec:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true

chart/templates/rbac_manager.yaml

@@ -110,6 +110,7 @@ rules:
     - druid.apache.org
   resources:
     - druids
+    - supervisorspecs
   verbs:
     - create
     - delete
@@ -122,6 +123,7 @@ rules:
     - druid.apache.org
   resources:
     - druids/status
+    - supervisorspecs/status
   verbs:
     - get
     - patch
@@ -268,6 +270,7 @@ rules:
     - druid.apache.org
   resources:
     - druids
+    - supervisorspecs
   verbs:
     - create
     - delete
@@ -280,6 +283,7 @@ rules:
     - druid.apache.org
   resources:
     - druids/status
+    - supervisorspecs/status
   verbs:
     - get
     - patch

config/crd/bases/druid.apache.org_supervisorspecs.yaml

@@ -0,0 +1,47 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.11.2
+  creationTimestamp: null
+  name: supervisorspecs.druid.apache.org
+spec:
+  group: druid.apache.org
+  names:
+    kind: SupervisorSpec
+    listKind: SupervisorSpecList
+    plural: supervisorspecs
+    singular: supervisorspec
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: SupervisorSpec is the Schema for the supervisorspecs API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: SupervisorSpecSpec defines the desired state of SupervisorSpec
+            properties:
+              clusterRef:
+                description: Foo is an example field of SupervisorSpec. Edit supervisorspec_types.go
+                  to remove/update
+                type: string
+              supervisorSpec:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true

config/crd/kustomization.yaml

@@ -3,17 +3,20 @@
 # It should be run by config/default
 resources:
 - bases/druid.apache.org_druids.yaml
+- bases/druid.apache.org_supervisorspecs.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 #- patches/webhook_in_druids.yaml
+#- patches/webhook_in_supervisorspecs.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
 #- patches/cainjection_in_druids.yaml
+#- patches/cainjection_in_supervisorspecs.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

config/crd/patches/cainjection_in_supervisorspecs.yaml

@@ -0,0 +1,8 @@
+# The following patch adds a directive for certmanager to inject CA into the CRD
+# CRD conversion requires k8s 1.13 or later.
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
+  name: supervisorspecs.druid.apache.org

config/crd/patches/webhook_in_supervisorspecs.yaml

@@ -0,0 +1,17 @@
+# The following patch enables conversion webhook for CRD
+# CRD conversion requires k8s 1.13 or later.
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: supervisorspecs.druid.apache.org
+spec:
+  conversion:
+    strategy: Webhook
+    webhookClientConfig:
+      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
+      caBundle: Cg==
+      service:
+        namespace: system
+        name: webhook-service
+        path: /convert