Merge branch 'develop' into mc-upgrade-path

splunk · Jul 31, 2024 · 99e1806 · 99e1806
2 parents 7c5c660 + 9a94165
commit 99e1806
Show file tree

Hide file tree

Showing 17 changed files with 21,007 additions and 20,368 deletions.
diff --git a/.env b/.env
@@ -6,4 +6,4 @@ KUBECTL_VERSION=v1.29.1
 AZ_CLI_VERSION=2.30.0
 EKSCTL_VERSION=v0.143.0
 EKS_CLUSTER_K8_VERSION=1.27
-SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.2.2
+SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.2.2
diff --git a/bundle/manifests/enterprise.splunk.com_clustermanagers.yaml b/bundle/manifests/enterprise.splunk.com_clustermanagers.yaml
diff --git a/bundle/manifests/enterprise.splunk.com_clustermasters.yaml b/bundle/manifests/enterprise.splunk.com_clustermasters.yaml
diff --git a/bundle/manifests/enterprise.splunk.com_indexerclusters.yaml b/bundle/manifests/enterprise.splunk.com_indexerclusters.yaml
diff --git a/bundle/manifests/enterprise.splunk.com_licensemanagers.yaml b/bundle/manifests/enterprise.splunk.com_licensemanagers.yaml
diff --git a/bundle/manifests/enterprise.splunk.com_licensemasters.yaml b/bundle/manifests/enterprise.splunk.com_licensemasters.yaml
diff --git a/bundle/manifests/enterprise.splunk.com_monitoringconsoles.yaml b/bundle/manifests/enterprise.splunk.com_monitoringconsoles.yaml
diff --git a/bundle/manifests/enterprise.splunk.com_searchheadclusters.yaml b/bundle/manifests/enterprise.splunk.com_searchheadclusters.yaml
diff --git a/bundle/manifests/enterprise.splunk.com_standalones.yaml b/bundle/manifests/enterprise.splunk.com_standalones.yaml
diff --git a/bundle/manifests/splunk-operator.clusterserviceversion.yaml b/bundle/manifests/splunk-operator.clusterserviceversion.yaml
@@ -111,7 +111,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Big Data, Logging & Tracing, Monitoring, Security, AI/Machine Learning
     containerImage: splunk/splunk-operator@sha256:c4e0d314622699496f675760aad314520d050a66627fdf33e1e21fa28ca85d50
-    createdAt: "2024-07-12T00:58:17Z"
+    createdAt: "2024-07-31T16:34:59Z"
     description: The Splunk Operator for Kubernetes enables you to quickly and easily
       deploy Splunk Enterprise on your choice of private or public cloud provider.
       The Operator simplifies scaling and management of Splunk Enterprise by automating
@@ -120,7 +120,7 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.31.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/splunk/splunk-operator
-  name: splunk-operator.v2.5.2
+  name: splunk-operator.v2.6.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -808,7 +808,7 @@ spec:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
-                  value: docker.io/splunk/splunk:9.2.2
+                  value: splunk/splunk:9.2.2
                 - name: OPERATOR_NAME
                   value: splunk-operator
                 - name: POD_NAME
@@ -928,7 +928,7 @@ spec:
     name: Splunk Inc.
     url: www.splunk.com
   relatedImages:
-  - image: docker.io/splunk/splunk:9.2.2
+  - image: splunk/splunk:9.2.2
     name: splunk-enterprise
-  replaces: splunk-operator.v2.5.1
-  version: 2.5.2
+  replaces: splunk-operator.v2.5.2
+  version: 2.6.0
diff --git a/config/manifests/bases/splunk-operator.clusterserviceversion.yaml b/config/manifests/bases/splunk-operator.clusterserviceversion.yaml
@@ -12,7 +12,7 @@ metadata:
       administrative workflows using Kubernetes best practices.
     olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.9"}]'
     repository: https://github.com/splunk/splunk-operator
-  name: splunk-operator.v2.5.2
+  name: splunk-operator.v2.6.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -274,5 +274,5 @@ spec:
   provider:
     name: Splunk Inc.
     url: www.splunk.com
-  replaces: splunk-operator.v2.5.1
-  version: 2.5.2
+  replaces: splunk-operator.v2.5.2
+  version: 2.6.0
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -3,14 +3,14 @@ entries:
   splunk-enterprise:
   - apiVersion: v2
     appVersion: 2.6.0
-    created: "2024-07-12T00:58:24.613178629Z"
+    created: "2024-07-31T10:42:13.849678-07:00"
     dependencies:
     - condition: splunk-operator.enabled
       name: splunk-operator
       repository: file://splunk-operator/helm-chart/splunk-operator
       version: 2.6.0
     description: A Helm chart for Splunk Enterprise managed by the Splunk Operator
