Merge branch 'feature/CSPL-3551-ingestion-cr-todos' into feature/CSPL-3558-integ-tests

Author: kasiakoziol

.env

@@ -1,5 +1,5 @@
 OPERATOR_SDK_VERSION=v1.39.0
-REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol
+REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol,kubabuczak
 GO_VERSION=1.23.0
 AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip
 KUBECTL_VERSION=v1.29.1
@@ -8,4 +8,4 @@ EKSCTL_VERSION=v0.191.0
 EKS_CLUSTER_K8_VERSION=1.31
 EKS_INSTANCE_TYPE=m5.2xlarge
 EKS_INSTANCE_TYPE_ARM64=c6g.4xlarge
-SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.4.3
+SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:10.0.0

.github/workflows/automated-release-workflow.yml

@@ -90,7 +90,7 @@ jobs:
     - name: Create Release
       uses: ncipollo/release-action@40bb172bd05f266cf9ba4ff965cb61e9ee5f6d01
       with:
-        artifacts: "release-${{ github.event.inputs.release_version }}/splunk-operator-cluster.yaml,release-${{ github.event.inputs.release_version }}/splunk-operator-namespace.yaml"
+        artifacts: "release-${{ github.event.inputs.release_version }}/splunk-operator-cluster.yaml,release-${{ github.event.inputs.release_version }}/splunk-operator-namespace.yaml,release-${{ github.event.inputs.release_version }}/splunk-operator-crds.yaml"
         bodyFile: "docs/ReleaseNotes.md"
         tag: "${{ github.event.inputs.release_version }}"
         draft: true

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

@@ -94,7 +94,9 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v1
       - name: Build and push Splunk Operator Image
         run: |
-          make docker-buildx IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA-distroless
+          export BASE_IMAGE=gcr.io/distroless/static-debian12
+          export BASE_IMAGE_VERSION=latest
+          make docker-buildx BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA-distroless
       - name: Sign Splunk Operator image with a key
         run: |
           cosign sign --yes --key env://COSIGN_PRIVATE_KEY  ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }}-distroless

.github/workflows/merge-develop-to-main-workflow.yml

@@ -100,7 +100,7 @@ jobs:
       # Build and push Distroless image
       - name: Build and push Distroless Image
         run: |
-          make docker-buildx IMG=${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }} BASE_IMAGE=gcr.io/distroless/static BASE_IMAGE_VERSION=latest
+          make docker-buildx IMG=${{ secrets.PUBLIC_ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_RC_IMAGE_NAME }}:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }}-distroless BASE_IMAGE=gcr.io/distroless/static BASE_IMAGE_VERSION=latest
 
       - name: Tag and Push Default UBI RC Image
         run: |

.github/workflows/pre-release-workflow.yml

@@ -96,6 +96,15 @@ jobs:
         exclude: "ChangeLog.md"
         include: "helm-chart/splunk-enterprise/**.yaml"
 
+    - name: Update Operator Version in Makefile
+      if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
+      uses: jacobtomlinson/gha-find-replace@v3
+      with:
+        find: "${{ github.event.inputs.old_operator_version }}"
+        replace: "${{ github.event.inputs.new_operator_version }}"
+        exclude: "ChangeLog.md"
+        include: "Makefile"
+
     - name: Update Operator Image name in DOCS
       if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
       uses: jacobtomlinson/gha-find-replace@v3
@@ -114,15 +123,6 @@ jobs:
         exclude: "ChangeLog.md"
         include: "**.md"
 
-    - name: Update Splunk Operator VERSION in DOCS
-      if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
-      uses: jacobtomlinson/gha-find-replace@v3
-      with:
-        find: "${{ github.event.inputs.old_operator_version }} or later"
-        replace: "${{ github.event.inputs.new_operator_version }} or later"
-        exclude: "ChangeLog.md"
-        include: "**.md"
-
     - name: Update Splunk Operator upgrade string in DOCS
       if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
       uses: jacobtomlinson/gha-find-replace@v3
