Skip to content

SPL-290980: create the KVService CR in existing spluk CRs #1660

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

Open
jmsplunk wants to merge 2 commits into
base: feature/epic_SPL-290563
Choose a base branch
from
Open

SPL-290980: create the KVService CR in existing spluk CRs #1660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f36946d
first commit
jmsplunk Jan 14, 2026
985f8a1
fix unit tets
jmsplunk Jan 14, 2026
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
14 changes: 14 additions & 0 deletions pkg/splunk/enterprise/clustermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,13 @@ func ApplyClusterManager(ctx context.Context, client splcommon.ControllerClient,
return result, err
}

// Remove owner reference from KVService CR (delete if last owner)
err = DeleteKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "DeleteKVServiceCR", fmt.Sprintf("remove KVService owner reference failed %s", err.Error()))
return result, err
}

DeleteOwnerReferencesForResources(ctx, client, cr, SplunkClusterManager)

terminating, err := splctrl.CheckForDeletion(ctx, cr, client)
Expand All @@ -180,6 +187,13 @@ func ApplyClusterManager(ctx context.Context, client splcommon.ControllerClient,
return result, err
}

// create or update KVService CR with owner reference
err = ApplyKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "ApplyKVServiceCR", fmt.Sprintf("apply KVService CR failed %s", err.Error()))
return result, err
}

// create or update statefulset for the cluster manager
statefulSet, err := getClusterManagerStatefulSet(ctx, client, cr)
if err != nil {
Expand Down
12 changes: 8 additions & 4 deletions pkg/splunk/enterprise/clustermanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func TestApplyClusterManager(t *testing.T) {
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
{MetaName: "*v1.Service-test-splunk-stack1-cluster-manager-service"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-manager"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
Expand All @@ -85,6 +86,7 @@ func TestApplyClusterManager(t *testing.T) {
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
{MetaName: "*v1.Service-test-splunk-stack1-cluster-manager-service"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-manager"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
Expand All @@ -108,8 +110,8 @@ func TestApplyClusterManager(t *testing.T) {
}
listmockCall := []spltest.MockFuncCall{
{ListOpts: listOpts}}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[4], funcCalls[6], funcCalls[10], funcCalls[5]}, "List": {listmockCall[0]}, "Update": {funcCalls[0]}}
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[5]}, "List": {listmockCall[0]}}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[4], funcCalls[5], funcCalls[7], funcCalls[11], funcCalls[6]}, "List": {listmockCall[0]}, "Update": {funcCalls[0]}}
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[6]}, "List": {listmockCall[0]}}

current := enterpriseApi.ClusterManager{
TypeMeta: metav1.TypeMeta{
Expand Down Expand Up @@ -564,6 +566,7 @@ func TestApplyClusterManagerWithSmartstore(t *testing.T) {
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
{MetaName: "*v1.Service-test-splunk-stack1-cluster-manager-service"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-manager"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
Expand All @@ -589,6 +592,7 @@ func TestApplyClusterManagerWithSmartstore(t *testing.T) {
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
{MetaName: "*v1.Service-test-splunk-stack1-cluster-manager-service"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-manager"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
Expand Down Expand Up @@ -617,8 +621,8 @@ func TestApplyClusterManagerWithSmartstore(t *testing.T) {
{ListOpts: listOpts},
{ListOpts: listOpts1},
}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[7], funcCalls[8], funcCalls[12], funcCalls[14]}, "List": {listmockCall[0], listmockCall[0], listmockCall[1]}, "Update": {funcCalls[0], funcCalls[3], funcCalls[15]}}
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[9]}, "List": {listmockCall[0]}}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[7], funcCalls[8], funcCalls[9], funcCalls[13], funcCalls[15]}, "List": {listmockCall[0], listmockCall[0], listmockCall[1]}, "Update": {funcCalls[0], funcCalls[3], funcCalls[16]}}
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[10]}, "List": {listmockCall[0]}}