-    digest: b1a3a42b3f74835b05aa023a480534ba6f43868c1836d1578c52453a01fdb3e0
+    digest: fa05e0ecacfc4024a300cd65484f0e0016827de446bf100be86c277018dca509
     maintainers:
     - email: [email protected]
       name: Vivek Reddy
@@ -23,7 +23,7 @@ entries:
     version: 2.6.0
   - apiVersion: v2
     appVersion: 2.5.2
-    created: "2024-07-12T00:58:24.54422365Z"
+    created: "2024-07-31T10:42:13.795951-07:00"
     dependencies:
     - condition: splunk-operator.enabled
       name: splunk-operator
@@ -43,7 +43,7 @@ entries:
     version: 2.5.2
   - apiVersion: v2
     appVersion: 2.5.1
-    created: "2024-07-12T00:58:24.489905165Z"
+    created: "2024-07-31T10:42:13.752073-07:00"
     dependencies:
     - condition: splunk-operator.enabled
       name: splunk-operator
@@ -63,7 +63,7 @@ entries:
     version: 2.5.1
   - apiVersion: v2
     appVersion: 2.5.0
-    created: "2024-07-12T00:58:24.444569349Z"
+    created: "2024-07-31T10:42:13.714088-07:00"
     dependencies:
     - condition: splunk-operator.enabled
       name: splunk-operator
@@ -83,7 +83,7 @@ entries:
     version: 2.5.0
   - apiVersion: v2
     appVersion: 2.4.0
-    created: "2024-07-12T00:58:24.412944843Z"
+    created: "2024-07-31T10:42:13.686497-07:00"
     dependencies:
     - condition: splunk-operator.enabled
       name: splunk-operator
@@ -105,7 +105,7 @@ entries:
     version: 2.4.0
   - apiVersion: v2
     appVersion: 2.3.0
-    created: "2024-07-12T00:58:24.383945661Z"
+    created: "2024-07-31T10:42:13.665878-07:00"
     dependencies:
     - condition: splunk-operator.enabled
       name: splunk-operator
@@ -127,7 +127,7 @@ entries:
     version: 2.3.0
   - apiVersion: v2
     appVersion: 2.2.1
-    created: "2024-07-12T00:58:24.370707068Z"
+    created: "2024-07-31T10:42:13.655097-07:00"
     dependencies:
     - condition: splunk-operator.enabled
       name: splunk-operator
@@ -142,7 +142,7 @@ entries:
     version: 2.2.1
   - apiVersion: v2
     appVersion: 2.2.0
-    created: "2024-07-12T00:58:24.358051227Z"
+    created: "2024-07-31T10:42:13.645119-07:00"
     dependencies:
     - condition: splunk-operator.enabled
       name: splunk-operator
@@ -157,7 +157,7 @@ entries:
     version: 2.2.0
   - apiVersion: v2
     appVersion: 2.1.0
-    created: "2024-07-12T00:58:24.337586215Z"
+    created: "2024-07-31T10:42:13.627782-07:00"
     dependencies:
     - condition: splunk-operator.enabled
       name: splunk-operator
@@ -173,9 +173,9 @@ entries:
   splunk-operator:
   - apiVersion: v2
     appVersion: 2.6.0
-    created: "2024-07-12T00:58:24.714184316Z"
+    created: "2024-07-31T10:42:13.93512-07:00"
     description: A Helm chart for the Splunk Operator for Kubernetes
-    digest: 48482e0cbab6085e4249ca61bd97bb92d7204f761a66e9b42b05170537bb89ef
+    digest: b6dcfa4ed9de85817d7a84fa83aeb573b80c64136b80f9c6089a88d4f6efafff
     maintainers:
     - email: [email protected]
       name: Vivek Reddy
@@ -188,7 +188,7 @@ entries:
     version: 2.6.0
   - apiVersion: v2
     appVersion: 2.5.2
-    created: "2024-07-12T00:58:24.70228675Z"
+    created: "2024-07-31T10:42:13.925592-07:00"
     description: A Helm chart for the Splunk Operator for Kubernetes
     digest: 7ab3e92f9f9f0a964294b95bf32066edb1b6d5375cd59099c9525f3ca733327a
     maintainers:
@@ -203,7 +203,7 @@ entries:
     version: 2.5.2
   - apiVersion: v2
     appVersion: 2.5.1
-    created: "2024-07-12T00:58:24.691482146Z"
+    created: "2024-07-31T10:42:13.915706-07:00"
     description: A Helm chart for the Splunk Operator for Kubernetes
     digest: 5c90889e175bbfc79cbb7f83bf213de43a46c4d688574d04ff82aa16dcd8681a
     maintainers:
@@ -218,7 +218,7 @@ entries:
     version: 2.5.1
   - apiVersion: v2
     appVersion: 2.5.0