@@ -172,15 +172,6 @@ jobs:
         replace: "${{ github.event.inputs.new_enterprise_version }}"
         include: "**values.yaml"
 
-    - name: Update Splunk Enterprise image in DOCS
-      if: github.event.inputs.old_enterprise_version != github.event.inputs.new_enterprise_version
-      uses: jacobtomlinson/gha-find-replace@v3
-      with:
-        find: "${{ github.event.inputs.old_enterprise_version }} or later"
-        replace: "${{ github.event.inputs.new_enterprise_version }} or later"
-        exclude: "ChangeLog.md"
-        include: "**.md"
-
     - name: Install Operator SDK
       run: |
         export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)
@@ -194,6 +185,10 @@ jobs:
       run: |
         make bundle IMAGE_TAG_BASE=docker.io/splunk/splunk-operator VERSION=${{ github.event.inputs.release_version }} IMG=docker.io/splunk/splunk-operator:${{ github.event.inputs.release_version }} SPLUNK_ENTERPRISE_IMAGE=docker.io/splunk/splunk:${{ github.event.inputs.new_enterprise_version }}
 
+    - name: Remove old helm chart dependencies
+      run: |
+        rm -rf helm-chart/splunk-enterprise/charts/splunk-operator-*
+
     - name: Run helm chart package creation
       run: |
        helm package helm-chart/splunk-operator

Dockerfile

@@ -3,9 +3,9 @@ ARG PLATFORMS=linux/amd64,linux/arm64
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-# This sha relates to ubi minimal version 8.10-1755105495, which is tagged as 8.10 and latest as of Aug 17, 2025
+# This sha relates to ubi minimal version 8.10-1756195339, which is tagged as 8.10 and latest as of Sep 3, 2025
 ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal
-ARG BASE_IMAGE_VERSION=8.10-1755105495
+ARG BASE_IMAGE_VERSION=8.10-1756195339
 
 # Build the manager binary
 FROM golang:1.24.2 AS builder
@@ -73,7 +73,7 @@ RUN if grep -q 'Ubuntu' /etc/os-release; then \
 LABEL name="splunk" \
       maintainer="[email protected]" \
       vendor="splunk" \
-      version="2.8.1" \
+      version="3.0.0" \
       release="1" \
       summary="Simplify the Deployment & Management of Splunk Products on Kubernetes" \
       description="The Splunk Operator for Kubernetes (SOK) makes it easy for Splunk Administrators to deploy and operate Enterprise deployments in a Kubernetes infrastructure. Packaged as a container, it uses the operator pattern to manage Splunk-specific custom resources, following best practices to manage all the underlying Kubernetes objects for you."

Makefile

@@ -158,12 +158,12 @@ docker-push: ## Push docker image with the manager.
 # Defaults:
 #   Build Platform: linux/amd64,linux/arm64
 #   Build Base OS: registry.access.redhat.com/ubi8/ubi-minimal
-#   Build Base OS Version: 8.10-1755105495
+#   Build Base OS Version: 8.10-1756195339
 # Pass only what is required, the rest will be defaulted
 # Setup defaults for build arguments
 PLATFORMS ?= linux/amd64,linux/arm64
 BASE_IMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal
-BASE_IMAGE_VERSION ?= 8.10-1755105495
+BASE_IMAGE_VERSION ?= 8.10-1756195339
 
 docker-buildx:
 	@if [ -z "${IMG}" ]; then \
@@ -174,15 +174,13 @@ docker-buildx:
         	docker buildx use project-v3-builder; \
         if echo "${BASE_IMAGE}" | grep -q "distroless"; then \
             DOCKERFILE="Dockerfile.distroless"; \
-            BUILD_TAG="${IMG}-distroless"; \
         else \
             DOCKERFILE="Dockerfile"; \
-            BUILD_TAG="${IMG}"; \
         fi; \
         docker buildx build --push --platform="${PLATFORMS}" \
             --build-arg BASE_IMAGE="${BASE_IMAGE}" \
             --build-arg BASE_IMAGE_VERSION="${BASE_IMAGE_VERSION}" \
