Promote Develop to main for Splunk Operator Release 2.5.2

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 2.5.0
+VERSION ?= 2.5.2
 
 # SPLUNK_ENTERPRISE_IMAGE defines the splunk docker tag that is used as default image.
 SPLUNK_ENTERPRISE_IMAGE ?= "docker.io/splunk/splunk:edge"

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-02-20T18:45:06Z"
+    createdAt: "2024-02-29T18:47:11Z"
     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.1
+  name: splunk-operator.v2.5.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -815,7 +815,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.name
-                image: docker.io/splunk/splunk-operator:2.5.1
+                image: docker.io/splunk/splunk-operator:2.5.2
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -929,5 +929,5 @@ spec:
   relatedImages:
   - image: docker.io/splunk/splunk:9.1.3
     name: splunk-enterprise
-  replaces: splunk-operator.v2.5.0
-  version: 2.5.1
+  replaces: splunk-operator.v2.5.1
+  version: 2.5.2

config/manager/kustomization.yaml

@@ -17,4 +17,5 @@ kind: Kustomization
 images:
 - name: controller
   newName: docker.io/splunk/splunk-operator
-  newTag: 2.5.1
+  newTag: 2.5.2
+

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.1
+  name: splunk-operator.v2.5.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -274,5 +274,6 @@ spec:
   provider:
     name: Splunk Inc.
     url: www.splunk.com
-  replaces: splunk-operator.v2.5.0
-  version: 2.5.1
+  replaces: splunk-operator.v2.5.1
+  version: 2.5.2
+

docs/AppFramework.md

@@ -542,7 +542,7 @@ spec:
       serviceAccountName: splunk-operator
       containers:
       - name: splunk-operator
-        image: "docker.io/splunk/splunk-operator:2.5.1"
+        image: "docker.io/splunk/splunk-operator:2.5.2"
         volumeMounts:
         - mountPath: /opt/splunk/appframework/
           name: app-staging
@@ -559,7 +559,7 @@ spec:
         - name: OPERATOR_NAME
           value: "splunk-operator"
         - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
-          value: "docker.io/splunk/splunk:9.0.3-a2"
+          value: "docker.io/splunk/splunk:9.1.3"
 
       volumes:
       - name: app-staging

docs/ChangeLog.md

@@ -1,5 +1,20 @@
 # Splunk Operator for Kubernetes Change Log
 