current := enterpriseApi.ClusterManager{
TypeMeta: metav1.TypeMeta{
Expand Down
6 changes: 6 additions & 0 deletions pkg/splunk/enterprise/finalizers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ func splunkDeletionTester(t *testing.T, cr splcommon.MetaObject, delete func(spl
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-standalone-stack1-configmap"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-standalone"},
{MetaName: "*v4.Standalone-test-stack1"},
Expand Down Expand Up @@ -176,6 +177,7 @@ func splunkDeletionTester(t *testing.T, cr splcommon.MetaObject, delete func(spl
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-license-manager-stack1-configmap"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-license-manager"},
{MetaName: "*v4.LicenseManager-test-stack1"},
Expand All @@ -192,6 +194,7 @@ func splunkDeletionTester(t *testing.T, cr splcommon.MetaObject, delete func(spl
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-search-head-stack1-configmap"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-search-head"},
{MetaName: "*v4.SearchHeadCluster-test-stack1"},
Expand Down Expand Up @@ -229,6 +232,7 @@ func splunkDeletionTester(t *testing.T, cr splcommon.MetaObject, delete func(spl
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-cluster-manager-stack1-configmap"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-cluster-manager"},
{MetaName: "*v4.ClusterManager-test-stack1"},
Expand Down Expand Up @@ -256,6 +260,7 @@ func splunkDeletionTester(t *testing.T, cr splcommon.MetaObject, delete func(spl
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-monitoring-console-stack1-configmap"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v4.MonitoringConsole-test-stack1"},
{MetaName: "*v4.MonitoringConsole-test-stack1"},
}
Expand Down Expand Up @@ -301,6 +306,7 @@ func splunkDeletionTester(t *testing.T, cr splcommon.MetaObject, delete func(spl
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-indexer-stack1-configmap"},
{MetaName: "*v4.ClusterManager-test-manager1"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-indexer"},
{MetaName: "*v4.IndexerCluster-test-stack1"},
Expand Down
14 changes: 14 additions & 0 deletions pkg/splunk/enterprise/indexercluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,13 @@ func ApplyIndexerClusterManager(ctx context.Context, client splcommon.Controller

// check if deletion has been requested
if cr.ObjectMeta.DeletionTimestamp != nil {
// Remove owner reference from KVService CR (delete if last owner)
err = DeleteKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "DeleteKVServiceCR", fmt.Sprintf("remove KVService owner reference failed %s", err.Error()))
return result, err
}

DeleteOwnerReferencesForResources(ctx, client, cr, SplunkIndexer)

terminating, err := splctrl.CheckForDeletion(ctx, cr, client)
Expand Down Expand Up @@ -155,6 +162,13 @@ func ApplyIndexerClusterManager(ctx context.Context, client splcommon.Controller
return result, err
}

// create or update KVService CR with owner reference
err = ApplyKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "ApplyKVServiceCR", fmt.Sprintf("apply KVService CR failed %s", err.Error()))
return result, err
}

// create or update statefulset for the indexers
statefulSet, err := getIndexerStatefulSet(ctx, client, cr)
if err != nil {
Expand Down
4 changes: 3 additions & 1 deletion pkg/splunk/enterprise/indexercluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ func TestApplyIndexerCluster(t *testing.T) {
{MetaName: "*v4.ClusterManager-test-manager1"},
{MetaName: "*v1.Service-test-splunk-stack1-indexer-headless"},
{MetaName: "*v1.Service-test-splunk-stack1-indexer-service"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-indexer"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
Expand All @@ -176,6 +177,7 @@ func TestApplyIndexerCluster(t *testing.T) {
{MetaName: "*v4.ClusterManager-test-manager1"},
{MetaName: "*v1.Service-test-splunk-stack1-indexer-headless"},
{MetaName: "*v1.Service-test-splunk-stack1-indexer-service"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-indexer"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
Expand All @@ -200,7 +202,7 @@ func TestApplyIndexerCluster(t *testing.T) {
{ListOpts: listOpts},
{ListOpts: listOpts1},
}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[5], funcCalls[6], funcCalls[10], funcCalls[12]}, "Update": {funcCalls[0]}, "List": {listmockCall[0], listmockCall[1]}}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[5], funcCalls[6], funcCalls[7], funcCalls[11], funcCalls[13]}, "Update": {funcCalls[0]}, "List": {listmockCall[0], listmockCall[1]}}
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "List": {listmockCall[0], listmockCall[1]}}

current := enterpriseApi.IndexerCluster{
Expand Down
14 changes: 14 additions & 0 deletions pkg/splunk/enterprise/licensemanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ func ApplyLicenseManager(ctx context.Context, client splcommon.ControllerClient,
}
}

// Remove owner reference from KVService CR (delete if last owner)
err = DeleteKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "DeleteKVServiceCR", fmt.Sprintf("remove KVService owner reference failed %s", err.Error()))
return result, err
}

DeleteOwnerReferencesForResources(ctx, client, cr, SplunkLicenseManager)

terminating, err := splctrl.CheckForDeletion(ctx, cr, client)
Expand All @@ -129,6 +136,13 @@ func ApplyLicenseManager(ctx context.Context, client splcommon.ControllerClient,
return result, err
}

// create or update KVService CR with owner reference
err = ApplyKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "ApplyKVServiceCR", fmt.Sprintf("apply KVService CR failed %s", err.Error()))
return result, err
}

// create or update statefulset
statefulSet, err := getLicenseManagerStatefulSet(ctx, client, cr)
if err != nil {
Expand Down
7 changes: 4 additions & 3 deletions pkg/splunk/enterprise/licensemanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ func TestApplyLicenseManager(t *testing.T) {
{MetaName: "*v1.Secret-test-splunk-test-secret"},
{MetaName: "*v1.ConfigMap-test-splunk-license-manager-stack1-configmap"},
{MetaName: "*v1.Service-test-splunk-stack1-license-manager-service"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-license-manager"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
Expand All @@ -76,9 +77,9 @@ func TestApplyLicenseManager(t *testing.T) {
listmockCall := []spltest.MockFuncCall{
{ListOpts: listOpts},
}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[4], funcCalls[6], funcCalls[10], funcCalls[11]}, "Update": {funcCalls[0]}, "List": {listmockCall[0]}}
updateFuncCalls := []spltest.MockFuncCall{funcCalls[0], funcCalls[1], funcCalls[3], funcCalls[4], funcCalls[5], funcCalls[6], funcCalls[9], funcCalls[10], funcCalls[11], funcCalls[12], funcCalls[11], funcCalls[13], funcCalls[13]}
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[5]}, "List": {listmockCall[0]}}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[4], funcCalls[5], funcCalls[7], funcCalls[11], funcCalls[12]}, "Update": {funcCalls[0]}, "List": {listmockCall[0]}}
updateFuncCalls := []spltest.MockFuncCall{funcCalls[0], funcCalls[1], funcCalls[3], funcCalls[4], funcCalls[5], funcCalls[6], funcCalls[7], funcCalls[10], funcCalls[11], funcCalls[12], funcCalls[13], funcCalls[12], funcCalls[14], funcCalls[14]}
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {funcCalls[6]}, "List": {listmockCall[0]}}
current := enterpriseApi.LicenseManager{
TypeMeta: metav1.TypeMeta{
Kind: "LicenseManager",
Expand Down
14 changes: 14 additions & 0 deletions pkg/splunk/enterprise/monitoringconsole.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,13 @@ func ApplyMonitoringConsole(ctx context.Context, client splcommon.ControllerClie
}
}

// Remove owner reference from KVService CR (delete if last owner)
err = DeleteKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "DeleteKVServiceCR", fmt.Sprintf("remove KVService owner reference failed %s", err.Error()))
return result, err
}

