Skip to content

Commit 4217652

Browse files
kasiakoziolkasiakoziol
committed
Merge branch 'feature/cspl-4513-events-for-index-ingest-sep' into feature/CSPL-4354-cluster-manager-reconciler-logging
2 parents e8c4b4c + 2e7f07f commit 4217652

10 files changed

Lines changed: 181 additions & 64 deletions

File tree

‎pkg/splunk/enterprise/clustermanager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ func PushManagerAppsBundle(ctx context.Context, c splcommon.ControllerClient, cr
412412
eventPublisher := GetEventPublisher(ctx, cr)
413413

414414
defaultSecretObjName := splcommon.GetNamespaceScopedSecretName(cr.GetNamespace())
415-
defaultSecret, err := splutil.GetSecretByName(ctx, c, cr.GetNamespace(), cr.GetName(), defaultSecretObjName)
415+
defaultSecret, err := splutil.GetSecretByName(ctx, c, cr.GetNamespace(), defaultSecretObjName)
416416
if err != nil {
417417
eventPublisher.Warning(ctx, "PushManagerAppsBundle", fmt.Sprintf("Could not access default secret object to fetch admin password. Reason %v", err))
418418
return fmt.Errorf("could not access default secret object to fetch admin password. Reason %v", err)

‎pkg/splunk/enterprise/clustermaster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ func PushMasterAppsBundle(ctx context.Context, c splcommon.ControllerClient, cr
391391
eventPublisher := GetEventPublisher(ctx, cr)
392392

393393
defaultSecretObjName := splcommon.GetNamespaceScopedSecretName(cr.GetNamespace())
394-
defaultSecret, err := splutil.GetSecretByName(ctx, c, cr.GetNamespace(), cr.GetName(), defaultSecretObjName)
394+
defaultSecret, err := splutil.GetSecretByName(ctx, c, cr.GetNamespace(), defaultSecretObjName)
395395
if err != nil {
396396
eventPublisher.Warning(ctx, "PushMasterAppsBundle", fmt.Sprintf("Could not access default secret object to fetch admin password. Reason %v", err))
397397
return fmt.Errorf("could not access default secret object to fetch admin password. Reason %v", err)

‎pkg/splunk/enterprise/configuration.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ func ValidateImagePullSecrets(ctx context.Context, c splcommon.ControllerClient,
435435

436436
// If configured, validated if the secret/s exist
437437
for _, secret := range spec.ImagePullSecrets {
438-
_, err := splutil.GetSecretByName(ctx, c, cr.GetNamespace(), cr.GetName(), secret.Name)
438+
_, err := splutil.GetSecretByName(ctx, c, cr.GetNamespace(), secret.Name)
439439
if err != nil {
440440
scopedLog.Error(err, "Couldn't get secret in the imagePullSecrets config", "Secret", secret.Name)
441441
}
@@ -1257,7 +1257,7 @@ func AreRemoteVolumeKeysChanged(ctx context.Context, client splcommon.Controller
12571257
volList := smartstore.VolList
12581258
for _, volume := range volList {
12591259
if volume.SecretRef != "" {
1260-
namespaceScopedSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), cr.GetName(), volume.SecretRef)
1260+
namespaceScopedSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), volume.SecretRef)
12611261
// Ideally, this should have been detected in Spec validation time
12621262
if err != nil {
12631263
*retError = fmt.Errorf("not able to access secret object = %s, reason: %s", volume.SecretRef, err)

‎pkg/splunk/enterprise/indexercluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ func ApplyIdxcSecret(ctx context.Context, mgr *indexerClusterPodManager, replica
899899
if len(mgr.cr.Status.IdxcPasswordChangedSecrets) > 0 {
900900
for podSecretName := range mgr.cr.Status.IdxcPasswordChangedSecrets {
901901
if mgr.cr.Status.IdxcPasswordChangedSecrets[podSecretName] {
902-
podSecret, err := splutil.GetSecretByName(ctx, mgr.c, mgr.cr.GetNamespace(), mgr.cr.GetName(), podSecretName)
902+
podSecret, err := splutil.GetSecretByName(ctx, mgr.c, mgr.cr.GetNamespace(), podSecretName)
903903
if err != nil {
904904
return fmt.Errorf("could not read secret %s, reason - %v", podSecretName, err)
905905
}

‎pkg/splunk/enterprise/licensemanager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ func checkLicenseRelatedPodFailures(ctx context.Context, client splcommon.Contro
262262

263263
// Get admin password from namespace-scoped secret
264264
defaultSecretObjName := splcommon.GetNamespaceScopedSecretName(cr.GetNamespace())
265-
defaultSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), cr.GetName(), defaultSecretObjName)
265+
defaultSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), defaultSecretObjName)
266266
if err != nil {
267267
return fmt.Errorf("failed to get namespace secret for license check: %w", err)
268268
}

‎pkg/splunk/enterprise/searchheadcluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ func ApplyShcSecret(ctx context.Context, mgr *searchHeadClusterPodManager, repli
421421
if len(mgr.cr.Status.AdminPasswordChangedSecrets) > 0 {
422422

423423
for podSecretName := range mgr.cr.Status.AdminPasswordChangedSecrets {
424-
podSecret, err := splutil.GetSecretByName(ctx, mgr.c, mgr.cr.GetNamespace(), mgr.cr.GetName(), podSecretName)
424+
podSecret, err := splutil.GetSecretByName(ctx, mgr.c, mgr.cr.GetNamespace(), podSecretName)
425425
if err != nil {
426426
return fmt.Errorf("could not read secret %s, reason - %v", podSecretName, err)
427427
}

‎pkg/splunk/enterprise/telemetry.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ func SendTelemetry(ctx context.Context, client splcommon.ControllerClient, cr sp
471471
scopedLog.Info("Got service FQDN", "serviceFQDN", serviceFQDN)
472472

473473
defaultSecretObjName := splcommon.GetNamespaceScopedSecretName(cr.GetNamespace())
474-
defaultSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), cr.GetName(), defaultSecretObjName)
474+
defaultSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), defaultSecretObjName)
475475
if err != nil {
476476
scopedLog.Error(err, "Could not access default secret object")
477477
return false

‎pkg/splunk/enterprise/util.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func GetRemoteStorageClient(ctx context.Context, client splcommon.ControllerClie
160160
secretAccessKey = ""
161161
} else {
162162
// Get credentials through the secretRef
163-
remoteDataClientSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), cr.GetName(), appSecretRef)
163+
remoteDataClientSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), appSecretRef)
164164
if err != nil {
165165
// Emit event for missing secret
166166
if k8serrors.IsNotFound(err) {
@@ -420,7 +420,7 @@ func GetSmartstoreRemoteVolumeSecrets(ctx context.Context, volume enterpriseApi.
420420
// Get event publisher from context
421421
eventPublisher := GetEventPublisher(ctx, cr)
422422

423-
namespaceScopedSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), cr.GetName(), volume.SecretRef)
423+
namespaceScopedSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), volume.SecretRef)
424424
if err != nil {
425425
// Emit event for missing secret
426426
if k8serrors.IsNotFound(err) {
@@ -456,7 +456,7 @@ func GetSmartstoreRemoteVolumeSecrets(ctx context.Context, volume enterpriseApi.
456456

457457
// GetQueueRemoteVolumeSecrets is used to retrieve access key and secrete key for Index & Ingestion separation
458458
func GetQueueRemoteVolumeSecrets(ctx context.Context, volume enterpriseApi.VolumeSpec, client splcommon.ControllerClient, cr splcommon.MetaObject) (string, string, string, error) {
459-
namespaceScopedSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), cr.GetName(), volume.SecretRef)
459+
namespaceScopedSecret, err := splutil.GetSecretByName(ctx, client, cr.GetNamespace(), volume.SecretRef)
460460
if err != nil {
461461
return "", "", "", err
462462
}

0 commit comments

Comments
 (0)