Merge branch 'develop' into fsGroupOperChanges

splunk · Feb 29, 2024 · a132cd5 · a132cd5
2 parents 841cfe7 + 934d8fb
commit a132cd5
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 92 deletions.
diff --git a/pkg/splunk/common/urls_testingcode.go b/pkg/splunk/common/urls_testingcode.go
diff --git a/pkg/splunk/enterprise/clustermanager_test.go b/pkg/splunk/enterprise/clustermanager_test.go
diff --git a/pkg/splunk/enterprise/clustermaster_test.go b/pkg/splunk/enterprise/clustermaster_test.go
diff --git a/pkg/splunk/enterprise/configuration.go b/pkg/splunk/enterprise/configuration.go
@@ -24,7 +24,7 @@ import (
 	"reflect"
 	"strconv"
 
-	orderedmap "github.com/wk8/go-ordered-map/v2"
+	"github.com/wk8/go-ordered-map/v2"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -833,12 +833,10 @@ func updateSplunkPodTemplateWithConfig(ctx context.Context, client splcommon.Con
 	runAsUser := int64(41812)
 	fsGroup := int64(41812)
 	runAsNonRoot := true
-	fsGroupChangePolicy := corev1.FSGroupChangeOnRootMismatch
 	podTemplateSpec.Spec.SecurityContext = &corev1.PodSecurityContext{
-		RunAsUser:           &runAsUser,
-		FSGroup:             &fsGroup,
-		RunAsNonRoot:        &runAsNonRoot,
-		FSGroupChangePolicy: &fsGroupChangePolicy,
+		RunAsUser:    &runAsUser,
+		FSGroup:      &fsGroup,
+		RunAsNonRoot: &runAsNonRoot,
 	}
 
 	livenessProbe := getLivenessProbe(ctx, cr, instanceType, spec)

diff --git a/pkg/splunk/enterprise/indexercluster_test.go b/pkg/splunk/enterprise/indexercluster_test.go
diff --git a/pkg/splunk/enterprise/licensemanager_test.go b/pkg/splunk/enterprise/licensemanager_test.go
diff --git a/pkg/splunk/enterprise/licensemaster_test.go b/pkg/splunk/enterprise/licensemaster_test.go
diff --git a/pkg/splunk/enterprise/monitoringconsole_test.go b/pkg/splunk/enterprise/monitoringconsole_test.go
diff --git a/pkg/splunk/enterprise/searchheadcluster_test.go b/pkg/splunk/enterprise/searchheadcluster_test.go
diff --git a/pkg/splunk/enterprise/standalone_test.go b/pkg/splunk/enterprise/standalone_test.go