terminating, err := splctrl.CheckForDeletion(ctx, cr, client)
if terminating && err != nil { // don't bother if no error, since it will just be removed immmediately after
cr.Status.Phase = enterpriseApi.PhaseTerminating
Expand All @@ -135,6 +142,13 @@ func ApplyMonitoringConsole(ctx context.Context, client splcommon.ControllerClie
return result, err
}

// create or update KVService CR with owner reference
err = ApplyKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "ApplyKVServiceCR", fmt.Sprintf("apply KVService CR failed %s", err.Error()))
return result, err
}

// create or update statefulset
statefulSet, err := getMonitoringConsoleStatefulSet(ctx, client, cr)
if err != nil {
Expand Down
17 changes: 10 additions & 7 deletions pkg/splunk/enterprise/monitoringconsole_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ package enterprise

import (
"context"
"os"
"path/filepath"
"runtime/debug"
"testing"
"time"

enterpriseApi "github.com/splunk/splunk-operator/api/v4"
splclient "github.com/splunk/splunk-operator/pkg/splunk/client"
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"
Expand All @@ -27,13 +33,8 @@ import (
"k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
"os"
"path/filepath"
"runtime/debug"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"testing"
"time"
)

func init() {
Expand All @@ -60,6 +61,7 @@ func TestApplyMonitoringConsole(t *testing.T) {
{MetaName: "*v1.ConfigMap-test-splunk-monitoring-console-stack1-configmap"},
{MetaName: "*v1.Service-test-splunk-stack1-monitoring-console-headless"},
{MetaName: "*v1.Service-test-splunk-stack1-monitoring-console-service"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-monitoring-console"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
Expand All @@ -79,6 +81,7 @@ func TestApplyMonitoringConsole(t *testing.T) {
{MetaName: "*v1.ConfigMap-test-splunk-monitoring-console-stack1-configmap"},
{MetaName: "*v1.Service-test-splunk-stack1-monitoring-console-headless"},
{MetaName: "*v1.Service-test-splunk-stack1-monitoring-console-service"},
{MetaName: "*v4.KVService-test-splunk-test-kvservice"},
{MetaName: "*v1.StatefulSet-test-splunk-stack1-monitoring-console"},
{MetaName: "*v1.ConfigMap-test-splunk-test-probe-configmap"},
{MetaName: "*v1.Secret-test-splunk-test-secret"},
Expand Down Expand Up @@ -106,8 +109,8 @@ func TestApplyMonitoringConsole(t *testing.T) {
{ListOpts: listOpts},
{ListOpts: listOpts2},
}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[4], funcCalls[5], funcCalls[9], funcCalls[11], funcCalls[12], funcCalls[6]}, "Update": {funcCalls[0], funcCalls[12]}, "List": {listmockCall[0]}}
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {updateFuncCalls[5]}, "List": {listmockCall[0]}}
createCalls := map[string][]spltest.MockFuncCall{"Get": funcCalls, "Create": {funcCalls[0], funcCalls[3], funcCalls[4], funcCalls[5], funcCalls[6], funcCalls[10], funcCalls[12], funcCalls[13], funcCalls[7]}, "Update": {funcCalls[0], funcCalls[13]}, "List": {listmockCall[0]}}
updateCalls := map[string][]spltest.MockFuncCall{"Get": updateFuncCalls, "Update": {updateFuncCalls[6]}, "List": {listmockCall[0]}}
current := enterpriseApi.MonitoringConsole{
TypeMeta: metav1.TypeMeta{
Kind: "MonitoringConsole",
Expand Down
14 changes: 14 additions & 0 deletions pkg/splunk/enterprise/searchheadcluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,13 @@ func ApplySearchHeadCluster(ctx context.Context, client splcommon.ControllerClie
}
}

// Remove owner reference from KVService CR (delete if last owner)
err = DeleteKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "DeleteKVServiceCR", fmt.Sprintf("remove KVService owner reference failed %s", err.Error()))
return result, err
}

DeleteOwnerReferencesForResources(ctx, client, cr, SplunkSearchHead)

terminating, err := splctrl.CheckForDeletion(ctx, cr, client)
Expand Down Expand Up @@ -163,6 +170,13 @@ func ApplySearchHeadCluster(ctx context.Context, client splcommon.ControllerClie
return result, err
}

// create or update KVService CR with owner reference
err = ApplyKVServiceCR(ctx, client, cr)
if err != nil {
eventPublisher.Warning(ctx, "ApplyKVServiceCR", fmt.Sprintf("apply KVService CR failed %s", err.Error()))
return result, err
}

// create or update statefulset for the deployer
statefulSet, err := getDeployerStatefulSet(ctx, client, cr)
if err != nil {
Expand Down
Loading
Loading