Skip to content
Open
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
0e36568
CSPL-3551 Init IngestorCluster CR implementation
kasiakoziol Jul 24, 2025
2cca0d7
CSPL-3551 Enhancing Ingestor inputs
kasiakoziol Jul 25, 2025
f747ab4
Merge branch 'develop' into CSPL-3551-ingestion-cr
kasiakoziol Jul 29, 2025
9a7503c
fix
kasiakoziol Jul 29, 2025
7134350
fix
kasiakoziol Jul 29, 2025
44349fa
CSPL-3551 Adding tests
kasiakoziol Jul 29, 2025
e71ea9c
CSPL-3551 Mound defaults and update them with no Splunk restart
kasiakoziol Jul 31, 2025
14ccef4
Merge branch 'develop' into CSPL-3551-ingestion-cr
kasiakoziol Jul 31, 2025
8876d0e
CSPL-3551 Fixing code after tests
kasiakoziol Aug 1, 2025
5c31cab
CSPL-3895-indexercluster (#1562)
Igor-splunk Aug 7, 2025
0c9e908
CSPL-3551 Applying fixes do Indexer integration
kasiakoziol Aug 7, 2025
89f9eb4
Merge branch 'develop' into CSPL-3551-ingestion-cr
kasiakoziol Aug 11, 2025
d885a73
CSPL-3551 Fixes
kasiakoziol Aug 11, 2025
56aa780
Merge branch 'develop' into CSPL-3551-ingestion-cr
kasiakoziol Aug 18, 2025
1c77634
CSPL-3551 Fixes
kasiakoziol Aug 19, 2025
fb4e87f
CSPL-3560 Initial docs for I&I separation
kasiakoziol Aug 26, 2025
3e376d8
Merge branch 'develop' into CSPL-3551-ingestion-cr
kasiakoziol Aug 29, 2025
e62f381
CSPL-3551 Update documentation to reflect on Grafana
kasiakoziol Sep 1, 2025
84d8491
CSPL-3556 Unit tests
kasiakoziol Sep 10, 2025
c3b3aa6
CSPL-3972 Addressing TODOs
kasiakoziol Sep 11, 2025
2af9061
CSPL-3972 Addressing TODOs
kasiakoziol Sep 11, 2025
053352d
CSPL-3551 Moving default from types to controller code
kasiakoziol Sep 11, 2025
e844286
CSPL-3551 Applying previous changes to IndexerCluster
kasiakoziol Sep 18, 2025
500cdfa
CSPL-3551 Moving validations to separate function and adding validati…
kasiakoziol Sep 19, 2025
4b064a6
CSPL-3551 Making sure all inputs are put into status
kasiakoziol Sep 19, 2025
9c6cd69
CSPL-3551 Update of conf files when queue name or type change
kasiakoziol Sep 22, 2025
759b09b
CSPL-3551 Unit tests
kasiakoziol Sep 23, 2025
20d9d6c
CSPL-4003 Helm charts support for bus and pipeline configs
kasiakoziol Sep 29, 2025
f9fb45a
CSPL-4003 Docs update
kasiakoziol Oct 1, 2025
c5e4c2b
CSPL-4003 Addressing comments
kasiakoziol Oct 2, 2025
2de618a
CSPL-3558 Integ tests init
kasiakoziol Oct 2, 2025
0393139
CSPL-3558 Adding extra validation for integraion test
kasiakoziol Oct 2, 2025
4d3865c
CSPL-3558 Refactoring
kasiakoziol Oct 2, 2025
c354062
CSPL-3558 Adding scenario for update and delete
kasiakoziol Oct 3, 2025
c204d52
CSPL-3558 Adding helm test
kasiakoziol Oct 3, 2025
027c039
CSPL-3558 Update of k8s version
kasiakoziol Oct 3, 2025
c5a97dc
CSPL-3558 Fix metrics-server installation issues after k8s version up…
kasiakoziol Oct 6, 2025
fc28db0
CSPL-3558 Adding additional tests
kasiakoziol Oct 7, 2025
a7ae40f
CSPL-3558 Fixing helm tests
kasiakoziol Oct 9, 2025
d3b2ad6
Merge branch 'develop' into CSPL-3551-ingestion-cr
kasiakoziol Oct 13, 2025
3325113
Merge branch 'CSPL-3551-ingestion-cr' into feature/CSPL-3551-ingestio…
kasiakoziol Oct 13, 2025
13b8f4f
Merge branch 'feature/CSPL-3551-ingestion-cr-todos' into feature/CSPL…
kasiakoziol Oct 13, 2025
4622102
CSPL-3558 Fix tests after merge
kasiakoziol Oct 13, 2025
9fbcb4a
CSPL-3558 Fix helm tests
kasiakoziol Oct 16, 2025
7480ed8
CSPL-4022 Remove pipeline config from inputs
kasiakoziol Oct 17, 2025
d21a9a3
CSPL-4022 Remove bus inputs
kasiakoziol Oct 20, 2025
7edb81b
CSPL-4022 Introduce BusConfiguration CR
kasiakoziol Oct 22, 2025
a5b2db3
CSPL-4022 Update docs and tests
kasiakoziol Oct 22, 2025
9f57abc
CSPL-4022 Update ns reference for BusConfiguration
kasiakoziol Oct 23, 2025
10a4fc0
CSPL-4022 Fixing tests and adding bus config to ingestor controller
kasiakoziol Oct 23, 2025
db02bfd
CSPL-4022 Fix update behaviour
kasiakoziol Oct 23, 2025
ceb2c71
CSPL-4022 Docs update
kasiakoziol Oct 27, 2025
6618a3f
Merge pull request #1600 from splunk/feature/CSPL-4022-move-inputs-to-cr
kasiakoziol Oct 28, 2025
d7f367b
CSPL-4022 Fix failing tests
kasiakoziol Oct 28, 2025
25b76a3
Merge pull request #1593 from splunk/feature/CSPL-3558-integ-tests
kasiakoziol Oct 28, 2025
c6cea58
Merge pull request #1576 from splunk/feature/CSPL-3551-ingestion-cr-t…
kasiakoziol Oct 28, 2025
192d3bf
CSPL-4022 Fix tests
kasiakoziol Oct 29, 2025
c6972f7
Merge branch 'develop' into CSPL-3551-ingestion-cr
kasiakoziol Oct 29, 2025
cfd3cd7
CSPL-4022 Addressing PR comments
kasiakoziol Oct 29, 2025
5843632
CSPL-4022 Address comments
kasiakoziol Oct 29, 2025
4e37060
CSPL-4022 Fix helm tests
kasiakoziol Oct 29, 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 PROJECT
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Code generated by tool. DO NOT EDIT.
# This file is used to track the info used to scaffold your project
# and allow the plugins properly work.
# More info: https://book.kubebuilder.io/reference/project-config.html
domain: splunk.com
layout:
- go.kubebuilder.io/v4
Expand Down Expand Up @@ -109,4 +113,13 @@ resources:
kind: LicenseManager
path: github.com/splunk/splunk-operator/api/v4
version: v4
- api:
crdVersion: v1
namespaced: true
controller: true
domain: splunk.com
group: enterprise
kind: IngestorCluster
path: github.com/splunk/splunk-operator/api/v4
version: v4
version: "3"
4 changes: 4 additions & 0 deletions api/v4/indexercluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ const (
type IndexerClusterSpec struct {
CommonSplunkSpec `json:",inline"`

PipelineConfig PipelineConfigSpec `json:"pipelineConfig,omitempty"`

PullBus PushBusSpec `json:"pullBus,omitempty"`

// Number of search head pods; a search head cluster will be created if > 1
Replicas int32 `json:"replicas"`
}
Expand Down
216 changes: 216 additions & 0 deletions api/v4/ingestorcluster_types.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,216 @@
/*
Copyright 2025.

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.
*/

package v4

import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
)

// 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.

const (
// IngestorClusterPausedAnnotation is the annotation that pauses the reconciliation (triggers
// an immediate requeue)
IngestorClusterPausedAnnotation = "ingestorcluster.enterprise.splunk.com/paused"
)

// IngestorClusterSpec defines the spec of Ingestor Cluster
type IngestorClusterSpec struct {
// Common Splunk spec
CommonSplunkSpec `json:",inline"`

// Number of ingestor pods
Replicas int32 `json:"replicas"`

// Splunk Enterprise app repository that specifies remote app location and scope for Splunk app management
AppFrameworkConfig AppFrameworkSpec `json:"appRepo,omitempty"`

// Push Bus spec
PushBus PushBusSpec `json:"pushBus"`

// Pipeline configuration
PipelineConfig PipelineConfigSpec `json:"pipelineConfig"`
}

// Helper types
// Only SQS as of now
type PushBusSpec struct {
// +kubebuilder:validation:Enum=sqs_smartbus
// +kubebuilder:default=sqs_smartbus
Type string `json:"type"`

SQS SQSSpec `json:"sqs"`
}

type SQSSpec struct {
QueueName string `json:"queueName"`

AuthRegion string `json:"authRegion"`

// +kubebuilder:validation:Pattern=`^https://`
Endpoint string `json:"endpoint"`

// +kubebuilder:validation:Pattern=`^https://`
LargeMessageStoreEndpoint string `json:"largeMessageStoreEndpoint"`

// +kubebuilder:validation:Pattern=`^s3://`
LargeMessageStorePath string `json:"largeMessageStorePath"`

DeadLetterQueueName string `json:"deadLetterQueueName"`

// +kubebuilder:validation:Minimum=0
// +kubebuilder:default=3
MaxRetriesPerPart int `json:"maxRetriesPerPart"`

// +kubebuilder:validation:Enum=max_count
// +kubebuilder:default=max_count
RetryPolicy string `json:"retryPolicy"`

// +kubebuilder:validation:Pattern=`^[0-9]+s$`
// +kubebuilder:default="5s"
SendInterval string `json:"sendInterval"`
}

type PipelineConfigSpec struct {
// +kubebuilder:default=false
RemoteQueueRuleset bool `json:"remoteQueueRuleset"`

// +kubebuilder:default=true
RuleSet bool `json:"ruleSet"`

// +kubebuilder:default=false
RemoteQueueTyping bool `json:"remoteQueueTyping"`

// +kubebuilder:default=false
RemoteQueueOutput bool `json:"remoteQueueOutput"`

// +kubebuilder:default=true
Typing bool `json:"typing"`

// +kubebuilder:default=true
IndexerPipe bool `json:"indexerPipe,omitempty"`
}

// IngestorClusterStatus defines the observed state of Ingestor Cluster
type IngestorClusterStatus struct {
// Phase of the ingestor pods
Phase Phase `json:"phase"`

// Number of desired ingestor pods
Replicas int32 `json:"replicas"`

// Number of ready ingestor pods
ReadyReplicas int32 `json:"readyReplicas"`

// Selector for pods used by HorizontalPodAutoscaler
Selector string `json:"selector"`

// Resource revision tracker
ResourceRevMap map[string]string `json:"resourceRevMap"`

// App Framework context
AppContext AppDeploymentContext `json:"appContext"`

// Telemetry App installation flag
TelAppInstalled bool `json:"telAppInstalled"`

// Auxillary message describing CR status
Message string `json:"message"`

// Pipeline configuration status
PipelineConfig PipelineConfigSpec `json:"pipelineConfig"`

// Push Bus status
PushBus PushBusSpec `json:"pushBus"`
}

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status

// IngestorCluster is the Schema for a Splunk Enterprise ingestor cluster pods
// +k8s:openapi-gen=true
// +kubebuilder:subresource:status
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector
// +kubebuilder:resource:path=ingestorclusters,scope=Namespaced,shortName=ing
// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Status of ingestor cluster pods"
// +kubebuilder:printcolumn:name="Desired",type="integer",JSONPath=".status.replicas",description="Number of desired ingestor cluster pods"
// +kubebuilder:printcolumn:name="Ready",type="integer",JSONPath=".status.readyReplicas",description="Current number of ready ingestor cluster pods"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age of ingestor cluster resource"
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",description="Auxillary message describing CR status"
// +kubebuilder:storageversion

// IngestorCluster is the Schema for the ingestorclusters API
type IngestorCluster struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty,omitzero"`

Spec IngestorClusterSpec `json:"spec"`
Status IngestorClusterStatus `json:"status,omitempty,omitzero"`
}

// DeepCopyObject implements runtime.Object
func (in *IngestorCluster) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
return nil
}

// +kubebuilder:object:root=true

// IngestorClusterList contains a list of IngestorCluster
type IngestorClusterList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
Items []IngestorCluster `json:"items"`
}

func init() {
SchemeBuilder.Register(&IngestorCluster{}, &IngestorClusterList{})
}

// NewEvent creates a new event associated with the object and ready
// to be published to Kubernetes API
func (ic *IngestorCluster) NewEvent(eventType, reason, message string) corev1.Event {
t := metav1.Now()
return corev1.Event{
ObjectMeta: metav1.ObjectMeta{
GenerateName: reason + "-",
Namespace: ic.ObjectMeta.Namespace,
},
InvolvedObject: corev1.ObjectReference{
Kind: "IngestorCluster",
Namespace: ic.Namespace,
Name: ic.Name,
UID: ic.UID,
APIVersion: GroupVersion.String(),
},
Reason: reason,
Message: message,
Source: corev1.EventSource{
Component: "splunk-ingestorcluster-controller",
},
FirstTimestamp: t,
LastTimestamp: t,
Count: 1,
Type: eventType,
ReportingController: "enterprise.splunk.com/ingestorcluster-controller",
}
}
Loading
Loading