Skip to content

Commit e4e083a

Browse files
kasiakoziolkasiakoziol
committed
CSPL-4360 Fix failing tests
1 parent 3c7b2d7 commit e4e083a

File tree

7 files changed

+34
-12
lines changed

7 files changed

+34
-12
lines changed

‎helm-chart/splunk-enterprise/templates/enterprise_v4_largemessagestores.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
{{- if .Values.largemessagestore }}
2-
{{- if .Values.largemessagestore.enabled }}
1+
{{- if .Values.largeMessageStore }}
2+
{{- if .Values.largeMessageStore.enabled }}
33
apiVersion: enterprise.splunk.com/v4
44
kind: LargeMessageStore
55
metadata:
6-
name: {{ .Values.largemessagestore.name }}
7-
namespace: {{ default .Release.Namespace .Values.largemessagestore.namespaceOverride }}
8-
{{- with .Values.largemessagestore.additionalLabels }}
6+
name: {{ .Values.largeMessageStore.name }}
7+
namespace: {{ default .Release.Namespace .Values.largeMessageStore.namespaceOverride }}
8+
{{- with .Values.largeMessageStore.additionalLabels }}
99
labels:
1010
{{ toYaml . | nindent 4 }}
1111
{{- end }}
12-
{{- with .Values.largemessagestore.additionalAnnotations }}
12+
{{- with .Values.largeMessageStore.additionalAnnotations }}
1313
annotations:
1414
{{ toYaml . | nindent 4 }}
1515
{{- end }}
1616
spec:
17-
provider: {{ .Values.largemessagestore.provider | quote }}
18-
{{- with .Values.largemessagestore.s3 }}
17+
provider: {{ .Values.largeMessageStore.provider | quote }}
18+
{{- with .Values.largeMessageStore.s3 }}
1919
s3:
2020
{{- if .endpoint }}
2121
endpoint: {{ .endpoint | quote }}

kuttl/tests/helm/index-and-ingest-separation/01-create-se-secret.yaml renamed to kuttl/tests/helm/index-and-ingest-separation/01-create-s3-secret.yaml

File renamed without changes.

‎kuttl/tests/helm/index-and-ingest-separation/02-assert.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ spec:
6363
replicas: 3
6464
busRef:
6565
name: bus
66+
largeMessageStoreRef:
67+
name: lms
6668
status:
6769
phase: Ready
6870
bus:
@@ -104,6 +106,8 @@ spec:
104106
replicas: 3
105107
busRef:
106108
name: bus
109+
largeMessageStoreRef:
110+
name: lms
107111
status:
108112
phase: Ready
109113
bus:

‎kuttl/tests/helm/index-and-ingest-separation/03-assert.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ spec:
88
replicas: 4
99
busRef:
1010
name: bus
11+
largeMessageStoreRef:
12+
name: lms
1113
status:
1214
phase: Ready
1315
bus:

