Main to dev back merge 2.5.2

.env

@@ -1,9 +1,9 @@
-OPERATOR_SDK_VERSION=v1.28.1
-REVIEWERS=smohan-splunk,sgontla,gaurav-splunk,vivekr-splunk,kumarajeet
-GO_VERSION=1.19.2
+OPERATOR_SDK_VERSION=v1.31.0
+REVIEWERS=vivekr-splunk,akondur
+GO_VERSION=1.21.5
 AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip
-KUBECTL_VERSION=v1.28.0
+KUBECTL_VERSION=v1.29.1
 AZ_CLI_VERSION=2.30.0
 EKSCTL_VERSION=v0.143.0
-EKS_CLUSTER_K8_VERSION=1.26
-SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.1.1
+EKS_CLUSTER_K8_VERSION=1.27
+SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.1.3

.github/workflows/helm-test-workflow.yml

@@ -4,6 +4,7 @@ on:
     branches:
       - develop
       - main
+      - feature**
 jobs:
   build-operator-image:
     runs-on: ubuntu-latest

.github/workflows/int-test-workflow.yml

@@ -8,6 +8,7 @@ on:
 jobs:
   build-operator-image:
     runs-on: ubuntu-latest
+    timeout-minutes: 360
     env:
       SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }}
       SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator

.github/workflows/nightly-int-test-workflow.yml

@@ -1,7 +1,7 @@
 name: Nightly Integration Test WorkFlow
 on:
   schedule:
-    - cron: "0 06 * * *"
+    - cron: "0 06 * * 0"
 jobs:
   build-operator-image:
     runs-on: ubuntu-latest

Makefile

@@ -3,17 +3,17 @@
 # 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.2.1
+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"
 
 # WATCH_NAMESPACE defines if its clusterwide operator or namespace specific
-# by default we leave it as clusterwide if it has to be namespace specific, 
+# by default we leave it as clusterwide if it has to be namespace specific,
 # add namespace to this
 WATCH_NAMESPACE ?= ""
 
-# NAMESPACE defines default namespace where operator will be installed 
+# NAMESPACE defines default namespace where operator will be installed
 NAMESPACE ?= "splunk-operator"
 
 # CHANNELS define the bundle channels used in the bundle.

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: "2023-10-06T22:35:48Z"
+    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.2.1
+  name: splunk-operator.v2.5.2
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -788,8 +788,15 @@ spec:
                     memory: 64Mi
                 securityContext:
                   allowPrivilegeEscalation: false
+                  capabilities:
+                    add:
+                    - NET_BIND_SERVICE
+                    drop:
+                    - ALL
                   readOnlyRootFilesystem: true
                   runAsNonRoot: true
+                  seccompProfile:
+                    type: RuntimeDefault
               - args:
                 - --leader-elect
                 - --pprof
@@ -801,14 +808,14 @@ spec:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
                 - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
-                  value: docker.io/splunk/splunk:9.1.1
+                  value: docker.io/splunk/splunk:9.1.3
                 - name: OPERATOR_NAME
                   value: splunk-operator
                 - name: POD_NAME
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.name
-                image: docker.io/splunk/splunk-operator:2.4.0
+                image: docker.io/splunk/splunk-operator:2.5.2
                 imagePullPolicy: Always
                 livenessProbe:
                   httpGet:
@@ -832,8 +839,15 @@ spec:
                     memory: 2000Mi
                 securityContext:
                   allowPrivilegeEscalation: false
+                  capabilities:
+                    add:
+                    - NET_BIND_SERVICE
+                    drop:
+                    - ALL
                   readOnlyRootFilesystem: true
                   runAsNonRoot: true
+                  seccompProfile:
+                    type: RuntimeDefault
                 volumeMounts:
                 - mountPath: /opt/splunk/appframework/
                   name: app-staging
@@ -913,7 +927,7 @@ spec:
     name: Splunk Inc.
     url: www.splunk.com
   relatedImages:
-  - image: docker.io/splunk/splunk:9.1.1
+  - image: docker.io/splunk/splunk:9.1.3
     name: splunk-enterprise
-  replaces: splunk-operator.v2.2.0
-  version: 2.2.1
+  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.1
+        value: docker.io/splunk/splunk:9.1.3
       - name: OPERATOR_NAME
         value: splunk-operator
       - name: POD_NAME

config/default/manager_auth_proxy_patch.yaml

@@ -18,6 +18,13 @@ spec:
           allowPrivilegeEscalation: false
           readOnlyRootFilesystem: true
           runAsNonRoot: true
+          capabilities:
+            drop:
+              - "ALL"
+            add:
+              - "NET_BIND_SERVICE"
+          seccompProfile:
+            type: "RuntimeDefault"
         image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
         args:
         - "--secure-listen-address=0.0.0.0:8443"

config/manager/kustomization.yaml

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

config/manager/manager.yaml

@@ -17,7 +17,7 @@ spec:
     matchLabels:
       control-plane: controller-manager
       name: splunk-operator
-  strategy: 
+  strategy:
     type: Recreate
   replicas: 1
   template:
@@ -54,6 +54,13 @@ spec:
           allowPrivilegeEscalation: false
           readOnlyRootFilesystem: true
           runAsNonRoot: true
+          capabilities:
+            drop:
+              - "ALL"
+            add:
+              - "NET_BIND_SERVICE"
+          seccompProfile:
+            type: "RuntimeDefault"
         livenessProbe:
           httpGet:
             path: /healthz

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.2.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.2.0
-  version: 2.2.1
+  replaces: splunk-operator.v2.5.1
+  version: 2.5.2
+