-    created: "2024-07-12T00:58:24.679378415Z"
+    created: "2024-07-31T10:42:13.906024-07:00"
     description: A Helm chart for the Splunk Operator for Kubernetes
     digest: ed93f8fac421f92cfdbfd043ec27911a07ec7db2c05b4efc3137cef4f2bfca4a
     maintainers:
@@ -233,7 +233,7 @@ entries:
     version: 2.5.0
   - apiVersion: v2
     appVersion: 2.4.0
-    created: "2024-07-12T00:58:24.667396945Z"
+    created: "2024-07-31T10:42:13.895387-07:00"
     description: A Helm chart for the Splunk Operator for Kubernetes
     digest: 9d0377747e46df4bf4b9dbd447c9ff46c926bfe2c66fd07d6d27a61abb31cb42
     maintainers:
@@ -250,7 +250,7 @@ entries:
     version: 2.4.0
   - apiVersion: v2
     appVersion: 2.3.0
-    created: "2024-07-12T00:58:24.655729326Z"
+    created: "2024-07-31T10:42:13.885523-07:00"
     description: A Helm chart for the Splunk Operator for Kubernetes
     digest: 23e70ec4059bc92920d7d3adce3bff6b8aba0d5eb5d4c0efe225bf3b88d5b274
     maintainers:
@@ -267,7 +267,7 @@ entries:
     version: 2.3.0
   - apiVersion: v2
     appVersion: 2.2.1
-    created: "2024-07-12T00:58:24.643469127Z"
+    created: "2024-07-31T10:42:13.875864-07:00"
     description: A Helm chart for the Splunk Operator for Kubernetes
     digest: 8868b9ae2ebde0c667b13c97d71d904a31b5a9f2c803b199bc77324f1727e1fd
     name: splunk-operator
@@ -277,7 +277,7 @@ entries:
     version: 2.2.1
   - apiVersion: v2
     appVersion: 2.2.0
-    created: "2024-07-12T00:58:24.633040143Z"
+    created: "2024-07-31T10:42:13.866428-07:00"
     description: A Helm chart for the Splunk Operator for Kubernetes
     digest: 49c72276bd7ff93465b0545d8b0814f684cade7d2cd191b6d73d4c3660bd1fb4
     name: splunk-operator
@@ -287,12 +287,12 @@ entries:
     version: 2.2.0
   - apiVersion: v2
     appVersion: 2.1.0
-    created: "2024-07-12T00:58:24.62326607Z"
+    created: "2024-07-31T10:42:13.858019-07:00"
     description: A Helm chart for the Splunk Operator for Kubernetes
     digest: 34e5463f8f5442655d05cb616b50391b738a0827b30d8440b4c7fce99a291d9a
     name: splunk-operator
     type: application
     urls:
     - https://splunk.github.io/splunk-operator/splunk-operator-1.0.0.tgz
     version: 1.0.0
-generated: "2024-07-12T00:58:24.326558338Z"
+generated: "2024-07-31T10:42:13.617356-07:00"
diff --git a/docs/splunk-enterprise-2.6.0.tgz b/docs/splunk-enterprise-2.6.0.tgz
diff --git a/docs/splunk-operator-2.6.0.tgz b/docs/splunk-operator-2.6.0.tgz
diff --git a/helm-chart/splunk-enterprise/charts/splunk-operator-2.6.0.tgz b/helm-chart/splunk-enterprise/charts/splunk-operator-2.6.0.tgz
diff --git a/helm-chart/splunk-operator/values.yaml b/helm-chart/splunk-operator/values.yaml
@@ -32,7 +32,7 @@ splunkOperator:
   # Splunk operator image and pull policy
   # reference: https://github.com/splunk/splunk-operator
   image:
-    repository: docker.io/splunk/splunk-operator:2.5.2
+    repository: docker.io/splunk/splunk-operator:2.6.0
     pullPolicy: IfNotPresent
 
   # Set image pull secrets to pull image from a private registry

diff --git a/test/testenv/mcutil.go b/test/testenv/mcutil.go
@@ -79,7 +79,6 @@ func CheckMCPodReady(ns string) bool {
 func GetConfiguredPeers(ns string, mcName string) []string {
 	podName := fmt.Sprintf(MonitoringConsolePod, mcName)
 	var peerList []string
-	var output []byte
 	if len(podName) > 0 {
 		peerFile := "/opt/splunk/etc/apps/splunk_monitoring_console/local/splunk_monitoring_console_assets.conf"
 		output, err := exec.Command("kubectl", "exec", "-n", ns, podName, "--", "cat", peerFile).Output()
@@ -101,7 +100,7 @@ func GetConfiguredPeers(ns string, mcName string) []string {
 			}
 		}
 	}
-	logf.Log.Info("Peer List found on MC Pod", "MC POD", podName, "Configured Peers", peerList, "splunk_monitoring_console_assets.conf output", output)
+	logf.Log.Info("Peer List found on MC Pod", "MC POD", podName, "Configured Peers", peerList)
 	return peerList
 }