Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add compaction, rules, dynamic configurations, nativeSpec #197

Merged
merged 2 commits into from
Jan 23, 2025
Merged

Add compaction, rules, dynamic configurations, nativeSpec #197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9c659
Add compaction, rules, dynamic configurations, nativeSpec
jmcwilliams-te Jan 8, 2025
9cf3396
update strings in EmitEventGeneric() calls within dynamic_config.go t…
jmcwilliams-te Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apis/druid/v1alpha1/druid_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ package v1alpha1
import (
"encoding/json"

druidapi "github.com/datainfrahq/druid-operator/pkg/druidapi"
appsv1 "k8s.io/api/apps/v1"
autoscalev2 "k8s.io/api/autoscaling/v2"
v1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
policyv1 "k8s.io/api/policy/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
)

// druid-operator deploys a druid cluster from given spec below, based on the spec it would create following
Expand Down Expand Up @@ -281,6 +283,13 @@ type DruidSpec struct {
// CoreSite Contents of `core-site.xml`.
// +optional
CoreSite string `json:"core-site.xml,omitempty"`

// Dynamic Configurations for Druid. Applied through the dynamic configuration API.
// +optional
DynamicConfig runtime.RawExtension `json:"dynamicConfig,omitempty"`

// +optional
Auth druidapi.Auth `json:"auth,omitempty"`
}

// DruidNodeSpec Specification of `Druid` Node type and its configurations.
Expand Down Expand Up @@ -481,6 +490,10 @@ type DruidNodeSpec struct {
// ServiceAccountName Kubernetes native `serviceAccountName` specification.
// +optional
ServiceAccountName string `json:"serviceAccountName,omitempty"`

// Dynamic Configurations for Druid. Applied through the dynamic configuration API.
// +optional
DynamicConfig runtime.RawExtension `json:"dynamicConfig,omitempty"`
}

// ZookeeperSpec IGNORED (Future API): In order to make Druid dependency setup extensible from within Druid operator.
Expand Down
48 changes: 26 additions & 22 deletions apis/druid/v1alpha1/druidingestion_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ limitations under the License.
package v1alpha1

import (
druidapi "github.com/datainfrahq/druid-operator/pkg/druidapi"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
)

type DruidIngestionMethod string
Expand All @@ -39,37 +41,39 @@ type DruidIngestionSpec struct {
// +required
Ingestion IngestionSpec `json:"ingestion"`
// +optional
Auth Auth `json:"auth"`
Auth druidapi.Auth `json:"auth"`
}

type IngestionSpec struct {
// +required
Type DruidIngestionMethod `json:"type"`
// +required
// +optional
// Spec should be passed in as a JSON string.
// Note: This field is planned for deprecation in favor of nativeSpec.
Spec string `json:"spec,omitempty"`
// +optional
// nativeSpec allows the ingestion specification to be defined in a native Kubernetes format.
// This is particularly useful for environment-specific configurations and will eventually
// replace the JSON-based Spec field.
// Note: Spec will be ignored if nativeSpec is provided.
NativeSpec runtime.RawExtension `json:"nativeSpec,omitempty"`
// +optional
Compaction runtime.RawExtension `json:"compaction,omitempty"`
// +optional
Rules []runtime.RawExtension `json:"rules,omitempty"`
}

type DruidIngestionStatus struct {
TaskId string `json:"taskId"`
Type string `json:"type,omitempty"`
Status v1.ConditionStatus `json:"status,omitempty"`
Reason string `json:"reason,omitempty"`
Message string `json:"message,omitempty"`
LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"`
CurrentIngestionSpec string `json:"currentIngestionSpec.json"`
}

type AuthType string

const (
BasicAuth AuthType = "basic-auth"
)

type Auth struct {
// +required
Type AuthType `json:"type"`
// +required
SecretRef v1.SecretReference `json:"secretRef"`
TaskId string `json:"taskId"`
Type string `json:"type,omitempty"`
Status v1.ConditionStatus `json:"status,omitempty"`
Reason string `json:"reason,omitempty"`
Message string `json:"message,omitempty"`
LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"`
// CurrentIngestionSpec is a string instead of RawExtension to maintain compatibility with existing
// IngestionSpecs that are stored as JSON strings.
CurrentIngestionSpec string `json:"currentIngestionSpec.json"`
CurrentRules []runtime.RawExtension `json:"rules,omitempty"`
}

// +kubebuilder:object:root=true
Expand Down
42 changes: 22 additions & 20 deletions apis/druid/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 42 additions & 10 deletions chart/crds/druid.apache.org_druidingestions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: druidingestions.druid.apache.org
spec:
group: druid.apache.org
Expand All @@ -28,14 +27,19 @@ spec:
description: Ingestion is the Schema for the Ingestion 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'
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'
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
Expand All @@ -44,8 +48,9 @@ spec:
auth:
properties:
secretRef:
description: SecretReference represents a Secret Reference. It
has enough information to retrieve secret in any namespace
description: |-
SecretReference represents a Secret Reference. It has enough information to retrieve secret
in any namespace
properties:
name:
description: name is unique within a namespace to reference
Expand All @@ -67,7 +72,26 @@ spec:
type: string
ingestion:
properties:
compaction:
type: object
x-kubernetes-preserve-unknown-fields: true
nativeSpec:
description: |-
nativeSpec allows the ingestion specification to be defined in a native Kubernetes format.
This is particularly useful for environment-specific configurations and will eventually
replace the JSON-based Spec field.
Note: Spec will be ignored if nativeSpec is provided.
type: object
x-kubernetes-preserve-unknown-fields: true
rules:
items:
type: object
x-kubernetes-preserve-unknown-fields: true
type: array
spec:
description: |-
Spec should be passed in as a JSON string.
Note: This field is planned for deprecation in favor of nativeSpec.
type: string
type:
type: string
Expand All @@ -83,6 +107,9 @@ spec:
status:
properties:
currentIngestionSpec.json:
description: |-
CurrentIngestionSpec is a string instead of RawExtension to maintain compatibility with existing
IngestionSpecs that are stored as JSON strings.
type: string
lastUpdateTime:
format: date-time
Expand All @@ -91,6 +118,11 @@ spec:
type: string
reason:
type: string
rules:
items:
type: object
x-kubernetes-preserve-unknown-fields: true
type: array
status:
type: string
taskId:
Expand Down
Loading
Loading