Skip to content

Ignore secret checks in the indexercluster when the pod is not yet created #1430

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

Merged
merged 4 commits into from
Feb 13, 2025
Merged

Ignore secret checks in the indexercluster when the pod is not yet created #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82fa280
Ignore secret checks in the indexercluster when the pod is not yet cr…
rlieberman-splunk Jan 30, 2025
cda4900
Merge branch 'develop' into idxc_skip_secret_if_no_pod
akondur Feb 5, 2025
f14c67a
Merge branch 'develop' of https://github.com/splunk/splunk-operator i…
rlieberman-splunk Feb 11, 2025
d91bed5
Merge branch 'idxc_skip_secret_if_no_pod' of https://github.com/splun…
rlieberman-splunk Feb 11, 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
14 changes: 12 additions & 2 deletions pkg/splunk/enterprise/indexercluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,17 +653,27 @@ func ApplyIdxcSecret(ctx context.Context, mgr *indexerClusterPodManager, replica
// Get Indexer's name
indexerPodName := GetSplunkStatefulsetPodName(SplunkIndexer, mgr.cr.GetName(), i)

// Check if pod exists before updating secrets
pod := &corev1.Pod{}
namespacedName := types.NamespacedName{Namespace: mgr.cr.GetNamespace(), Name: indexerPodName}
scopedLog.Info("Check if pod is created before updating its secrets")
err := mgr.c.Get(ctx, namespacedName, pod)
if err != nil {
mgr.log.Info("Peer doesn't exists", "peerName", indexerPodName)
continue
}

// Retrieve secret from pod
podSecret, err := splutil.GetSecretFromPod(ctx, mgr.c, indexerPodName, mgr.cr.GetNamespace())
if err != nil {
return fmt.Errorf(fmt.Sprintf(splcommon.PodSecretNotFoundError, indexerPodName))
return fmt.Errorf(splcommon.PodSecretNotFoundError, indexerPodName)
}

// Retrieve idxc_secret token
if indIdxcSecretByte, ok := podSecret.Data[splcommon.IdxcSecret]; ok {
indIdxcSecret = string(indIdxcSecretByte)
} else {
return fmt.Errorf(fmt.Sprintf(splcommon.SecretTokenNotRetrievable, splcommon.IdxcSecret))
return fmt.Errorf(splcommon.SecretTokenNotRetrievable, splcommon.IdxcSecret)
}

// If idxc secret is different from namespace scoped secret change it
Expand Down
14 changes: 14 additions & 0 deletions pkg/splunk/enterprise/indexercluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,6 +1262,20 @@ func TestApplyIdxcSecret(t *testing.T) {
if err.Error() != fmt.Sprintf(splcommon.PodSecretNotFoundError, podName) {
t.Errorf("Couldn't recognize missing secret from Pod, error: %s", err.Error())
}

// Test the secret update is skipped when the pod is not existing
err = splutil.UpdateResource(ctx, c, secrets)
if err != nil {
t.Errorf("Couldn't update resource %v, err: %v", secrets, err)
}
err = splutil.DeleteResource(ctx, c, pod)
if err != nil {
t.Errorf("Couldn't update resource %v, err: %v", pod, err)
}
err = ApplyIdxcSecret(ctx, mgr, 1, mockPodExecClient)
if err != nil {
t.Errorf("Couldn't recognize missing idxc secret %s", err.Error())
}
}

func TestInvalidIndexerClusterSpec(t *testing.T) {
Expand Down
Loading