Merge pull request #1351 from splunk/release/2.6.0

Splunk Operator 2.6.0 release

.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.1.3
+SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.2.2

.github/workflows/build-test-push-workflow.yml

@@ -87,8 +87,12 @@ jobs:
     - name: Login to Amazon ECR
       id: login-ecr
       uses: aws-actions/amazon-ecr-login@v1
-
-
+    - name: Login to Redhat registry
+      uses: docker/login-action@v3
+      with:
+        registry: registry.redhat.io
+        username: ${{ secrets.REDHAT_REGISTRY_ID }}
+        password: ${{ secrets.REDHAT_REGISTRY_PASSWORD }}
     - name: Make Splunk Operator Image
       run: |
         make docker-build IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
@@ -130,6 +134,7 @@ jobs:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+
     - name: Login to Amazon ECR
       uses: aws-actions/amazon-ecr-login@v1
     - name: Pull Splunk Operator Image Locally

Dockerfile

@@ -23,7 +23,6 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM registry.access.redhat.com/ubi8/ubi:8.10
-
 ENV OPERATOR=/manager \
     USER_UID=1001 \
     USER_NAME=nonroot

bundle/manifests/enterprise.splunk.com_clustermanagers.yaml

@@ -39,6 +39,10 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: Auxillary message describing CR status
+      jsonPath: .status.message
+      name: Message
+      type: string
     name: v4
     schema:
       openAPIV3Schema:
@@ -4236,6 +4240,9 @@ spec:
                   needToPushMasterApps:
                     type: boolean
                 type: object
+              message:
+                description: Auxillary message describing CR status
+                type: string
               phase:
                 description: current phase of the cluster manager
                 enum:

bundle/manifests/enterprise.splunk.com_indexerclusters.yaml

@@ -3826,6 +3826,10 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: Auxillary message describing CR status
+      jsonPath: .status.message
+      name: Message
+      type: string
     name: v4
     schema:
       openAPIV3Schema:
@@ -7514,6 +7518,9 @@ spec:
               maintenance_mode:
                 description: Indicates if the cluster is in maintenance mode.
                 type: boolean
+              message:
+                description: Auxillary message describing CR status
+                type: string
               namespace_scoped_secret_resource_version:
                 description: Indicates resource version of namespace scoped secret
                 type: string

bundle/manifests/enterprise.splunk.com_licensemanagers.yaml

@@ -27,6 +27,10 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: Auxillary message describing CR status
+      jsonPath: .status.message
+      name: Message
+      type: string
     name: v4
     schema:
       openAPIV3Schema:
@@ -4099,6 +4103,9 @@ spec:
                     description: App Framework version info for future use
                     type: integer
                 type: object
+              message:
+                description: Auxillary message describing CR status
+                type: string
               phase:
                 description: current phase of the license manager
                 enum:

bundle/manifests/enterprise.splunk.com_monitoringconsoles.yaml

@@ -4157,6 +4157,10 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: Auxillary message describing CR status
+      jsonPath: .status.message
+      name: Message
+      type: string
     name: v4
     schema:
       openAPIV3Schema:
@@ -8237,6 +8241,9 @@ spec:
                   needToPushMasterApps:
                     type: boolean
                 type: object
+              message:
+                description: Auxillary message describing CR status
+                type: string
               phase:
                 description: current phase of the monitoring console
                 enum:

bundle/manifests/enterprise.splunk.com_searchheadclusters.yaml

@@ -4248,6 +4248,10 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: Auxillary message describing CR status
+      jsonPath: .status.message
+      name: Message
+      type: string
     name: v4
     schema:
       openAPIV3Schema:
@@ -8388,6 +8392,9 @@ spec:
                       type: string
                   type: object
                 type: array
+              message:
+                description: Auxillary message describing CR status
+                type: string
               minPeersJoined:
                 description: true if the minimum number of search head cluster members
                   have joined

bundle/manifests/enterprise.splunk.com_standalones.yaml

@@ -4401,6 +4401,10 @@ spec:
       jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    - description: Auxillary message describing CR status
+      jsonPath: .status.message
+      name: Message
+      type: string
     name: v4
     schema:
       openAPIV3Schema:
@@ -8593,6 +8597,9 @@ spec:
                     description: App Framework version info for future use
                     type: integer
                 type: object
+              message:
+                description: Auxillary message describing CR status
+                type: string
               phase:
                 description: current phase of the standalone instances
                 enum:

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-29T18:47:11Z"
+    createdAt: "2024-07-12T00:58:17Z"
     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
