Merge pull request #1781 from splunk/promote-develop-to-main-3.1.0

Promote Develop to main for Splunk Operator Release 3.1.0

Author: gabrielm-splunk

.biased_lang_exclude

@@ -19,6 +19,7 @@ config/examples/licensemaster/default.yaml
 config/rbac/licensemaster_editor_role.yaml
 config/rbac/licensemaster_viewer_role.yaml
 config/samples/enterprise_v3_licensemaster.yaml
+config/webhook/manifests.yaml
 tools/make_bundle.sh
 config/samples/kustomization.yaml
 config/manifests/bases/splunk-operator.clusterserviceversion.yaml
@@ -75,6 +76,7 @@ api/v4/zz_generated.deepcopy.go
 api/v4/common_types.go
 #Below should be reviewed once CRDs have no bias lang
 tools/bias_lang_migration.sh
+go.mod
 go.sum
 .github/
 .circleci/

.env

@@ -1,11 +1,11 @@
-OPERATOR_SDK_VERSION=v1.39.0
-REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol
-GO_VERSION=1.23.0
+OPERATOR_SDK_VERSION=v1.42.0
+REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol,kubabuczak,gabrielm-splunk,minjieqiu,qingw-splunk
+GO_VERSION=1.25.7
 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.191.0
-EKS_CLUSTER_K8_VERSION=1.31
+AZ_CLI_VERSION=2.79.0
+EKSCTL_VERSION=v0.215.0
+EKS_CLUSTER_K8_VERSION=1.34
 EKS_INSTANCE_TYPE=m5.2xlarge
 EKS_INSTANCE_TYPE_ARM64=c6g.4xlarge
 SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:10.0.0

.github/actions/set-cluster-name/action.yml

@@ -0,0 +1,50 @@
+name: 'Set EKS Test Cluster Name'
+description: 'Generate a shortened, standardized EKS test cluster name'
+inputs:
+  test-type:
+    description: 'Type of test (e.g., smoke, integration)'
+    required: true
+  platform:
+    description: 'Platform variant (e.g., distroless, arm-ubuntu, arm-rhel, arm-al2023, helm, namespace, nightly, manual, or empty for standard)'
+    required: false
+    default: ''
+  test-name:
+    description: 'Test name from matrix (e.g., basic, managerappframeworkc3)'
+    required: true
+  run-id:
+    description: 'GitHub run ID for uniqueness'
+    required: true
+outputs:
+  cluster-name:
+    description: 'The generated cluster name'
+    value: ${{ steps.generate-name.outputs.cluster_name }}
+runs:
+  using: "composite"
+  steps:
+    - name: Generate cluster name
+      id: generate-name
+      shell: bash
+      run: |
+        TEST_NAME="${{ inputs.test-name }}"
+        
+        # Shorten long test names
+        case "$TEST_NAME" in
+          managerappframeworkc3) TEST_NAME="mgr-appfw-c3" ;;
+          managerappframeworkm4) TEST_NAME="mgr-appfw-m4" ;;
+          appframeworksS1) TEST_NAME="appfw-s1" ;;
+          managersecret) TEST_NAME="mgr-secret" ;;
+          managermc) TEST_NAME="mgr-mc" ;;
+        esac
+        
+        # Build cluster name based on platform
+        if [ -z "${{ inputs.platform }}" ]; then
+          # Standard platform (no platform suffix)
+          CLUSTER_NAME="eks-test-${{ inputs.test-type }}-${TEST_NAME}-${{ inputs.run-id }}"
+        else
+          # Platform-specific
+          CLUSTER_NAME="eks-test-${{ inputs.test-type }}-${{ inputs.platform }}-${TEST_NAME}-${{ inputs.run-id }}"
+        fi
+        
+        echo "cluster_name=${CLUSTER_NAME}" >> $GITHUB_OUTPUT
+        echo "Generated cluster name: ${CLUSTER_NAME}"
+

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

@@ -1,11 +1,12 @@
 name: Arm AL2023 Smoke Test WorkFlow
 permissions:
   contents: read
+  checks: write
   packages: write
   id-token: write
   pull-requests: write
 on:
-  workflow_dispatch:  
+  workflow_dispatch:
     inputs:
       splunk_image_repository_tag:
         description: 'Splunk AL2023-based Docker Image repository and tag (e.g. repository-name:tag)'
@@ -17,7 +18,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Dotenv Action
       id: dotenv
-      uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
+      uses: falti/dotenv-action@v1
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
@@ -33,7 +34,7 @@ jobs:
      - uses: actions/checkout@v2
      - name: Dotenv Action
        id: dotenv
-       uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
+       uses: falti/dotenv-action@v1
      - name: Setup Go
        uses: actions/setup-go@v2
        with:
@@ -50,11 +51,25 @@ jobs:
        run: make test
      - name: Run Code Coverage
        run: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }}
+       continue-on-error: true
      - name: Upload Coverage artifacts
-       uses: actions/upload-artifact@v4.4.0
+       uses: actions/upload-artifact@v6
        with:
          name: coverage.out
          path: coverage.out
+     - name: Upload Unit Test Results
+       if: always()
+       uses: actions/upload-artifact@v6
+       with:
+         name: test-report-unit
+         path: unit_test*.xml
+     - name: Publish Unit Test Report
+       uses: mikepenz/action-junit-report@v6
+       if: always()
+       with:
+         report_paths: 'unit_test*.xml'
+         check_name: 'Unit Test Results (ARM AL2023)'
+         detailed_summary: true
   build-operator-image-arm-al2023:
     runs-on: ubuntu-latest
     needs: unit-tests
