Skip to content

Commit 9f57abc

Browse files
committed
CSPL-4022 Update ns reference for BusConfiguration
1 parent a5b2db3 commit 9f57abc

File tree

3 files changed

+57
-4
lines changed

3 files changed

+57
-4
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{{- if .Values.busConfiguration.enabled }}
2+
apiVersion: enterprise.splunk.com/v4
3+
kind: BusConfiguration
4+
metadata:
5+
name: {{ .Values.busConfiguration.name }}
6+
namespace: {{ default .Release.Namespace .Values.busConfiguration.namespaceOverride }}
7+
{{- with .Values.busConfiguration.additionalLabels }}
8+
labels:
9+
{{ toYaml . | nindent 4 }}
10+
{{- end }}
11+
{{- with .Values.busConfiguration.additionalAnnotations }}
12+
annotations:
13+
{{ toYaml . | nindent 4 }}
14+
{{- end }}
15+
spec:
16+
type: {{ .type | quote }}
17+
{{- with .sqs }}
18+
sqs:
19+
{{- if .queueName }}
20+
queueName: {{ .queueName | quote }}
21+
{{- end }}
22+
{{- if .authRegion }}
23+
authRegion: {{ .authRegion | quote }}
24+
{{- end }}
25+
{{- if .endpoint }}
26+
endpoint: {{ .endpoint | quote }}
27+
{{- end }}
28+
{{- if .largeMessageStoreEndpoint }}
29+
largeMessageStoreEndpoint: {{ .largeMessageStoreEndpoint | quote }}
30+
{{- end }}
31+
{{- if .largeMessageStorePath }}
32+
largeMessageStorePath: {{ .largeMessageStorePath | quote }}
33+
{{- end }}
34+
{{- if .deadLetterQueueName }}
35+
deadLetterQueueName: {{ .deadLetterQueueName | quote }}
36+
{{- end }}
37+
{{- end }}

pkg/splunk/enterprise/indexercluster.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,13 @@ func ApplyIndexerClusterManager(ctx context.Context, client splcommon.Controller
6969
// Bus config
7070
busConfig := enterpriseApi.BusConfiguration{}
7171
if cr.Spec.BusConfigurationRef.Name != "" {
72+
ns := cr.GetNamespace()
73+
if cr.Spec.BusConfigurationRef.Namespace != "" {
74+
ns = cr.Spec.BusConfigurationRef.Namespace
75+
}
7276
err = client.Get(context.Background(), types.NamespacedName{
7377
Name: cr.Spec.BusConfigurationRef.Name,
74-
Namespace: cr.Spec.BusConfigurationRef.Namespace,
78+
Namespace: ns,
7579
}, &busConfig)
7680
if err != nil {
7781
return result, err
@@ -344,9 +348,13 @@ func ApplyIndexerCluster(ctx context.Context, client splcommon.ControllerClient,
344348
// Bus config
345349
busConfig := enterpriseApi.BusConfiguration{}
346350
if cr.Spec.BusConfigurationRef.Name != "" {
351+
ns := cr.GetNamespace()
352+
if cr.Spec.BusConfigurationRef.Namespace != "" {
353+
ns = cr.Spec.BusConfigurationRef.Namespace
354+
}
347355
err := client.Get(context.Background(), types.NamespacedName{
348356
Name: cr.Spec.BusConfigurationRef.Name,
349-
Namespace: cr.Spec.BusConfigurationRef.Namespace,
357+
Namespace: ns,
350358
}, &busConfig)
351359
if err != nil {
352360
return result, err
@@ -532,9 +540,13 @@ func ApplyIndexerCluster(ctx context.Context, client splcommon.ControllerClient,
532540
if cr.Status.Phase == enterpriseApi.PhaseReady {
533541
if cr.Spec.BusConfigurationRef.Name != "" {
534542
busConfig := enterpriseApi.BusConfiguration{}
543+
ns := cr.GetNamespace()
544+
if cr.Spec.BusConfigurationRef.Namespace != "" {
545+
ns = cr.Spec.BusConfigurationRef.Namespace
546+
}
535547
err := client.Get(context.Background(), types.NamespacedName{
536548
Name: cr.Spec.BusConfigurationRef.Name,
537-
Namespace: cr.Spec.BusConfigurationRef.Namespace,
549+
Namespace: ns,
538550
}, &busConfig)
539551
if err != nil {
540552
return result, err

pkg/splunk/enterprise/ingestorcluster.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,13 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
6969
// Bus config
7070
busConfig := enterpriseApi.BusConfiguration{}
7171
if cr.Spec.BusConfigurationRef.Name != "" {
72+
ns := cr.GetNamespace()
73+
if cr.Spec.BusConfigurationRef.Namespace != "" {
74+
ns = cr.Spec.BusConfigurationRef.Namespace
75+
}
7276
err = client.Get(context.Background(), types.NamespacedName{
7377
Name: cr.Spec.BusConfigurationRef.Name,
74-
Namespace: cr.Spec.BusConfigurationRef.Namespace,
78+
Namespace: ns,
7579
}, &busConfig)
7680
if err != nil {
7781
return result, err

0 commit comments

Comments
 (0)