Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
5 changes: 0 additions & 5 deletions api/v4/indexercluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ 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
Expand Down Expand Up @@ -113,9 +111,6 @@ type IndexerClusterStatus struct {
// status of each indexer cluster peer
Peers []IndexerClusterMemberStatus `json:"peers"`

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

// Pull Bus status
PullBus PushBusSpec `json:"pullBus,omitempty"`

Expand Down
28 changes: 0 additions & 28 deletions api/v4/ingestorcluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ type IngestorClusterSpec struct {

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

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

// Helper types
Expand All @@ -69,28 +66,6 @@ type SQSSpec struct {
LargeMessageStorePath string `json:"largeMessageStorePath"`

DeadLetterQueueName string `json:"deadLetterQueueName"`

MaxRetriesPerPart int `json:"maxRetriesPerPart"`

RetryPolicy string `json:"retryPolicy"`

SendInterval string `json:"sendInterval"`

EncodingFormat string `json:"encodingFormat"`
}

type PipelineConfigSpec struct {
RemoteQueueRuleset bool `json:"remoteQueueRuleset"`

RuleSet bool `json:"ruleSet"`

RemoteQueueTyping bool `json:"remoteQueueTyping"`

RemoteQueueOutput bool `json:"remoteQueueOutput"`

Typing bool `json:"typing"`

IndexerPipe bool `json:"indexerPipe"`
}

// IngestorClusterStatus defines the observed state of Ingestor Cluster
Expand Down Expand Up @@ -119,9 +94,6 @@ type IngestorClusterStatus struct {
// Auxillary message describing CR status
Message string `json:"message"`

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

// Push Bus status
PushBus PushBusSpec `json:"pushBus"`
}
Expand Down
19 changes: 0 additions & 19 deletions api/v4/zz_generated.deepcopy.go

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

4 changes: 2 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,11 @@ func main() {
// as certificates issued by a trusted Certificate Authority (CA). The primary risk is potentially allowing
// unauthorized access to sensitive metrics data. Consider replacing with CertDir, CertName, and KeyName
// to provide certificates, ensuring the server communicates using trusted and secure certificates.
TLSOpts: tlsOpts,
TLSOpts: tlsOpts,
FilterProvider: filters.WithAuthenticationAndAuthorization,
}

// TODO: enable https for /metrics endpoint by default
// TODO: enable https for /metrics endpoint by default
// if secureMetrics {
// // FilterProvider is used to protect the metrics endpoint with authn/authz.
// // These configurations ensure that only authorized users and service accounts
Expand Down
47 changes: 0 additions & 47 deletions config/crd/bases/enterprise.splunk.com_indexerclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5604,21 +5604,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
pipelineConfig:
properties:
indexerPipe:
type: boolean
remoteQueueOutput:
type: boolean
remoteQueueRuleset:
type: boolean
remoteQueueTyping:
type: boolean
ruleSet:
type: boolean
typing:
type: boolean
type: object
pullBus:
description: |-
Helper types
Expand All @@ -5630,22 +5615,14 @@ spec:
type: string
deadLetterQueueName:
type: string
encodingFormat:
type: string
endpoint:
type: string
largeMessageStoreEndpoint:
type: string
largeMessageStorePath:
type: string
maxRetriesPerPart:
type: integer
queueName:
type: string
retryPolicy:
type: string
sendInterval:
type: string
type: object
type:
type: string
Expand Down Expand Up @@ -8381,22 +8358,6 @@ spec:
- Terminating
- Error
type: string
pipelineConfig:
description: Pipeline configuration status
properties:
indexerPipe:
type: boolean
remoteQueueOutput:
type: boolean
remoteQueueRuleset:
type: boolean
remoteQueueTyping:
type: boolean
ruleSet:
type: boolean
typing:
type: boolean
type: object
pullBus:
description: Pull Bus status
properties:
Expand All @@ -8406,22 +8367,14 @@ spec:
type: string
deadLetterQueueName:
type: string
encodingFormat:
type: string
endpoint:
type: string
largeMessageStoreEndpoint:
type: string
largeMessageStorePath:
type: string
maxRetriesPerPart:
type: integer
queueName:
type: string
retryPolicy:
type: string
sendInterval:
type: string
type: object
type:
type: string
Expand Down
48 changes: 0 additions & 48 deletions config/crd/bases/enterprise.splunk.com_ingestorclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1580,22 +1580,6 @@ spec:
type: string
type: object
x-kubernetes-map-type: atomic
pipelineConfig:
description: Pipeline configuration
properties:
indexerPipe:
type: boolean
remoteQueueOutput:
type: boolean
remoteQueueRuleset:
type: boolean
remoteQueueTyping:
type: boolean
ruleSet:
type: boolean
typing:
type: boolean
type: object
pushBus:
description: Push Bus spec
properties:
Expand All @@ -1605,22 +1589,14 @@ spec:
type: string
deadLetterQueueName:
type: string
encodingFormat:
type: string
endpoint:
type: string
largeMessageStoreEndpoint:
type: string
largeMessageStorePath:
type: string
maxRetriesPerPart:
type: integer
queueName:
type: string
retryPolicy:
type: string
sendInterval:
type: string
type: object
type:
type: string
Expand Down Expand Up @@ -4561,22 +4537,6 @@ spec:
- Terminating
- Error
type: string
pipelineConfig:
description: Pipeline configuration status
properties:
indexerPipe:
type: boolean
remoteQueueOutput:
type: boolean
remoteQueueRuleset:
type: boolean
remoteQueueTyping:
type: boolean
ruleSet:
type: boolean
typing:
type: boolean
type: object
pushBus:
description: Push Bus status
properties:
Expand All @@ -4586,22 +4546,14 @@ spec:
type: string
deadLetterQueueName:
type: string
encodingFormat:
type: string
endpoint:
type: string
largeMessageStoreEndpoint:
type: string
largeMessageStorePath:
type: string
maxRetriesPerPart:
type: integer
queueName:
type: string
retryPolicy:
type: string
sendInterval:
type: string
type: object
type:
type: string
Expand Down
Loading
Loading