@@ -808,14 +808,14 @@ spec:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
-                  value: docker.io/splunk/splunk:9.1.3
+                  value: docker.io/splunk/splunk:9.2.2
                 - name: OPERATOR_NAME
                   value: splunk-operator
                 - name: POD_NAME
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.name
-                image: docker.io/splunk/splunk-operator:2.5.2
+                image: docker.io/splunk/splunk-operator:2.6.0
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -853,6 +853,7 @@ spec:
                   name: app-staging
               securityContext:
                 fsGroup: 1001
+                fsGroupChangePolicy: OnRootMismatch
                 runAsNonRoot: true
                 runAsUser: 1001
               serviceAccountName: splunk-operator-controller-manager
@@ -927,7 +928,7 @@ spec:
     name: Splunk Inc.
     url: www.splunk.com
   relatedImages:
-  - image: docker.io/splunk/splunk:9.1.3
+  - image: docker.io/splunk/splunk:9.2.2
     name: splunk-enterprise
   replaces: splunk-operator.v2.5.1
   version: 2.5.2

config/default/kustomization.yaml

@@ -124,7 +124,7 @@ patches:
       - name: WATCH_NAMESPACE
         value: WATCH_NAMESPACE_VALUE
       - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
-        value: docker.io/splunk/splunk:9.1.3
+        value: docker.io/splunk/splunk:9.2.2
       - name: OPERATOR_NAME
         value: splunk-operator
       - name: POD_NAME

config/manager/kustomization.yaml

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

docs/AppFramework.md

@@ -542,7 +542,7 @@ spec:
       serviceAccountName: splunk-operator
       containers:
       - name: splunk-operator
-        image: "docker.io/splunk/splunk-operator:2.5.2"
+        image: "docker.io/splunk/splunk-operator:2.6.0"
         volumeMounts:
         - mountPath: /opt/splunk/appframework/
           name: app-staging

docs/ChangeLog.md

@@ -1,5 +1,33 @@
 # Splunk Operator for Kubernetes Change Log
 
+## 2.6.0 (2024-07-25)
+
+* This is the 2.6.0 release. The Splunk Operator for Kubernetes is a supported platform for deploying Splunk Enterprise with the prerequisites and constraints laid out [here](https://github.com/splunk/splunk-operator/blob/main/docs/README.md#prerequisites-for-the-splunk-operator)
+
+* CSPL-2721 - Modified Splunk Enterprise deployments upgrade path to speed up the process, updated ubi base image.
+
+* CSPL-2662 - Added troubleshooting documentation.
+
+* CSPL-2626 - Fixed bug in phase initialization, new CR status field, updated aws-sdk-go.
+
+* CSPL-2710: Replace clair with trivy for security scanning.
+
+* CSPL_2598: Fix app package name extraction logic.
+
+* CSPL_2574: Fix bug in appFramework validation.
+
+* CSPL_2532: Change fsGroupChangePolicy to `OnRootMismatch` for Splunk Enterprise and Splunk operator.
+
+### Supported Splunk Version
+>| Splunk Version|
+>| --- |
+>| 9.2.2 |
+
+### Supported Kubernetes Version
+>| Kubernetes Version|
+>| --- |
+>| 1.25+ |
+
 ## 2.5.2 (2024-02-28)
 
 CSPL-2535 security context for init container not set (#1290)

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.2/splunk-operator-cluster.yaml
+wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.6.0/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.2/splunk-operator-cluster.yaml
+wget -O splunk-operator-cluster.yaml https://github.com/splunk/splunk-operator/releases/download/2.6.0/splunk-operator-cluster.yaml
 kubectl apply -f splunk-operator-cluster.yaml
 ```
 
@@ -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.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
+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.6.0/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.2/splunk-operator-namespace.yaml
+wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.6.0/splunk-operator-namespace.yaml
 kubectl apply -f splunk-operator-namespace.yaml
 ```
 

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.2/splunk-operator-namespace.yaml --server-side  --force-conflicts
+kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.6.0/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.2/splunk-operator-cluster.yaml --server-side  --force-conflicts
+kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/2.6.0/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

@@ -25,7 +25,7 @@ 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.2/splunk-operator-namespace.yaml
+wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.6.0/splunk-operator-namespace.yaml
 ```
 ​
 2. (Optional) Review the file and update it with your specific customizations used during your install.