@@ -65,12 +80,12 @@ jobs:
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
     steps:
     - name: Set up cosign
-      uses: sigstore/cosign-installer@main
+      uses: sigstore/cosign-installer@v4.0.0
 
     - uses: actions/checkout@v2
     - name: Dotenv Action
       id: dotenv
-      uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
+      uses: falti/dotenv-action@v1
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
@@ -89,14 +104,15 @@ jobs:
         sudo chmod +x operator-sdk_${OS}_${ARCH}
         sudo mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
+      uses: aws-actions/configure-aws-credentials@v5
       with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+        role-to-assume: ${{ vars.AWS_ROLE_ARN }}
+        role-session-name: github-${{ github.run_id }}
+        aws-region: ${{ vars.AWS_REGION }}
+        role-duration-seconds: ${{ vars.AWS_ROLE_DURATION_SECONDS }}
     - name: Login to Amazon ECR
       id: login-ecr
-      uses: aws-actions/amazon-ecr-login@v1
+      uses: aws-actions/amazon-ecr-login@v2
     - name: Build and push Splunk Operator Image
       run: |
         export PLATFORMS=linux/arm64,linux/amd64
@@ -120,6 +136,7 @@ jobs:
                 appframeworksS1,
                 managersecret,
                 managermc,
+                indingsep,
                ]
     runs-on: ubuntu-latest
     env:
@@ -145,15 +162,25 @@ jobs:
       DEPLOYMENT_TYPE: ""
       ARM64: "true"
       GRAVITON_TESTING: "true"
+      AWS_INDEX_INGEST_SEP_ACCESS_KEY_ID: ${{ secrets.AWS_INDEX_INGEST_SEP_ACCESS_KEY_ID }}
+      AWS_INDEX_INGEST_SEP_SECRET_ACCESS_KEY: ${{ secrets.AWS_INDEX_INGEST_SEP_SECRET_ACCESS_KEY }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Chekcout code
         uses: actions/checkout@v2
+      - name: Set Test Cluster Name
+        id: set-cluster-name
+        uses: ./.github/actions/set-cluster-name
+        with:
+          test-type: smoke
+          platform: arm-al2023
+          test-name: ${{ matrix.test }}
+          run-id: ${{ github.run_id }}
+      - name: Export cluster name to environment
+        run: |
+          echo "TEST_CLUSTER_NAME=${{ steps.set-cluster-name.outputs.cluster-name }}" >> $GITHUB_ENV
       - name: Dotenv Action
         id: dotenv
-        uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
+        uses: falti/dotenv-action@v1
       - name: Change splunk enterprise to release image on main branches
         if: github.ref == 'refs/heads/main'
         run: |
@@ -195,22 +222,23 @@ jobs:
           sudo curl -L -o /usr/local/bin/operator-sdk https://github.com/operator-framework/operator-sdk/releases/download/${{ steps.dotenv.outputs.OPERATOR_SDK_VERSION }}/operator-sdk-${{ steps.dotenv.outputs.OPERATOR_SDK_VERSION }}-x86_64-linux-gnu
           sudo chmod +x /usr/local/bin/operator-sdk
       - name: Configure Docker Hub credentials
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN}}
       - name: Set Splunk Operator image
         run: |
             echo "SPLUNK_OPERATOR_IMAGE=${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA" >> $GITHUB_ENV
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v5
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
+          role-to-assume: ${{ vars.AWS_ROLE_ARN }}
+          role-session-name: github-${{ github.run_id }}
+          aws-region: ${{ vars.AWS_REGION }}
+          role-duration-seconds: ${{ vars.AWS_ROLE_DURATION_SECONDS }}
       - name: Login to Amazon ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
       - name: Pull Splunk Enterprise Image
         run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
       - name: Create EKS cluster
@@ -220,7 +248,8 @@ jobs:
            make cluster-up
       - name: install metric server
         run: |
-          kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
+          curl -LO https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
+          kubectl replace --force -f components.yaml || kubectl apply -f components.yaml
       - name: install k8s dashboard
         run: |
           kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.5/aio/deploy/recommended.yaml
@@ -231,6 +260,11 @@ jobs:
           cp /snap/bin/kustomize ./bin/kustomize
       - name: Run smoke test
         id: smoketest
+        timeout-minutes: 240
+        env:
+          TEST_TIMEOUT: 225m
+          TEST_S3_ACCESS_KEY_ID: ${{ vars.TEST_S3_ACCESS_KEY_ID }}
+          TEST_S3_SECRET_ACCESS_KEY: ${{ secrets.TEST_S3_SECRET_ACCESS_KEY }}
         run: |
           make int-test
       - name: Collect Test Logs
@@ -240,10 +274,23 @@ jobs:
           find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
       - name: Archive Pod Logs
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4.4.0
+        uses: actions/upload-artifact@v6
         with:
           name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
           path: "/tmp/pod_logs/**"
+      - name: Upload Smoke Test Results
+        if: always()
+        uses: actions/upload-artifact@v6
+        with:
+          name: "test-report-smoke-arm-al2023-${{ matrix.test }}"
+          path: report-junit*.xml
+      - name: Publish Smoke Test Report
+        uses: mikepenz/action-junit-report@v6
+        if: always()
+        with:
+          report_paths: 'report-junit*.xml'
+          check_name: 'Smoke Test Results (ARM AL2023) - ${{ matrix.test }}'
+          detailed_summary: true
       - name: Cleanup Test Case artifacts
         if: ${{ always() }}
         run: |