-            --tag "$$BUILD_TAG" -f "$$DOCKERFILE" .; \
+            --tag "${IMG}" -f "$$DOCKERFILE" .; \
         - docker buildx rm project-v3-builder || true
 
 
@@ -372,7 +370,12 @@ generate-artifacts-cluster: manifests kustomize ## Deploy controller to the K8s
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	RELATED_IMAGE_SPLUNK_ENTERPRISE=${SPLUNK_ENTERPRISE_IMAGE} WATCH_NAMESPACE=${WATCH_NAMESPACE} SPLUNK_GENERAL_TERMS=${SPLUNK_GENERAL_TERMS} $(KUSTOMIZE) build config/default > release-${VERSION}/splunk-operator-cluster.yaml
 
-generate-artifacts: generate-artifacts-namespace generate-artifacts-cluster
+
+generate-crds: manifests kustomize ## Generate CRD artifacts
+	mkdir -p release-${VERSION}
+	$(KUSTOMIZE) build config/crd > release-${VERSION}/splunk-operator-crds.yaml
+
+generate-artifacts: generate-artifacts-namespace generate-artifacts-cluster generate-crds
 	echo "artifacts generation complete"
 
 #############################

README.md

@@ -50,9 +50,8 @@ The [Kubernetes Operator SDK](https://github.com/operator-framework/operator-sdk
 must also be installed to build this project.
 
 ```
-git clone -b v1.31.0 https://github.com/operator-framework/operator-sdk
+git clone -b v1.39.0 https://github.com/operator-framework/operator-sdk
 cd operator-sdk
-make tidy
 make install
 ```
 

api/v4/ingestorcluster_types.go

@@ -52,6 +52,8 @@ type IngestorClusterSpec struct {
 // Helper types
 // Only SQS as of now
 type PushBusSpec struct {
+	// +kubebuilder:validation:Enum=sqs_smartbus
+	// +kubebuilder:default=sqs_smartbus
 	Type string `json:"type"`
 
 	SQS SQSSpec `json:"sqs"`
@@ -62,32 +64,46 @@ type SQSSpec struct {
 
 	AuthRegion string `json:"authRegion"`
 
+	// +kubebuilder:validation:Pattern=`^https://`
 	Endpoint string `json:"endpoint"`
 
+	// +kubebuilder:validation:Pattern=`^https://`
 	LargeMessageStoreEndpoint string `json:"largeMessageStoreEndpoint"`
 
+	// +kubebuilder:validation:Pattern=`^s3://`
 	LargeMessageStorePath string `json:"largeMessageStorePath"`
 
 	DeadLetterQueueName string `json:"deadLetterQueueName"`
 
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:default=3
 	MaxRetriesPerPart int `json:"maxRetriesPerPart"`
 
+	// +kubebuilder:validation:Enum=max_count
+	// +kubebuilder:default=max_count
 	RetryPolicy string `json:"retryPolicy"`
 
+	// +kubebuilder:validation:Pattern=`^[0-9]+s$`
+	// +kubebuilder:default="5s"
 	SendInterval string `json:"sendInterval"`
 
 	EncodingFormat string `json:"encodingFormat"`
 }
 
 type PipelineConfigSpec struct {
+	// +kubebuilder:default=false
 	RemoteQueueRuleset bool `json:"remoteQueueRuleset"`
 
+	// +kubebuilder:default=true
 	RuleSet bool `json:"ruleSet"`
 
+	// +kubebuilder:default=false
 	RemoteQueueTyping bool `json:"remoteQueueTyping"`
 
+	// +kubebuilder:default=false
 	RemoteQueueOutput bool `json:"remoteQueueOutput"`
 
+	// +kubebuilder:default=true
 	Typing bool `json:"typing"`
 
 	IndexerPipe bool `json:"indexerPipe"`

bundle.Dockerfile

@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=splunk-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable
 LABEL operators.operatorframework.io.bundle.channel.default.v1: stable
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.39.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3