+## 2.5.2 (2024-02-28)
+
+CSPL-2535 security context for init container not set (#1290)
+
+### Supported Splunk Version
+>| Splunk Version|
+>| --- |
+>| 9.0.8 |
+>| 9.1.3 |
+
+### Supported Kubernetes Version
+>| Kubernetes Version|
+>| --- |
+>| 1.25+ |
+
 ## 2.5.1 (2024-02-20)
 
 CSPL-2532: fix for leader election lost issue (#1281)

docs/Helm.md

@@ -35,7 +35,7 @@ There are a couple ways you can configure your operator deployment
 
 1. Using a ```new_values.yaml``` file to override default values (Recommended)
 ```
-helm install -f new_values.yaml <RELEASE_NAME> splunk/splunk-operator -n <RELEASE_NAMESPACE>
+helm install -f new_values.yaml --set installCRDs=true <RELEASE_NAME> splunk/splunk-operator -n <RELEASE_NAMESPACE>
 ```
 
 2. Using the Helm CLI directly to set new values
@@ -46,7 +46,7 @@ helm install --set <KEY>=<VALUE> <RELEASE_NAME> splunk/splunk-operator -n <RELEA
 If the release already exists, we can use ```helm upgrade``` to configure and upgrade the deployment using a file or the CLI directly as above.
 
 ```
-helm upgrade -f new_values.yaml <RELEASE_NAME> splunk/splunk-operator -n <RELEASE_NAMESPACE>
+helm upgrade -f new_values.yaml --set installCRDs=true <RELEASE_NAME> splunk/splunk-operator -n <RELEASE_NAMESPACE>
 ```
 
 Read more about configuring values [here](https://helm.sh/docs/intro/using_helm/).
@@ -74,7 +74,7 @@ The ```helm list``` command can be used to retrieve all deployed releases.
 
 By default, the Splunk Operator has cluster-wide access. Let's upgrade the ```splunk-operator-test``` release by revoking cluster-wide access:
 ```
-helm upgrade --set splunkOperator.clusterWideAccess=false splunk-operator-test splunk/splunk-operator -n splunk-operator
+helm upgrade --set splunkOperator.clusterWideAccess=false --set installCRDs=true splunk-operator-test splunk/splunk-operator -n splunk-operator
 ```
 ```
 NAME: splunk-operator-test
@@ -100,7 +100,7 @@ helm dependency build splunk/splunk-enterprise
 ```
 If the operator is already installed then you will need to disable the dependency:
 ```
-helm install --set splunk-operator.enabled=false <RELEASE_NAME> splunk/splunk-enterprise -n <RELEASE_NAMESPACE>
+helm install --set splunk-operator.enabled=false --set installCRDs=true <RELEASE_NAME> splunk/splunk-enterprise -n <RELEASE_NAMESPACE>
 ```
 Installing ```splunk/splunk-enterprise``` will deploy Splunk Enterprise custom resources according to your configuration, the following ```new_values.yaml``` file specifies override configurations to deploy a Cluster Manager, an Indexer Cluster and a Search Head Cluster.
 
@@ -124,7 +124,7 @@ helm show values splunk/splunk-enterprise
 
 To install a Splunk Enterprise deployment according to our configurations above:
 ```
-helm install -f new_values.yaml splunk-enterprise-test splunk/splunk-enterprise -n splunk-operator
+helm install --set installCRDs=true -f new_values.yaml splunk-enterprise-test splunk/splunk-enterprise -n splunk-operator
 ```
 ```
 NAME: splunk-enterprise-test
@@ -166,6 +166,6 @@ The Splunk Enterprise chart has support for three Splunk Validated Architectures
 
 Install a Standalone deployment using the following command:
 ```
-helm install --set s1.enabled=true <RELEASE_NAME> splunk/splunk-enterprise -n <RELEASE_NAMESPACE>
+helm install --set s1.enabled=true --set installCRDs=true <RELEASE_NAME> splunk/splunk-enterprise -n <RELEASE_NAMESPACE>
 ```
 Visit the Splunk Operator github repository to learn more about the configurable values of [splunk/splunk-operator](https://github.com/splunk/splunk-operator/blob/develop/helm-chart/splunk-operator/values.yaml) and [splunk/splunk-enterprise](https://github.com/splunk/splunk-operator/blob/develop/helm-chart/splunk-enterprise/values.yaml).

docs/Install.md

@@ -7,7 +7,7 @@
 If you want to customize the installation of the Splunk Operator, download a copy of the installation YAML locally, and open it in your favorite editor.
 
 ```
-wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-cluster.yaml
+wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-cluster.yaml
 ```
 
 ## Default Installation
@@ -17,7 +17,7 @@ Based on the file used Splunk Operator can be installed cluster-wide or namespac
 By installing `splunk-operator-cluster.yaml` Operator will watch all the namespaces of your cluster for splunk enterprise custom resources
 
 ```
-wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-cluster.yaml
+wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-cluster.yaml
 kubectl apply -f splunk-operator-cluster.yaml
 ```
 
@@ -31,7 +31,7 @@ If Splunk Operator is installed clusterwide and user wants to manage multiple na
         - name: WATCH_NAMESPACE
           value: "namespace1,namespace2"
         - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
-          value: splunk/splunk:9.0.3-a2
+          value: splunk/splunk:9.1.3
         - name: OPERATOR_NAME
           value: splunk-operator
         - name: POD_NAME
@@ -44,10 +44,10 @@ If Splunk Operator is installed clusterwide and user wants to manage multiple na
 
 ## Install operator to watch single namespace with restrictive permission
 
-In order to install operator with restrictive permission to watch only single namespace use [splunk-operator-namespace.yaml](https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-namespace.yaml). This will create Role and Role-Binding to only watch single namespace. By default operator will be installed in `splunk-operator` namespace, user can edit the file to change the namespace
+In order to install operator with restrictive permission to watch only single namespace use [splunk-operator-namespace.yaml](https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml). This will create Role and Role-Binding to only watch single namespace. By default operator will be installed in `splunk-operator` namespace, user can edit the file to change the namespace
 
 ```
-wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-namespace.yaml
+wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml
 kubectl apply -f splunk-operator-namespace.yaml
 ```
 
@@ -68,7 +68,7 @@ If you are using a private registry for the Docker images, edit `deployment` `sp
         - name: WATCH_NAMESPACE
           value: "namespace1,namespace2"
         - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
-          value: splunk/splunk:9.0.3-a2
+          value: splunk/splunk:9.1.3
         - name: OPERATOR_NAME
           value: splunk-operator
         - name: POD_NAME

docs/MultisiteExamples.md

@@ -45,7 +45,7 @@ Limitation: all the IndexerCluster resources must be located in the same namespa
 
 #### Deploy the cluster-manager
 
-Note: 
+Note:
 * The image version is defined in these resources as this allows to control the upgrade cycle
 * For all available default parameters refer to [splunk-ansible default.yml.spec.md](https://github.com/splunk/splunk-ansible/blob/develop/docs/advanced/default.yml.spec.md)
 
@@ -148,7 +148,7 @@ metadata:
   - enterprise.splunk.com/delete-pvc
 spec:
   replicas: 3
-  image: "splunk/splunk:9.0.3-a2"
+  image: "splunk/splunk:9.1.3"
   clusterManagerRef:
     name: example
   defaults: |-
@@ -157,4 +157,3 @@ spec:
       site: site0
 EOF
 ```
-

docs/README.md

@@ -113,12 +113,12 @@ For production environments, we are requiring the use of Splunk SmartStore. As a
 
 A Kubernetes cluster administrator can install and start the Splunk Operator for specific namespace by running:
 ```
-kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-namespace.yaml --server-side  --force-conflicts
+kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml --server-side  --force-conflicts
 ```
 
 A Kubernetes cluster administrator can install and start the Splunk Operator for cluster-wide by running:
 ```
-kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-cluster.yaml --server-side  --force-conflicts
+kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-cluster.yaml --server-side  --force-conflicts
 ```
 
 The [Advanced Installation Instructions](Install.md) page offers guidance for advanced configurations, including the use of private image registries, installation at cluster scope, and installing the Splunk Operator as a user who is not a Kubernetes administrator. Users of Red Hat OpenShift should review the [Red Hat OpenShift](OpenShift.md) page.

docs/SplunkOperatorUpgrade.md

@@ -1,6 +1,5 @@
 # How to upgrade Splunk Operator and Splunk Enterprise Deployments
 
-To upgrade the Splunk Operator for Kubernetes, you will overwrite the prior Operator release with the latest version. Once the lastest version of `splunk-operator-namespace.yaml` ([see below](#upgrading-splunk-operator-and-splunk-operator-deployment)) is applied the CRD's are updated and Operator deployment is updated with newer version of Splunk Operator image. Any new spec defined by the operator will be applied to the pods managed by Splunk Operator for Kubernetes.
 To upgrade the Splunk Operator for Kubernetes, you will overwrite the prior Operator release with the latest version. Once the lastest version of `splunk-operator-namespace.yaml` ([see below](#upgrading-splunk-operator-and-splunk-operator-deployment)) is applied the CRD's are updated and Operator deployment is updated with newer version of Splunk Operator image. Any new spec defined by the operator will be applied to the pods managed by Splunk Operator for Kubernetes.
 ​
 A Splunk Operator for Kubernetes upgrade might include support for a later version of the Splunk Enterprise Docker image. In that scenario, after the Splunk Operator completes its upgrade, the pods managed by Splunk Operator for Kubernetes will be restarted using the latest Splunk Enterprise Docker image.
@@ -12,7 +11,6 @@ A Splunk Operator for Kubernetes upgrade might include support for a later versi
 * Before you upgrade, review the Splunk Operator [change log](https://github.com/splunk/splunk-operator/releases) page for information on changes made in the latest release. The Splunk Enterprise Docker image compatibility is noted in each release version.
 ​
 * If the Splunk Enterprise Docker image changes, review the Splunk Enterprise [Upgrade Readme](https://docs.splunk.com/Documentation/Splunk/latest/Installation/AboutupgradingREADTHISFIRST) page before upgrading.
-* If the Splunk Enterprise Docker image changes, review the Splunk Enterprise [Upgrade Readme](https://docs.splunk.com/Documentation/Splunk/latest/Installation/AboutupgradingREADTHISFIRST) page before upgrading.
 ​
 * For general information about Splunk Enterprise compatibility and the upgrade process, see [How to upgrade Splunk Enterprise](https://docs.splunk.com/Documentation/Splunk/latest/Installation/HowtoupgradeSplunk).
 ​
@@ -27,7 +25,8 @@ A Splunk Operator for Kubernetes upgrade might include support for a later versi
 1. Download the latest Splunk Operator installation yaml file.
 ​
 ```
-wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.1/splunk-operator-namespace.yaml
+wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml
+
 ```
 ​
 2. (Optional) Review the file and update it with your specific customizations used during your install.
@@ -106,7 +105,7 @@ Edit `deployment` `splunk-operator-controller-manager-<podid>` in `splunk-operat
         - name: WATCH_NAMESPACE
           value: "splunk-operator"
         - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
-          value: splunk/splunk:9.0.3-a2
+          value: splunk/splunk:9.1.3
         - name: OPERATOR_NAME
           value: splunk-operator
         - name: POD_NAME
@@ -141,7 +140,7 @@ To verify that a new Splunk Enterprise Docker image was applied to a pod, you ca
 ​
 ```bash
 kubectl get pods splunk-<crname>-monitoring-console-0 -o yaml | grep -i image
-image: splunk/splunk:9.0.3-a2
+image: splunk/splunk:9.1.3
 imagePullPolicy: IfNotPresent
 ```
 ## Splunk Enterprise Cluster upgrade example