Merge pull request #1380 from splunk/promote-develop-to-main-2.6.1

Promote Develop to main for Splunk Operator Release 2.6.1

.env

@@ -1,9 +1,9 @@
 OPERATOR_SDK_VERSION=v1.31.0
 REVIEWERS=vivekr-splunk,akondur
-GO_VERSION=1.21.5
+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
 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.3.0

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

@@ -61,7 +61,7 @@ jobs:
         make generate-artifacts  IMG=splunk/splunk-operator:${{ github.event.inputs.release_version }} VERSION=${{ github.event.inputs.release_version }} SPLUNK_ENTERPRISE_IMAGE=splunk/splunk:${{ github.event.inputs.enterprise_version }}
 
     - name: Upload Release Artifacts
-      uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
+      uses: actions/upload-artifact@v4.4.0
       with:
         name: "release-artifacts-${{ github.event.inputs.release_version }}"
         path: "release-**"

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

@@ -41,7 +41,7 @@ jobs:
       - name: Run Code Coverage
         run: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }}
       - name: Upload Coverage artifacts
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: coverage.out
           path: coverage.out
@@ -87,12 +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: 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
@@ -295,7 +295,7 @@ jobs:
           find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
       - name: Archive Pod Logs
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
           path: "/tmp/pod_logs/**"

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

@@ -219,7 +219,7 @@ jobs:
           find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
       - name: Archive Pod Logs
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: "splunk-pods-logs--artifacts-appframeworkazure"
           path: "/tmp/pod_logs/**"

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

@@ -193,7 +193,7 @@ jobs:
           find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
       - name: Archive Pod Logs
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
           path: "/tmp/pod_logs/**"

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

@@ -151,7 +151,7 @@ jobs:
           find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
       - name: Archive Pod Logs
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
           path: "/tmp/pod_logs/**"

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

@@ -101,7 +101,7 @@ jobs:
         docker push splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC
 
     - name: Upload Release Artifacts
-      uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
+      uses: actions/upload-artifact@v4.4.0
       with:
         name: "release-artifacts-${{ github.event.inputs.release_version }}-RC"
         path: "release-**"

.github/workflows/namespace-scope-int-workflow.yml

@@ -148,7 +148,7 @@ jobs:
           find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
       - name: Archive Pod Logs
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
           path: "/tmp/pod_logs/**"

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

@@ -187,7 +187,7 @@ jobs:
           find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
       - name: Archive Pod Logs if Failure in Smoke Test
         if: ${{ always() }}
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
           path: "/tmp/pod_logs/**"

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

@@ -71,7 +71,7 @@ jobs:
 
     - name: Update Operator Image name in Helm
       if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
-      uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
         find: "splunk-operator:${{ github.event.inputs.old_operator_version }}"
         replace: "splunk-operator:${{ github.event.inputs.new_operator_version }}"
@@ -80,25 +80,25 @@ jobs:
 
     - name: Update Helm Version
       if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
-      uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
-        find: "version: ${{ github.event.inputs.old_operator_version }}"
-        replace: "version: ${{ github.event.inputs.new_operator_version }}"
+        find: "${{ github.event.inputs.old_operator_version }}"
+        replace: "${{ github.event.inputs.new_operator_version }}"
         exclude: "ChangeLog.md"
-        include: "Chart.yaml"
+        include: "helm-chart/splunk-operator/**.yaml"
 
     - name: Update Helm App Version
       if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
-      uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
-        find: "appVersion: ${{ github.event.inputs.old_operator_version }}"
-        replace: "appVersion: ${{ github.event.inputs.new_operator_version }}"
+        find: "${{ github.event.inputs.old_operator_version }}"
+        replace: "${{ github.event.inputs.new_operator_version }}"
         exclude: "ChangeLog.md"
-        include: "Chart.yaml"
+        include: "helm-chart/splunk-enterprise/**.yaml"
 
     - 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@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
         find: "splunk-operator:${{ github.event.inputs.old_operator_version }}"
         replace: "splunk-operator:${{ github.event.inputs.new_operator_version }}"
@@ -107,7 +107,7 @@ jobs:
 
     - name: Update Splunk Operator Install URL in DOCS
       if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
-      uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
         find: "/download/${{ github.event.inputs.old_operator_version }}/splunk-operator"
         replace: "/download/${{ github.event.inputs.new_operator_version }}/splunk-operator"
@@ -116,7 +116,7 @@ jobs:
 
     - 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@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      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"
@@ -125,7 +125,7 @@ jobs:
 
     - 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@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
         find: "Steps to upgrade from version greater than 1.0.5 to ${{ github.event.inputs.old_operator_version }}"
         replace: "Steps to upgrade from version greater than 1.0.5 to ${{ github.event.inputs.new_operator_version }}"
@@ -134,7 +134,7 @@ jobs:
 
     - name: Update Splunk Operator Release URL in DOCS
       if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
-      uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
         find: "https://github.com/splunk/splunk-operator/releases/download/${{ github.event.inputs.old_operator_version }}/splunk-operator-install.yaml"
         replace: "https://github.com/splunk/splunk-operator/releases/download/${{ github.event.inputs.new_operator_version }}/splunk-operator-install.yaml"
@@ -143,30 +143,30 @@ jobs:
 
     - name: Update Splunk Enterprise Image in operator.yaml
       if: github.event.inputs.old_enterprise_version != github.event.inputs.new_enterprise_version
-      uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
         find: "${{ github.event.inputs.old_enterprise_version }}"
         replace: "${{ github.event.inputs.new_enterprise_version }}"
         include: "**operator.yaml"
 
     - name: Update Splunk Enterprise Release Image in .env file
-      uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
         find: "${{ github.event.inputs.old_enterprise_version }}"
         replace: "${{ github.event.inputs.new_enterprise_version }}"
         include: ".env"
 
     - name: Update Splunk Enterprise Image in helm
       if: github.event.inputs.old_enterprise_version != github.event.inputs.new_enterprise_version
-      uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      uses: jacobtomlinson/gha-find-replace@v3
       with:
         find: "${{ github.event.inputs.old_enterprise_version }}"
         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@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
+      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"

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21.1 as builder
+FROM golang:1.23.0 AS builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -188,7 +188,7 @@ $(LOCALBIN):
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v4.5.5
-CONTROLLER_TOOLS_VERSION ?= v0.11.3
+CONTROLLER_TOOLS_VERSION ?= v0.16.1
 
 CONTROLLER_GEN = $(LOCALBIN)/controller-gen
 controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

README.md

@@ -26,7 +26,7 @@ You must have [Docker Engine](https://docs.docker.com/install/) installed to
 build the Splunk Operator.
 
 This project uses [Go modules](https://blog.golang.org/using-go-modules),
-and requires [golang](https://golang.org/doc/install) 1.21.1 or later.
+and requires [golang](https://golang.org/doc/install) 1.23.0 or later.
 You must `export GO111MODULE=on` if cloning these repositories into your
 `$GOPATH` (not recommended).