‎pkg/splunk/enterprise/indexercluster.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ func ApplyIndexerClusterManager(ctx context.Context, client splcommon.Controller
7979
cr.Status.ClusterManagerPhase = enterpriseApi.PhaseError
8080
if cr.Status.Replicas < cr.Spec.Replicas {
8181
cr.Status.Bus = &enterpriseApi.BusSpec{}
82+
cr.Status.LargeMessageStore = &enterpriseApi.LargeMessageStoreSpec{}
8283
}
8384
cr.Status.Replicas = cr.Spec.Replicas
8485
cr.Status.Selector = fmt.Sprintf("app.kubernetes.io/instance=splunk-%s-indexer", cr.GetName())
@@ -305,6 +306,7 @@ func ApplyIndexerClusterManager(ctx context.Context, client splcommon.Controller
305306
}
306307

307308
cr.Status.Bus = &bus.Spec
309+
cr.Status.LargeMessageStore = &lms.Spec
308310

309311
for i := int32(0); i < cr.Spec.Replicas; i++ {
310312
idxcClient := mgr.getClient(ctx, i)
@@ -407,6 +409,7 @@ func ApplyIndexerCluster(ctx context.Context, client splcommon.ControllerClient,
407409
cr.Status.ClusterMasterPhase = enterpriseApi.PhaseError
408410
if cr.Status.Replicas < cr.Spec.Replicas {
409411
cr.Status.Bus = &enterpriseApi.BusSpec{}
412+
cr.Status.LargeMessageStore = &enterpriseApi.LargeMessageStoreSpec{}
410413
}
411414
cr.Status.Replicas = cr.Spec.Replicas
412415
cr.Status.Selector = fmt.Sprintf("app.kubernetes.io/instance=splunk-%s-indexer", cr.GetName())
@@ -636,6 +639,7 @@ func ApplyIndexerCluster(ctx context.Context, client splcommon.ControllerClient,
636639
}
637640

638641
cr.Status.Bus = &bus.Spec
642+
cr.Status.LargeMessageStore = &lms.Spec
639643

640644
for i := int32(0); i < cr.Spec.Replicas; i++ {
641645
idxcClient := mgr.getClient(ctx, i)

‎pkg/splunk/enterprise/ingestorcluster.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
7474

7575
if cr.Status.Replicas < cr.Spec.Replicas {
7676
cr.Status.Bus = &enterpriseApi.BusSpec{}
77+
cr.Status.LargeMessageStore = &enterpriseApi.LargeMessageStoreSpec{}
7778
}
7879
cr.Status.Replicas = cr.Spec.Replicas
7980

@@ -269,6 +270,7 @@ func ApplyIngestorCluster(ctx context.Context, client client.Client, cr *enterpr
269270
}
270271

271272
cr.Status.Bus = &bus.Spec
273+
cr.Status.LargeMessageStore = &lms.Spec
272274

273275
for i := int32(0); i < cr.Spec.Replicas; i++ {
274276
ingClient := mgr.getClient(ctx, i)

‎test/index_and_ingestion_separation/index_and_ingestion_separation_test.go‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ var _ = Describe("indingsep test", func() {
8383
// Secret reference
8484
volumeSpec := []enterpriseApi.VolumeSpec{testenv.GenerateBusVolumeSpec("bus-secret-ref-volume", testcaseEnvInst.GetIndexSecretName())}
8585
bus.SQS.VolList = volumeSpec
86+
updateBus.SQS.VolList = volumeSpec
8687

8788
// Deploy Bus
8889
testcaseEnvInst.Log.Info("Deploy Bus")
@@ -161,6 +162,7 @@ var _ = Describe("indingsep test", func() {
161162
// Secret reference
162163
volumeSpec := []enterpriseApi.VolumeSpec{testenv.GenerateBusVolumeSpec("bus-secret-ref-volume", testcaseEnvInst.GetIndexSecretName())}
163164
bus.SQS.VolList = volumeSpec
165+
updateBus.SQS.VolList = volumeSpec
164166

165167
// Deploy Bus
166168
testcaseEnvInst.Log.Info("Deploy Bus")
@@ -316,7 +318,7 @@ var _ = Describe("indingsep test", func() {
316318

317319
// Verify Ingestor Cluster Status
318320
testcaseEnvInst.Log.Info("Verify Ingestor Cluster Status")
319-
Expect(ingest.Status.Bus).To(Equal(bus), "Ingestor bus status is not the same as provided as input")
321+
Expect(*ingest.Status.Bus).To(Equal(bus), "Ingestor bus status is not the same as provided as input")
320322

321323
// Get instance of current Indexer Cluster CR with latest config
322324
testcaseEnvInst.Log.Info("Get instance of current Indexer Cluster CR with latest config")
@@ -326,7 +328,7 @@ var _ = Describe("indingsep test", func() {
326328

327329
// Verify Indexer Cluster Status
328330
testcaseEnvInst.Log.Info("Verify Indexer Cluster Status")
329-
Expect(index.Status.Bus).To(Equal(bus), "Indexer bus status is not the same as provided as input")
331+
Expect(*index.Status.Bus).To(Equal(bus), "Indexer bus status is not the same as provided as input")
330332

331333
// Verify conf files
332334
testcaseEnvInst.Log.Info("Verify conf files")
@@ -433,6 +435,10 @@ var _ = Describe("indingsep test", func() {
433435
err = deployment.UpdateCR(ctx, bus)
434436
Expect(err).To(Succeed(), "Unable to deploy Bus with updated CR")
435437

438+
// Ensure that Ingestor Cluster is in Ready phase
439+
testcaseEnvInst.Log.Info("Ensure that Ingestor Cluster is in Ready phase")
440+
testenv.IngestorReady(ctx, deployment, testcaseEnvInst)
441+
436442
// Get instance of current Ingestor Cluster CR with latest config
437443
testcaseEnvInst.Log.Info("Get instance of current Ingestor Cluster CR with latest config")
438444
ingest := &enterpriseApi.IngestorCluster{}
@@ -441,7 +447,11 @@ var _ = Describe("indingsep test", func() {
441447

442448
// Verify Ingestor Cluster Status
443449
testcaseEnvInst.Log.Info("Verify Ingestor Cluster Status")
444-
Expect(ingest.Status.Bus).To(Equal(updateBus), "Ingestor bus status is not the same as provided as input")
450+
Expect(*ingest.Status.Bus).To(Equal(updateBus), "Ingestor bus status is not the same as provided as input")
451+
452+
// Ensure that Indexer Cluster is in Ready phase
453+
testcaseEnvInst.Log.Info("Ensure that Indexer Cluster is in Ready phase")
454+
testenv.SingleSiteIndexersReady(ctx, deployment, testcaseEnvInst)
445455

446456
// Get instance of current Indexer Cluster CR with latest config
447457
testcaseEnvInst.Log.Info("Get instance of current Indexer Cluster CR with latest config")
@@ -451,7 +461,7 @@ var _ = Describe("indingsep test", func() {
451461

452462
// Verify Indexer Cluster Status
453463
testcaseEnvInst.Log.Info("Verify Indexer Cluster Status")
454-
Expect(index.Status.Bus).To(Equal(updateBus), "Indexer bus status is not the same as provided as input")
464+
Expect(*index.Status.Bus).To(Equal(updateBus), "Indexer bus status is not the same as provided as input")
455465

456466
// Verify conf files
457467
testcaseEnvInst.Log.Info("Verify conf files")

0 commit comments

Comments
 (0)