From 6df33b2229c3b924e6ced2bde6a28f310db7de48 Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Tue, 17 Feb 2026 16:36:04 +0100 Subject: [PATCH 01/10] Decrease number of secrets by moving them to envs if applicable --- .env | 6 +++- ...AL2023-build-test-push-workflow-AL2023.yml | 14 +++------ .../arm-AL2023-int-test-workflow.yml | 11 ++----- .../arm-RHEL-build-test-push-workflow.yml | 11 ++----- .../workflows/arm-RHEL-int-test-workflow.yml | 11 ++----- .../arm-Ubuntu-build-test-push-workflow.yml | 13 +++------ .../arm-Ubuntu-int-test-workflow.yml | 11 ++----- .../workflows/build-test-push-workflow.yml | 25 +++++++--------- .../distroless-build-test-push-workflow.yml | 21 +++++--------- .../distroless-int-test-workflow.yml | 13 +++------ .github/workflows/helm-test-workflow.yml | 29 +++++++++---------- .github/workflows/int-test-azure-workflow.yml | 13 +++------ .github/workflows/int-test-gcp-workflow.yml | 18 ++++-------- .github/workflows/int-test-workflow.yml | 18 +++++------- .../workflows/manual-int-test-workflow.yml | 15 +++++----- .../namespace-scope-int-workflow.yml | 10 +++---- .../workflows/nightly-int-test-workflow.yml | 29 ++++++++++--------- .github/workflows/prodsec-workflow.yml | 4 +-- AGENTS.md | 2 +- 19 files changed, 107 insertions(+), 167 deletions(-) diff --git a/.env b/.env index c133592dc..d318c8be3 100644 --- a/.env +++ b/.env @@ -8,4 +8,8 @@ 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 \ No newline at end of file +SPLUNK_ENTERPRISE_IMAGE=splunk/splunk:10.2 +AWS_DEFAULT_REGION=us-west-2 +GCP_REGION=us-west2 +GZP_ZONE=us-west2-a +AZURE_REGION=westus \ No newline at end of file diff --git a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml index de972ba59..f4473a406 100644 --- a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml +++ b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml @@ -62,11 +62,10 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main - - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv @@ -103,11 +102,11 @@ jobs: export PLATFORMS=linux/arm64,linux/amd64 export BASE_IMAGE=public.ecr.aws/amazonlinux/amazonlinux export BASE_IMAGE_VERSION=2023 - export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + export IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG - 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 }} + cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }} env: COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} @@ -127,7 +126,6 @@ jobs: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -140,7 +138,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" @@ -163,10 +161,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-AL2023-int-test-workflow.yml b/.github/workflows/arm-AL2023-int-test-workflow.yml index b0bd87391..c99f67932 100644 --- a/.github/workflows/arm-AL2023-int-test-workflow.yml +++ b/.github/workflows/arm-AL2023-int-test-workflow.yml @@ -17,7 +17,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action @@ -52,7 +52,7 @@ jobs: export PLATFORMS=linux/arm64,linux/amd64 export BASE_IMAGE=public.ecr.aws/amazonlinux/amazonlinux export BASE_IMAGE_VERSION=2023 - export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + export IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG int-tests-arm-al2023: strategy: @@ -75,7 +75,6 @@ jobs: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -88,7 +87,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" @@ -116,10 +115,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-RHEL-build-test-push-workflow.yml b/.github/workflows/arm-RHEL-build-test-push-workflow.yml index 947681124..9b092155f 100644 --- a/.github/workflows/arm-RHEL-build-test-push-workflow.yml +++ b/.github/workflows/arm-RHEL-build-test-push-workflow.yml @@ -17,7 +17,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action @@ -52,7 +52,7 @@ jobs: export PLATFORMS=linux/arm64,linux/amd64 export BASE_IMAGE=redhat/ubi9-minimal export BASE_IMAGE_VERSION=9.5 - export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + export IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG smoke-tests-arm-rhel: timeout-minutes: 240 @@ -76,7 +76,6 @@ jobs: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -89,7 +88,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" @@ -117,10 +116,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-RHEL-int-test-workflow.yml b/.github/workflows/arm-RHEL-int-test-workflow.yml index 4ba671c50..360127167 100644 --- a/.github/workflows/arm-RHEL-int-test-workflow.yml +++ b/.github/workflows/arm-RHEL-int-test-workflow.yml @@ -17,7 +17,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action @@ -52,7 +52,7 @@ jobs: export PLATFORMS=linux/arm64,linux/amd64 export BASE_IMAGE=redhat/ubi9-minimal export BASE_IMAGE_VERSION=9.5 - export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + export IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG int-tests-arm-rhel: strategy: @@ -75,7 +75,6 @@ jobs: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -88,7 +87,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" @@ -116,10 +115,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml index cecd1539f..81db4925d 100644 --- a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml +++ b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml @@ -62,7 +62,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -103,11 +103,11 @@ jobs: export PLATFORMS=linux/arm64,linux/amd64 export BASE_IMAGE=ubuntu export BASE_IMAGE_VERSION=24.04 - export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + export IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG - 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 }} + cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }} env: COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} @@ -127,7 +127,6 @@ jobs: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -140,7 +139,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" @@ -163,10 +162,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-Ubuntu-int-test-workflow.yml b/.github/workflows/arm-Ubuntu-int-test-workflow.yml index f4a1ce18c..82e0ecd66 100644 --- a/.github/workflows/arm-Ubuntu-int-test-workflow.yml +++ b/.github/workflows/arm-Ubuntu-int-test-workflow.yml @@ -17,7 +17,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action @@ -52,7 +52,7 @@ jobs: export PLATFORMS=linux/arm64,linux/amd64 export BASE_IMAGE=ubuntu export BASE_IMAGE_VERSION=24.04 - export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + export IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG int-tests-arm-ubuntu: strategy: @@ -75,7 +75,6 @@ jobs: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -88,7 +87,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" @@ -116,10 +115,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml index f77eb792b..d8d0ebbe2 100644 --- a/.github/workflows/build-test-push-workflow.yml +++ b/.github/workflows/build-test-push-workflow.yml @@ -66,10 +66,10 @@ jobs: runs-on: ubuntu-latest needs: unit-tests env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -107,10 +107,10 @@ 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 + make docker-buildx IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - 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 }} + cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }} env: COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} @@ -123,10 +123,10 @@ jobs: runs-on: ubuntu-latest needs: build-operator-image env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} IMAGE_NAME: ${{ secrets.ECR_REPOSITORY }}/splunk/splunk-operator:${{ github.sha }} steps: - name: Set up cosign @@ -185,8 +185,7 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_RELEASE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -199,7 +198,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" @@ -219,10 +218,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: @@ -281,8 +276,8 @@ jobs: uses: aws-actions/amazon-ecr-login@v1 - name: Tag and Push Splunk Enterprise Image to ECR run: | - docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker push ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - name: Create EKS cluster run: | export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }} diff --git a/.github/workflows/distroless-build-test-push-workflow.yml b/.github/workflows/distroless-build-test-push-workflow.yml index ef652f5b9..40962b40c 100644 --- a/.github/workflows/distroless-build-test-push-workflow.yml +++ b/.github/workflows/distroless-build-test-push-workflow.yml @@ -59,10 +59,10 @@ jobs: runs-on: ubuntu-latest needs: unit-tests env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -102,10 +102,10 @@ jobs: run: | 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 + make docker-buildx BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=${{ env.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 + cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }}-distroless env: COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} @@ -179,8 +179,7 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_RELEASE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -193,7 +192,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" @@ -214,10 +213,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: @@ -276,8 +271,8 @@ jobs: uses: aws-actions/amazon-ecr-login@v1 - name: Tag and Push Splunk Enterprise Image to ECR run: | - docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker push ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - name: Create EKS cluster run: | export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }} diff --git a/.github/workflows/distroless-int-test-workflow.yml b/.github/workflows/distroless-int-test-workflow.yml index 0dea5b263..0e9daf7f0 100644 --- a/.github/workflows/distroless-int-test-workflow.yml +++ b/.github/workflows/distroless-int-test-workflow.yml @@ -13,10 +13,10 @@ jobs: build-operator-image-distroless: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action @@ -75,8 +75,7 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -89,7 +88,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" steps: @@ -115,10 +114,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/helm-test-workflow.yml b/.github/workflows/helm-test-workflow.yml index e0ed442a4..d5b6e4872 100644 --- a/.github/workflows/helm-test-workflow.yml +++ b/.github/workflows/helm-test-workflow.yml @@ -15,10 +15,10 @@ jobs: build-operator-image: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action @@ -50,13 +50,13 @@ 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 + make docker-buildx IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA int-tests: timeout-minutes: 240 runs-on: ubuntu-latest needs: build-operator-image env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_CLUSTER_PLATFORM: eks @@ -66,7 +66,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "helm" HELM_REPO_PATH: "../../../../helm-chart" @@ -99,10 +99,9 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches + - name: Change helm repo path on main branch if: github.ref == 'refs/heads/main' run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV echo "HELM_REPO_PATH=splunk" >> $GITHUB_ENV - name: Set GITHUB SHA value run: | @@ -161,18 +160,18 @@ jobs: uses: aws-actions/amazon-ecr-login@v1 - name: Pull Splunk Operator Image Locally and change name run: | - docker pull ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + docker pull ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + docker tag ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - name: Tag and Push Splunk Enterprise Image to ECR run: | - docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker push ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - name: Pull Splunk Operator Image Locally run: | - docker pull ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + docker pull ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - name: Change Operator Image Tag to latest run: | - docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:latest + docker tag ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:latest - name: Create EKS cluster run: | export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }} @@ -205,8 +204,8 @@ jobs: KUTTL_SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} KUTTL_SPLUNK_OPERATOR_IMAGE: ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.HELM_GITHUB_SHA }} INSTALL_OPERATOR: true - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} - AWS_S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} + AWS_S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} TEST_S3_BUCKET: ${{ secrets.TEST_BUCKET }} TEST_VPC_ENDPOINT_URL: ${{ secrets.TEST_VPC_ENDPOINT_URL }} TEST_S3_ACCESS_KEY_ID: ${{ vars.TEST_S3_ACCESS_KEY_ID }} diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml index b58a04959..6ef689747 100644 --- a/.github/workflows/int-test-azure-workflow.yml +++ b/.github/workflows/int-test-azure-workflow.yml @@ -12,7 +12,7 @@ jobs: build-operator-image: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator CONTAINER_REGISTRY: ${{ secrets.AZURE_CONTAINER_REGISTRY }} steps: @@ -60,7 +60,7 @@ jobs: ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }} ECR_REPOSITORY: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} AZURE_CONTAINER_REGISTRY_LOGIN_SERVER: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} - AZURE_REGION: ${{ secrets.AZURE_REGION }} + AZURE_REGION: ${{ steps.dotenv.outputs.AZURE_REGION }} steps: - name: Checkout code uses: actions/checkout@v2 @@ -109,8 +109,7 @@ jobs: env: CLUSTER_NODES: 2 CLUSTER_WORKERS: 5 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_RELEASE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: azure_sanity @@ -128,7 +127,7 @@ jobs: ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }} ECR_REPOSITORY: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} AZURE_CONTAINER_REGISTRY_LOGIN_SERVER: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} - AZURE_REGION: ${{ secrets.AZURE_REGION }} + AZURE_REGION: ${{ steps.dotenv.outputs.AZURE_REGION }} CLUSTER_WIDE: "true" # AZURE_MANAGED_ID_ENABLED: "${{ matrix.auth_method_managed_id }}" AZURE_MANAGED_ID_ENABLED: "false" @@ -142,10 +141,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: 'Login via Azure CLI' uses: azure/login@v1 with: diff --git a/.github/workflows/int-test-gcp-workflow.yml b/.github/workflows/int-test-gcp-workflow.yml index bae27e97e..88e86d97e 100644 --- a/.github/workflows/int-test-gcp-workflow.yml +++ b/.github/workflows/int-test-gcp-workflow.yml @@ -55,14 +55,13 @@ jobs: - name: Login to GCR uses: docker/login-action@v3 with: - registry: ${{ secrets.GCP_ARTIFACT_REGISTRY }} + registry: ${{ env.ARTIFACT_REGISTRY }} username: _json_key password: ${{ secrets.GCP_SERVICE_ACCOUNT_KEY }} - name: Build Splunk Operator Image run: | - make docker-buildx IMG=${{ secrets.GCP_ARTIFACT_REGISTRY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - + make docker-buildx IMG=${{ env.ARTIFACT_REGISTRY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA create-cluster-and-run-tests: strategy: matrix: @@ -80,15 +79,13 @@ jobs: CLUSTER_PROVIDER: gcp ARTIFACT_REGISTRY: ${{ secrets.GCP_ARTIFACT_REGISTRY }} GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }} - GCP_REGION: ${{ secrets.GCP_REGION }} - AWS_S3_REGION: ${{ secrets.GCP_REGION }} - GCP_ZONE: ${{ secrets.GCP_ZONE }} + GCP_REGION: ${{ steps.dotenv.outputs.GCP_REGION }} + GCP_ZONE: ${{ steps.dotenv.outputs.GCP_ZONE }} GCP_NETWORK: default # Adjust if using a custom network GCP_SUBNETWORK: default # Adjust if using a custom subnetwork TEST_FOCUS: ${{ matrix.test_focus.name }} CLUSTER_NODES: 2 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_RELEASE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator # This regex matches any string not containing integration keyword @@ -159,11 +156,6 @@ jobs: project_id: ${{ secrets.GCP_PROJECT_ID }} install_components: 'kubectl' - - name: Change Splunk Enterprise Image on Main Branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - - name: Authenticate to GCP uses: google-github-actions/auth@v1 with: diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml index fabc2b4fa..7b0f4f401 100644 --- a/.github/workflows/int-test-workflow.yml +++ b/.github/workflows/int-test-workflow.yml @@ -14,10 +14,10 @@ jobs: build-operator-image: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action @@ -49,7 +49,7 @@ 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 + make docker-buildx IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA int-tests: strategy: fail-fast: false @@ -72,7 +72,7 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -85,7 +85,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" steps: @@ -110,10 +110,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Change splunk enterprise to release image on main branches - if: github.ref == 'refs/heads/main' - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: @@ -168,8 +164,8 @@ jobs: uses: aws-actions/amazon-ecr-login@v1 - name: Tag and Push Splunk Enterprise Image to ECR run: | - docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker push ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - name: Create EKS cluster run: | export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }} diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml index dc6981e46..7539df251 100644 --- a/.github/workflows/manual-int-test-workflow.yml +++ b/.github/workflows/manual-int-test-workflow.yml @@ -33,8 +33,7 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_RELEASE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -47,7 +46,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: ${{ github.event.inputs.CLUSTER_WIDE }} steps: - name: Set Test Cluster Nodes and Parallel Runs @@ -122,11 +121,11 @@ jobs: - name: Build and Push Splunk Operator Image run: | docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest - make docker-buildx IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + make docker-buildx IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - name: Tag and Push Splunk Enterprise Image to ECR run: | - docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker push ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - name: Create EKS cluster run: | export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }} @@ -196,10 +195,10 @@ jobs: uses: aws-actions/amazon-ecr-login@v1 - name: Pull Splunk Operator Image Locally run: | - docker pull ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + docker pull ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - name: Change Operator Image Tag to edge run: | - docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.TAG }} + docker tag ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.TAG }} - name: Configure Docker Hub credentials uses: docker/login-action@v1 with: diff --git a/.github/workflows/namespace-scope-int-workflow.yml b/.github/workflows/namespace-scope-int-workflow.yml index 03cbc2b4f..23816db5e 100644 --- a/.github/workflows/namespace-scope-int-workflow.yml +++ b/.github/workflows/namespace-scope-int-workflow.yml @@ -29,7 +29,7 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -42,7 +42,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "false" steps: - name: Set Test Cluster Nodes and Parallel Runs @@ -119,11 +119,11 @@ jobs: - name: Build and Push Splunk Operator Image run: | docker pull registry.access.redhat.com/ubi8/ubi-minimal:latest - make docker-buildx IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + make docker-buildx IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - name: Tag and Push Splunk Enterprise Image to ECR run: | - docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker push ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - name: Create EKS cluster run: | export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }} diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml index 769bac74a..757629941 100644 --- a/.github/workflows/nightly-int-test-workflow.yml +++ b/.github/workflows/nightly-int-test-workflow.yml @@ -11,10 +11,10 @@ jobs: build-operator-image: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 with: @@ -48,7 +48,7 @@ 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 + make docker-buildx IMG=${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA int-tests: strategy: fail-fast: false @@ -71,7 +71,7 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -84,7 +84,7 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" steps: - name: Set Test Cluster Nodes and Parallel Runs @@ -155,15 +155,15 @@ jobs: uses: aws-actions/amazon-ecr-login@v1 - name: Tag and Push Splunk Enterprise Image to ECR run: | - docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} + docker push ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }} - name: Pull Splunk Operator Image Locally run: | - docker pull ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + docker pull ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + docker tag ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - name: Change Operator Image Tag to latest run: | - docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:latest + docker tag ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:latest - name: Create EKS cluster run: | export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }} @@ -213,6 +213,7 @@ jobs: needs: int-tests env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator + ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} TAG: edge steps: - name: Set up cosign @@ -236,10 +237,10 @@ jobs: uses: aws-actions/amazon-ecr-login@v1 - name: Pull Splunk Operator Image Locally run: | - docker pull ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA + docker pull ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA - name: Change Operator Image Tag to edge run: | - docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.TAG }} + docker tag ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.TAG }} - name: Configure Docker Hub credentials uses: docker/login-action@v1 with: @@ -249,13 +250,13 @@ jobs: run: docker push ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.TAG }} - 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 }} + cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }} env: COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }} - name: Verify Signed Splunk Operator image run: | - cosign verify --key env://COSIGN_PUBLIC_KEY ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }} + cosign verify --key env://COSIGN_PUBLIC_KEY ${{ env.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }} env: COSIGN_PUBLIC_KEY: ${{ secrets.COSIGN_PUBLIC_KEY }} \ No newline at end of file diff --git a/.github/workflows/prodsec-workflow.yml b/.github/workflows/prodsec-workflow.yml index 54942b0b2..58ad99225 100644 --- a/.github/workflows/prodsec-workflow.yml +++ b/.github/workflows/prodsec-workflow.yml @@ -23,10 +23,10 @@ jobs: FOSSA-scanner: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }} + S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action diff --git a/AGENTS.md b/AGENTS.md index e2ba5781f..e403d55ff 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -198,7 +198,7 @@ WATCH_NAMESPACE="" # Watch all namespaces (clust ENVIRONMENT=default # Deployment environment # Splunk configuration -SPLUNK_ENTERPRISE_IMAGE=(See SPLUNK_ENTERPRISE_RELEASE_IMAGE in .env) # Splunk Enterprise image +SPLUNK_ENTERPRISE_IMAGE=(See SPLUNK_ENTERPRISE_IMAGE in .env) # Splunk Enterprise image SPLUNK_GENERAL_TERMS="" # SGT acceptance (required) # Testing From e7ff8a10dbd2901ba642bc92213410bd33b72758 Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Tue, 17 Feb 2026 16:53:38 +0100 Subject: [PATCH 02/10] Fixing pipeline issues --- .../arm-AL2023-build-test-push-workflow-AL2023.yml | 4 ++-- .github/workflows/arm-AL2023-int-test-workflow.yml | 4 ++-- .github/workflows/build-test-push-workflow.yml | 12 ++++++++---- .github/workflows/helm-test-workflow.yml | 12 ++++++++---- .github/workflows/int-test-workflow.yml | 12 ++++++++---- .github/workflows/namespace-scope-int-workflow.yml | 6 ++++-- .github/workflows/prodsec-workflow.yml | 6 ++++-- 7 files changed, 36 insertions(+), 20 deletions(-) diff --git a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml index f4473a406..757fe7c49 100644 --- a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml +++ b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml @@ -62,7 +62,6 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -70,6 +69,8 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export S3_REGION from .env + run: echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -138,7 +139,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" diff --git a/.github/workflows/arm-AL2023-int-test-workflow.yml b/.github/workflows/arm-AL2023-int-test-workflow.yml index c99f67932..7bab41d6d 100644 --- a/.github/workflows/arm-AL2023-int-test-workflow.yml +++ b/.github/workflows/arm-AL2023-int-test-workflow.yml @@ -17,12 +17,13 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export S3_REGION from .env + run: echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -87,7 +88,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml index d8d0ebbe2..b9155b491 100644 --- a/.github/workflows/build-test-push-workflow.yml +++ b/.github/workflows/build-test-push-workflow.yml @@ -66,10 +66,8 @@ jobs: runs-on: ubuntu-latest needs: unit-tests env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -78,6 +76,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -185,7 +187,6 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -198,7 +199,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" @@ -218,6 +218,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/helm-test-workflow.yml b/.github/workflows/helm-test-workflow.yml index d5b6e4872..4d8348ce0 100644 --- a/.github/workflows/helm-test-workflow.yml +++ b/.github/workflows/helm-test-workflow.yml @@ -15,15 +15,17 @@ jobs: build-operator-image: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -56,7 +58,6 @@ jobs: runs-on: ubuntu-latest needs: build-operator-image env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_CLUSTER_PLATFORM: eks @@ -66,7 +67,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "helm" HELM_REPO_PATH: "../../../../helm-chart" @@ -99,6 +99,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Change helm repo path on main branch if: github.ref == 'refs/heads/main' run: | diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml index 7b0f4f401..df584c807 100644 --- a/.github/workflows/int-test-workflow.yml +++ b/.github/workflows/int-test-workflow.yml @@ -14,15 +14,17 @@ jobs: build-operator-image: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -72,7 +74,6 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -85,7 +86,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" steps: @@ -110,6 +110,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/namespace-scope-int-workflow.yml b/.github/workflows/namespace-scope-int-workflow.yml index 23816db5e..68d8b9f22 100644 --- a/.github/workflows/namespace-scope-int-workflow.yml +++ b/.github/workflows/namespace-scope-int-workflow.yml @@ -29,7 +29,6 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -42,7 +41,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "false" steps: - name: Set Test Cluster Nodes and Parallel Runs @@ -69,6 +67,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/prodsec-workflow.yml b/.github/workflows/prodsec-workflow.yml index 58ad99225..0a5947fe2 100644 --- a/.github/workflows/prodsec-workflow.yml +++ b/.github/workflows/prodsec-workflow.yml @@ -23,15 +23,17 @@ jobs: FOSSA-scanner: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Run FOSSA Test uses: fossas/fossa-action@main with: From 335803686b09c224d40d97e744587b6dce804c35 Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Tue, 17 Feb 2026 17:14:22 +0100 Subject: [PATCH 03/10] Fix --- .../arm-RHEL-build-test-push-workflow.yml | 4 +++- .github/workflows/arm-RHEL-int-test-workflow.yml | 8 ++++++-- .../arm-Ubuntu-build-test-push-workflow.yml | 8 ++++++-- .github/workflows/arm-Ubuntu-int-test-workflow.yml | 8 ++++++-- .github/workflows/build-test-push-workflow.yml | 6 ++++-- .../distroless-build-test-push-workflow.yml | 12 ++++++++---- .github/workflows/distroless-int-test-workflow.yml | 12 ++++++++---- .github/workflows/int-test-azure-workflow.yml | 14 ++++++++++---- .github/workflows/int-test-gcp-workflow.yml | 8 +++++--- .github/workflows/nightly-int-test-workflow.yml | 12 ++++++++---- 10 files changed, 64 insertions(+), 28 deletions(-) diff --git a/.github/workflows/arm-RHEL-build-test-push-workflow.yml b/.github/workflows/arm-RHEL-build-test-push-workflow.yml index 9b092155f..e0b4da3b4 100644 --- a/.github/workflows/arm-RHEL-build-test-push-workflow.yml +++ b/.github/workflows/arm-RHEL-build-test-push-workflow.yml @@ -88,7 +88,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" @@ -116,6 +115,9 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-RHEL-int-test-workflow.yml b/.github/workflows/arm-RHEL-int-test-workflow.yml index 360127167..1633942c0 100644 --- a/.github/workflows/arm-RHEL-int-test-workflow.yml +++ b/.github/workflows/arm-RHEL-int-test-workflow.yml @@ -17,12 +17,14 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -87,7 +89,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" @@ -115,6 +116,9 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml index 81db4925d..1ee48d192 100644 --- a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml +++ b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml @@ -62,7 +62,6 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -71,6 +70,9 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -139,7 +141,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" @@ -162,6 +163,9 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-Ubuntu-int-test-workflow.yml b/.github/workflows/arm-Ubuntu-int-test-workflow.yml index 82e0ecd66..2fe41df44 100644 --- a/.github/workflows/arm-Ubuntu-int-test-workflow.yml +++ b/.github/workflows/arm-Ubuntu-int-test-workflow.yml @@ -17,12 +17,14 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -87,7 +89,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" @@ -115,6 +116,9 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml index 83a4a5d64..a4bf2a508 100644 --- a/.github/workflows/build-test-push-workflow.yml +++ b/.github/workflows/build-test-push-workflow.yml @@ -131,10 +131,8 @@ jobs: runs-on: ubuntu-latest needs: build-operator-image env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} IMAGE_NAME: ${{ secrets.ECR_REPOSITORY }}/splunk/splunk-operator:${{ github.sha }} steps: - name: Set up cosign @@ -143,6 +141,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2.5.0 - name: Configure AWS credentials diff --git a/.github/workflows/distroless-build-test-push-workflow.yml b/.github/workflows/distroless-build-test-push-workflow.yml index f62a52376..0c0aa69f0 100644 --- a/.github/workflows/distroless-build-test-push-workflow.yml +++ b/.github/workflows/distroless-build-test-push-workflow.yml @@ -65,10 +65,8 @@ jobs: runs-on: ubuntu-latest needs: unit-tests env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -77,6 +75,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -185,7 +187,6 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -198,7 +199,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" @@ -219,6 +219,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/distroless-int-test-workflow.yml b/.github/workflows/distroless-int-test-workflow.yml index e0c991d22..5a2cb6ade 100644 --- a/.github/workflows/distroless-int-test-workflow.yml +++ b/.github/workflows/distroless-int-test-workflow.yml @@ -16,15 +16,17 @@ jobs: build-operator-image-distroless: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -78,7 +80,6 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -91,7 +92,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" steps: @@ -117,6 +117,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml index 2af9b29ce..7447a2946 100644 --- a/.github/workflows/int-test-azure-workflow.yml +++ b/.github/workflows/int-test-azure-workflow.yml @@ -15,7 +15,6 @@ jobs: build-operator-image: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator CONTAINER_REGISTRY: ${{ secrets.AZURE_CONTAINER_REGISTRY }} steps: @@ -23,6 +22,9 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -63,13 +65,15 @@ jobs: ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }} ECR_REPOSITORY: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} AZURE_CONTAINER_REGISTRY_LOGIN_SERVER: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} - AZURE_REGION: ${{ steps.dotenv.outputs.AZURE_REGION }} steps: - name: Checkout code uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "AZURE_REGION=${{ steps.dotenv.outputs.AZURE_REGION }}" >> $GITHUB_ENV - name: Set Cluster Name run: | echo "TEST_CLUSTER_NAME=az${{ github.run_id }}" >> $GITHUB_ENV @@ -112,7 +116,6 @@ jobs: env: CLUSTER_NODES: 2 CLUSTER_WORKERS: 5 - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: azure_sanity @@ -130,7 +133,6 @@ jobs: ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }} ECR_REPOSITORY: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} AZURE_CONTAINER_REGISTRY_LOGIN_SERVER: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} - AZURE_REGION: ${{ steps.dotenv.outputs.AZURE_REGION }} CLUSTER_WIDE: "true" # AZURE_MANAGED_ID_ENABLED: "${{ matrix.auth_method_managed_id }}" AZURE_MANAGED_ID_ENABLED: "false" @@ -144,6 +146,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "AZURE_REGION=${{ steps.dotenv.outputs.AZURE_REGION }}" >> $GITHUB_ENV - name: 'Login via Azure CLI' uses: azure/login@v1 with: diff --git a/.github/workflows/int-test-gcp-workflow.yml b/.github/workflows/int-test-gcp-workflow.yml index 36ce8ecea..eb40925ae 100644 --- a/.github/workflows/int-test-gcp-workflow.yml +++ b/.github/workflows/int-test-gcp-workflow.yml @@ -82,13 +82,10 @@ jobs: CLUSTER_PROVIDER: gcp ARTIFACT_REGISTRY: ${{ secrets.GCP_ARTIFACT_REGISTRY }} GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }} - GCP_REGION: ${{ steps.dotenv.outputs.GCP_REGION }} - GCP_ZONE: ${{ steps.dotenv.outputs.GCP_ZONE }} GCP_NETWORK: default # Adjust if using a custom network GCP_SUBNETWORK: default # Adjust if using a custom subnetwork TEST_FOCUS: ${{ matrix.test_focus.name }} CLUSTER_NODES: 2 - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator # This regex matches any string not containing integration keyword @@ -123,6 +120,11 @@ jobs: uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 with: path: .env + - name: Export env from .env + run: | + echo "GCP_REGION=${{ steps.dotenv.outputs.GCP_REGION }}" >> $GITHUB_ENV + echo "GCP_ZONE=${{ steps.dotenv.outputs.GCP_ZONE }}" >> $GITHUB_ENV + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - name: Authenticate to GCP uses: google-github-actions/auth@v1 diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml index 757629941..ce8826538 100644 --- a/.github/workflows/nightly-int-test-workflow.yml +++ b/.github/workflows/nightly-int-test-workflow.yml @@ -11,10 +11,8 @@ jobs: build-operator-image: runs-on: ubuntu-latest env: - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 with: @@ -22,6 +20,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -71,7 +73,6 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator TEST_FOCUS: "${{ matrix.test }}" @@ -84,7 +85,6 @@ jobs: TEST_INDEXES_S3_BUCKET: ${{ secrets.TEST_INDEXES_S3_BUCKET }} ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} PRIVATE_REGISTRY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} CLUSTER_WIDE: "true" steps: - name: Set Test Cluster Nodes and Parallel Runs @@ -110,6 +110,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: From c42d751458787df18f97ca6e2eed14c868711f88 Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Tue, 17 Feb 2026 17:39:58 +0100 Subject: [PATCH 04/10] Fix --- .github/workflows/arm-RHEL-build-test-push-workflow.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/arm-RHEL-build-test-push-workflow.yml b/.github/workflows/arm-RHEL-build-test-push-workflow.yml index e0b4da3b4..878071cab 100644 --- a/.github/workflows/arm-RHEL-build-test-push-workflow.yml +++ b/.github/workflows/arm-RHEL-build-test-push-workflow.yml @@ -17,12 +17,14 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} - S3_REGION: ${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Export env from .env + run: | + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: From b4c60e729d868664389c87cc1b584784e48bd798 Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Wed, 18 Feb 2026 08:38:55 +0100 Subject: [PATCH 05/10] Fix failures in pipeline env references --- ...rm-AL2023-build-test-push-workflow-AL2023.yml | 4 +++- .../workflows/arm-AL2023-int-test-workflow.yml | 4 +++- .../arm-RHEL-build-test-push-workflow.yml | 8 ++++++-- .github/workflows/arm-RHEL-int-test-workflow.yml | 8 ++++++-- .../arm-Ubuntu-build-test-push-workflow.yml | 8 ++++++-- .../workflows/arm-Ubuntu-int-test-workflow.yml | 8 ++++++-- .../workflows/distroless-int-test-workflow.yml | 10 ++++++---- .github/workflows/int-test-azure-workflow.yml | 16 ++++++---------- .github/workflows/int-test-gcp-workflow.yml | 6 +----- .github/workflows/manual-int-test-workflow.yml | 5 +++-- .github/workflows/nightly-int-test-workflow.yml | 10 ++++++---- 11 files changed, 52 insertions(+), 35 deletions(-) diff --git a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml index 757fe7c49..88e940bf4 100644 --- a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml +++ b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml @@ -69,8 +69,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export S3_REGION from .env - run: echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + run: echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: diff --git a/.github/workflows/arm-AL2023-int-test-workflow.yml b/.github/workflows/arm-AL2023-int-test-workflow.yml index 7bab41d6d..7489fcccb 100644 --- a/.github/workflows/arm-AL2023-int-test-workflow.yml +++ b/.github/workflows/arm-AL2023-int-test-workflow.yml @@ -22,8 +22,10 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export S3_REGION from .env - run: echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + run: echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: diff --git a/.github/workflows/arm-RHEL-build-test-push-workflow.yml b/.github/workflows/arm-RHEL-build-test-push-workflow.yml index 878071cab..7ec3c54f3 100644 --- a/.github/workflows/arm-RHEL-build-test-push-workflow.yml +++ b/.github/workflows/arm-RHEL-build-test-push-workflow.yml @@ -22,9 +22,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -117,9 +119,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-RHEL-int-test-workflow.yml b/.github/workflows/arm-RHEL-int-test-workflow.yml index 1633942c0..d6c46d22c 100644 --- a/.github/workflows/arm-RHEL-int-test-workflow.yml +++ b/.github/workflows/arm-RHEL-int-test-workflow.yml @@ -22,9 +22,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -116,9 +118,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml index 1ee48d192..51840193c 100644 --- a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml +++ b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml @@ -70,9 +70,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -163,9 +165,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-Ubuntu-int-test-workflow.yml b/.github/workflows/arm-Ubuntu-int-test-workflow.yml index 2fe41df44..5a9cb930e 100644 --- a/.github/workflows/arm-Ubuntu-int-test-workflow.yml +++ b/.github/workflows/arm-Ubuntu-int-test-workflow.yml @@ -22,9 +22,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -116,9 +118,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/distroless-int-test-workflow.yml b/.github/workflows/distroless-int-test-workflow.yml index 5a2cb6ade..46c6578d1 100644 --- a/.github/workflows/distroless-int-test-workflow.yml +++ b/.github/workflows/distroless-int-test-workflow.yml @@ -23,10 +23,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -117,10 +118,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml index 7447a2946..c401d1430 100644 --- a/.github/workflows/int-test-azure-workflow.yml +++ b/.github/workflows/int-test-azure-workflow.yml @@ -22,9 +22,8 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + with: + export-variables: true - name: Setup Go uses: actions/setup-go@v2 with: @@ -71,9 +70,8 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "AZURE_REGION=${{ steps.dotenv.outputs.AZURE_REGION }}" >> $GITHUB_ENV + with: + export-variables: true - name: Set Cluster Name run: | echo "TEST_CLUSTER_NAME=az${{ github.run_id }}" >> $GITHUB_ENV @@ -146,10 +144,8 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "AZURE_REGION=${{ steps.dotenv.outputs.AZURE_REGION }}" >> $GITHUB_ENV + with: + export-variables: true - name: 'Login via Azure CLI' uses: azure/login@v1 with: diff --git a/.github/workflows/int-test-gcp-workflow.yml b/.github/workflows/int-test-gcp-workflow.yml index eb40925ae..c40850aa4 100644 --- a/.github/workflows/int-test-gcp-workflow.yml +++ b/.github/workflows/int-test-gcp-workflow.yml @@ -120,11 +120,7 @@ jobs: uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 with: path: .env - - name: Export env from .env - run: | - echo "GCP_REGION=${{ steps.dotenv.outputs.GCP_REGION }}" >> $GITHUB_ENV - echo "GCP_ZONE=${{ steps.dotenv.outputs.GCP_ZONE }}" >> $GITHUB_ENV - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + export-variables: true - name: Authenticate to GCP uses: google-github-actions/auth@v1 diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml index f933f5753..fcbf1f6d9 100644 --- a/.github/workflows/manual-int-test-workflow.yml +++ b/.github/workflows/manual-int-test-workflow.yml @@ -69,10 +69,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml index ce8826538..71c2f2110 100644 --- a/.github/workflows/nightly-int-test-workflow.yml +++ b/.github/workflows/nightly-int-test-workflow.yml @@ -20,10 +20,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -110,10 +111,11 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + with: + export-variables: true - name: Export env from .env run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV + echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: From b3b074f1fbd8bbd1ac082029d94b2b8c3b15f6e8 Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Wed, 18 Feb 2026 09:20:44 +0100 Subject: [PATCH 06/10] Fix missing envs and run pipelines on changes --- .github/workflows/distroless-int-test-workflow.yml | 4 ++++ .github/workflows/int-test-azure-workflow.yml | 12 ++++++++++++ .github/workflows/int-test-gcp-workflow.yml | 7 +++++++ .github/workflows/manual-int-test-workflow.yml | 4 ++++ .github/workflows/nightly-int-test-workflow.yml | 5 +++++ 5 files changed, 32 insertions(+) diff --git a/.github/workflows/distroless-int-test-workflow.yml b/.github/workflows/distroless-int-test-workflow.yml index 46c6578d1..2f66f8abb 100644 --- a/.github/workflows/distroless-int-test-workflow.yml +++ b/.github/workflows/distroless-int-test-workflow.yml @@ -12,6 +12,8 @@ on: paths-ignore: - 'docs/**' - '*.md' + paths: + - '.github/workflows/distroless-int-test-workflow.yml' jobs: build-operator-image-distroless: runs-on: ubuntu-latest @@ -27,6 +29,7 @@ jobs: export-variables: true - name: Export env from .env run: | + echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 @@ -122,6 +125,7 @@ jobs: export-variables: true - name: Export env from .env run: | + echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml index c401d1430..9973823c6 100644 --- a/.github/workflows/int-test-azure-workflow.yml +++ b/.github/workflows/int-test-azure-workflow.yml @@ -11,6 +11,8 @@ on: paths-ignore: - 'docs/**' - '*.md' + paths: + - '.github/workflows/int-test-azure-workflow.yml' jobs: build-operator-image: runs-on: ubuntu-latest @@ -24,6 +26,9 @@ jobs: uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 with: export-variables: true + - name: Export env from .env + run: | + echo "AZURE_REGION=$AZURE_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -72,6 +77,9 @@ jobs: uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 with: export-variables: true + - name: Export env from .env + run: | + echo "AZURE_REGION=$AZURE_REGION" >> $GITHUB_ENV - name: Set Cluster Name run: | echo "TEST_CLUSTER_NAME=az${{ github.run_id }}" >> $GITHUB_ENV @@ -146,6 +154,10 @@ jobs: uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 with: export-variables: true + - name: Export env from .env + run: | + echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV + echo "AZURE_REGION=$AZURE_REGION" >> $GITHUB_ENV - name: 'Login via Azure CLI' uses: azure/login@v1 with: diff --git a/.github/workflows/int-test-gcp-workflow.yml b/.github/workflows/int-test-gcp-workflow.yml index c40850aa4..22bf12780 100644 --- a/.github/workflows/int-test-gcp-workflow.yml +++ b/.github/workflows/int-test-gcp-workflow.yml @@ -12,6 +12,8 @@ on: paths-ignore: - 'docs/**' - '*.md' + paths: + - '.github/workflows/int-test-gcp-workflow.yml' jobs: build-operator-image: runs-on: ubuntu-latest @@ -121,6 +123,11 @@ jobs: with: path: .env export-variables: true + - name: Export env from .env + run: | + echo "GCP_REGION=$GCP_REGION" >> $GITHUB_ENV + echo "GCP_ZONE=$GCP_ZONE" >> $GITHUB_ENV + echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV - name: Authenticate to GCP uses: google-github-actions/auth@v1 diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml index fcbf1f6d9..598f4df15 100644 --- a/.github/workflows/manual-int-test-workflow.yml +++ b/.github/workflows/manual-int-test-workflow.yml @@ -11,6 +11,9 @@ on: description: 'Run Operator in Cluster Wide Mode. Type false to run cluster in namespace mode' required: false default: "true" + push: + paths: + - '.github/workflows/manual-int-test-workflow.yml' jobs: int-tests: strategy: @@ -73,6 +76,7 @@ jobs: export-variables: true - name: Export env from .env run: | + echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml index 71c2f2110..947b7876f 100644 --- a/.github/workflows/nightly-int-test-workflow.yml +++ b/.github/workflows/nightly-int-test-workflow.yml @@ -7,6 +7,9 @@ permissions: on: schedule: - cron: "0 06 * * 0" + push: + paths: + - '.github/workflows/nightly-int-test-workflow.yml' jobs: build-operator-image: runs-on: ubuntu-latest @@ -24,6 +27,7 @@ jobs: export-variables: true - name: Export env from .env run: | + echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 @@ -115,6 +119,7 @@ jobs: export-variables: true - name: Export env from .env run: | + echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 From 097ee9733104d993f33fb823af2f31ea848918ca Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Wed, 18 Feb 2026 09:42:05 +0100 Subject: [PATCH 07/10] Test --- .github/workflows/distroless-int-test-workflow.yml | 3 +-- .github/workflows/int-test-azure-workflow.yml | 3 +-- .github/workflows/int-test-gcp-workflow.yml | 3 +-- .github/workflows/manual-int-test-workflow.yml | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/distroless-int-test-workflow.yml b/.github/workflows/distroless-int-test-workflow.yml index 2f66f8abb..da10bd59e 100644 --- a/.github/workflows/distroless-int-test-workflow.yml +++ b/.github/workflows/distroless-int-test-workflow.yml @@ -9,11 +9,10 @@ on: branches: - develop - main + - feature/decrease-number-of-secrets paths-ignore: - 'docs/**' - '*.md' - paths: - - '.github/workflows/distroless-int-test-workflow.yml' jobs: build-operator-image-distroless: runs-on: ubuntu-latest diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml index 9973823c6..5acddef34 100644 --- a/.github/workflows/int-test-azure-workflow.yml +++ b/.github/workflows/int-test-azure-workflow.yml @@ -8,11 +8,10 @@ on: branches: - develop - main + - feature/decrease-number-of-secrets paths-ignore: - 'docs/**' - '*.md' - paths: - - '.github/workflows/int-test-azure-workflow.yml' jobs: build-operator-image: runs-on: ubuntu-latest diff --git a/.github/workflows/int-test-gcp-workflow.yml b/.github/workflows/int-test-gcp-workflow.yml index 22bf12780..a3b2d2bd1 100644 --- a/.github/workflows/int-test-gcp-workflow.yml +++ b/.github/workflows/int-test-gcp-workflow.yml @@ -9,11 +9,10 @@ on: branches: - develop - main + - feature/decrease-number-of-secrets paths-ignore: - 'docs/**' - '*.md' - paths: - - '.github/workflows/int-test-gcp-workflow.yml' jobs: build-operator-image: runs-on: ubuntu-latest diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml index 598f4df15..e0bc34949 100644 --- a/.github/workflows/manual-int-test-workflow.yml +++ b/.github/workflows/manual-int-test-workflow.yml @@ -76,8 +76,8 @@ jobs: export-variables: true - name: Export env from .env run: | - echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV + echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV + echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: From 873e2f917b161d03dc6b54aea14cbe7cd770963c Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Wed, 18 Feb 2026 11:31:30 +0100 Subject: [PATCH 08/10] Move image and regions to vars --- .env | 6 +----- ...AL2023-build-test-push-workflow-AL2023.yml | 5 +---- .../arm-AL2023-int-test-workflow.yml | 5 +---- .../arm-RHEL-build-test-push-workflow.yml | 12 ++--------- .../workflows/arm-RHEL-int-test-workflow.yml | 12 ++--------- .../arm-Ubuntu-build-test-push-workflow.yml | 12 ++--------- .../arm-Ubuntu-int-test-workflow.yml | 12 ++--------- .../workflows/build-test-push-workflow.yml | 18 ++++++----------- .../distroless-build-test-push-workflow.yml | 12 ++++------- .../distroless-int-test-workflow.yml | 16 ++++----------- .github/workflows/helm-test-workflow.yml | 12 ++++------- .github/workflows/int-test-azure-workflow.yml | 20 ++++--------------- .github/workflows/int-test-gcp-workflow.yml | 11 +++------- .github/workflows/int-test-workflow.yml | 12 ++++------- .../workflows/manual-int-test-workflow.yml | 8 ++------ .../namespace-scope-int-workflow.yml | 6 ++---- .../workflows/nightly-int-test-workflow.yml | 18 +++++------------ .github/workflows/prodsec-workflow.yml | 6 ++---- 18 files changed, 51 insertions(+), 152 deletions(-) diff --git a/.env b/.env index d318c8be3..c133592dc 100644 --- a/.env +++ b/.env @@ -8,8 +8,4 @@ EKSCTL_VERSION=v0.215.0 EKS_CLUSTER_K8_VERSION=1.34 EKS_INSTANCE_TYPE=m5.2xlarge EKS_INSTANCE_TYPE_ARM64=c6g.4xlarge -SPLUNK_ENTERPRISE_IMAGE=splunk/splunk:10.2 -AWS_DEFAULT_REGION=us-west-2 -GCP_REGION=us-west2 -GZP_ZONE=us-west2-a -AZURE_REGION=westus \ No newline at end of file +SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:10.0.0 \ No newline at end of file diff --git a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml index 88e940bf4..c4c3f358b 100644 --- a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml +++ b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml @@ -62,6 +62,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -69,10 +70,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export S3_REGION from .env - run: echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: diff --git a/.github/workflows/arm-AL2023-int-test-workflow.yml b/.github/workflows/arm-AL2023-int-test-workflow.yml index 7489fcccb..ea9dde2a2 100644 --- a/.github/workflows/arm-AL2023-int-test-workflow.yml +++ b/.github/workflows/arm-AL2023-int-test-workflow.yml @@ -17,15 +17,12 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export S3_REGION from .env - run: echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: diff --git a/.github/workflows/arm-RHEL-build-test-push-workflow.yml b/.github/workflows/arm-RHEL-build-test-push-workflow.yml index 7ec3c54f3..d889ed74e 100644 --- a/.github/workflows/arm-RHEL-build-test-push-workflow.yml +++ b/.github/workflows/arm-RHEL-build-test-push-workflow.yml @@ -17,16 +17,12 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -82,6 +78,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing smoke keyword TEST_TO_SKIP: "^(?:[^s]+|s(?:$|[^m]|m(?:$|[^o]|o(?:$|[^k]|k(?:$|[^e])))))*$" @@ -119,11 +116,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-RHEL-int-test-workflow.yml b/.github/workflows/arm-RHEL-int-test-workflow.yml index d6c46d22c..7977e26be 100644 --- a/.github/workflows/arm-RHEL-int-test-workflow.yml +++ b/.github/workflows/arm-RHEL-int-test-workflow.yml @@ -17,16 +17,12 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -81,6 +77,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing integration keyword TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$" @@ -118,11 +115,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml index 51840193c..0854dc71d 100644 --- a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml +++ b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml @@ -62,6 +62,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -70,11 +71,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -133,6 +129,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing smoke keyword TEST_TO_SKIP: "^(?:[^s]+|s(?:$|[^m]|m(?:$|[^o]|o(?:$|[^k]|k(?:$|[^e])))))*$" @@ -165,11 +162,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/arm-Ubuntu-int-test-workflow.yml b/.github/workflows/arm-Ubuntu-int-test-workflow.yml index 5a9cb930e..3cd5a49bc 100644 --- a/.github/workflows/arm-Ubuntu-int-test-workflow.yml +++ b/.github/workflows/arm-Ubuntu-int-test-workflow.yml @@ -17,16 +17,12 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -81,6 +77,7 @@ jobs: SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.ECR_PREFIX }}/${{ github.event.inputs.splunk_image_repository_tag }} SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing integration keyword TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$" @@ -118,11 +115,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml index a4bf2a508..c5a685ab6 100644 --- a/.github/workflows/build-test-push-workflow.yml +++ b/.github/workflows/build-test-push-workflow.yml @@ -74,6 +74,8 @@ jobs: env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -82,10 +84,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -134,6 +132,8 @@ jobs: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} IMAGE_NAME: ${{ secrets.ECR_REPOSITORY }}/splunk/splunk-operator:${{ github.sha }} + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -141,10 +141,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2.5.0 - name: Configure AWS credentials @@ -197,6 +193,8 @@ jobs: CLUSTER_WORKERS: 3 SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing smoke keyword TEST_TO_SKIP: "^(?:[^s]+|s(?:$|[^m]|m(?:$|[^o]|o(?:$|[^k]|k(?:$|[^e])))))*$" @@ -226,10 +224,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/distroless-build-test-push-workflow.yml b/.github/workflows/distroless-build-test-push-workflow.yml index 0c0aa69f0..6f8f70484 100644 --- a/.github/workflows/distroless-build-test-push-workflow.yml +++ b/.github/workflows/distroless-build-test-push-workflow.yml @@ -67,6 +67,8 @@ jobs: env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - name: Set up cosign uses: sigstore/cosign-installer@main @@ -75,10 +77,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -189,6 +187,8 @@ jobs: CLUSTER_WORKERS: 3 SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing smoke keyword TEST_TO_SKIP: "^(?:[^s]+|s(?:$|[^m]|m(?:$|[^o]|o(?:$|[^k]|k(?:$|[^e])))))*$" @@ -219,10 +219,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/distroless-int-test-workflow.yml b/.github/workflows/distroless-int-test-workflow.yml index da10bd59e..35ab65400 100644 --- a/.github/workflows/distroless-int-test-workflow.yml +++ b/.github/workflows/distroless-int-test-workflow.yml @@ -19,17 +19,13 @@ jobs: env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -85,6 +81,8 @@ jobs: CLUSTER_WORKERS: 3 SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing integration keyword TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$" @@ -120,12 +118,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/helm-test-workflow.yml b/.github/workflows/helm-test-workflow.yml index 09b971b88..c0c10fae2 100644 --- a/.github/workflows/helm-test-workflow.yml +++ b/.github/workflows/helm-test-workflow.yml @@ -20,15 +20,13 @@ jobs: env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -63,6 +61,8 @@ jobs: env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_CLUSTER_PLATFORM: eks EKS_VPC_PRIVATE_SUBNET_STRING: ${{ secrets.EKS_VPC_PRIVATE_SUBNET_STRING }} EKS_VPC_PUBLIC_SUBNET_STRING: ${{ secrets.EKS_VPC_PUBLIC_SUBNET_STRING }} @@ -102,10 +102,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Change helm repo path on main branch if: github.ref == 'refs/heads/main' run: | diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml index 5acddef34..d944d6ea2 100644 --- a/.github/workflows/int-test-azure-workflow.yml +++ b/.github/workflows/int-test-azure-workflow.yml @@ -18,16 +18,12 @@ jobs: env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator CONTAINER_REGISTRY: ${{ secrets.AZURE_CONTAINER_REGISTRY }} + AZURE_REGION: ${{ vars.AZURE_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "AZURE_REGION=$AZURE_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -68,17 +64,13 @@ jobs: ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }} ECR_REPOSITORY: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} AZURE_CONTAINER_REGISTRY_LOGIN_SERVER: ${{ secrets.AZURE_ACR_LOGIN_SERVER }} + AZURE_REGION: ${{ vars.AZURE_REGION }} steps: - name: Checkout code uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "AZURE_REGION=$AZURE_REGION" >> $GITHUB_ENV - name: Set Cluster Name run: | echo "TEST_CLUSTER_NAME=az${{ github.run_id }}" >> $GITHUB_ENV @@ -123,6 +115,8 @@ jobs: CLUSTER_WORKERS: 5 SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + AZURE_REGION: ${{ vars.AZURE_REGION }} TEST_FOCUS: azure_sanity # This regex matches any string not containing integration keyword TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$" @@ -151,12 +145,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV - echo "AZURE_REGION=$AZURE_REGION" >> $GITHUB_ENV - name: 'Login via Azure CLI' uses: azure/login@v1 with: diff --git a/.github/workflows/int-test-gcp-workflow.yml b/.github/workflows/int-test-gcp-workflow.yml index a3b2d2bd1..4855ec47c 100644 --- a/.github/workflows/int-test-gcp-workflow.yml +++ b/.github/workflows/int-test-gcp-workflow.yml @@ -89,6 +89,9 @@ jobs: CLUSTER_NODES: 2 SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + GCP_REGION: ${{ vars.GCP_REGION }} + GCP_ZONE: ${{ vars.GZP_ZONE }} # This regex matches any string not containing integration keyword TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$" TEST_BUCKET: ${{ secrets.TEST_BUCKET }} @@ -119,14 +122,6 @@ jobs: - name: Load Environment Variables id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - path: .env - export-variables: true - - name: Export env from .env - run: | - echo "GCP_REGION=$GCP_REGION" >> $GITHUB_ENV - echo "GCP_ZONE=$GCP_ZONE" >> $GITHUB_ENV - echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV - name: Authenticate to GCP uses: google-github-actions/auth@v1 diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml index 0647d5c4a..d08b0b96b 100644 --- a/.github/workflows/int-test-workflow.yml +++ b/.github/workflows/int-test-workflow.yml @@ -19,15 +19,13 @@ jobs: env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -79,6 +77,8 @@ jobs: CLUSTER_WORKERS: 3 SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing integration keyword TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$" @@ -113,10 +113,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml index e0bc34949..178463f8c 100644 --- a/.github/workflows/manual-int-test-workflow.yml +++ b/.github/workflows/manual-int-test-workflow.yml @@ -38,6 +38,8 @@ jobs: CLUSTER_WORKERS: 3 SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing integration keyword TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$" @@ -72,12 +74,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/namespace-scope-int-workflow.yml b/.github/workflows/namespace-scope-int-workflow.yml index 68d8b9f22..0ee8c03c4 100644 --- a/.github/workflows/namespace-scope-int-workflow.yml +++ b/.github/workflows/namespace-scope-int-workflow.yml @@ -31,6 +31,8 @@ jobs: CLUSTER_WORKERS: 3 SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing integration keyword TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$" @@ -67,10 +69,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml index 947b7876f..e0338947e 100644 --- a/.github/workflows/nightly-int-test-workflow.yml +++ b/.github/workflows/nightly-int-test-workflow.yml @@ -16,6 +16,8 @@ jobs: env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 with: @@ -23,12 +25,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Setup Go uses: actions/setup-go@v2 with: @@ -80,6 +76,8 @@ jobs: CLUSTER_WORKERS: 3 SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator SPLUNK_OPERATOR_IMAGE_FILENAME: splunk-operator + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} TEST_FOCUS: "${{ matrix.test }}" # This regex matches any string not containing integration keyword TEST_TO_SKIP: "^(?:[^i]+|i(?:$|[^n]|n(?:$|[^t]|t(?:$|[^e]|e(?:$|[^g]|g(?:$|[^r]|r(?:$|[^a]|a(?:$|[^t]|t(?:$|[^i]|i(?:$|[^o]|o(?:$|[^n])))))))))))*$" @@ -115,12 +113,6 @@ jobs: - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - with: - export-variables: true - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=$SPLUNK_ENTERPRISE_IMAGE" >> $GITHUB_ENV - echo "S3_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV - name: Install Kubectl uses: Azure/setup-kubectl@v3 with: @@ -129,7 +121,7 @@ jobs: uses: actions/setup-python@v2 - name: Install AWS CLI run: | - curl "${{ steps.dotenv.outputs.AWSCLI_URL}}" -o "awscliv2.zip" + curl "${{ steps.dotenv.outputs.AWSCLI_URL }}" -o "awscliv2.zip" unzip awscliv2.zip sudo ./aws/install --update aws --version diff --git a/.github/workflows/prodsec-workflow.yml b/.github/workflows/prodsec-workflow.yml index 57e96d13a..c3a32d2c4 100644 --- a/.github/workflows/prodsec-workflow.yml +++ b/.github/workflows/prodsec-workflow.yml @@ -31,15 +31,13 @@ jobs: env: SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }} + SPLUNK_ENTERPRISE_IMAGE: ${{ vars.SPLUNK_ENTERPRISE_IMAGE }} + S3_REGION: ${{ vars.AWS_DEFAULT_REGION }} steps: - uses: actions/checkout@v2 - name: Dotenv Action id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - name: Export env from .env - run: | - echo "SPLUNK_ENTERPRISE_IMAGE=${{ steps.dotenv.outputs.SPLUNK_ENTERPRISE_IMAGE }}" >> $GITHUB_ENV - echo "S3_REGION=${{ steps.dotenv.outputs.AWS_DEFAULT_REGION }}" >> $GITHUB_ENV - name: Run FOSSA Test uses: fossas/fossa-action@main with: From 67406b67def02517c307ba7e8bb3d16d81a192e2 Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Wed, 25 Feb 2026 11:13:47 +0100 Subject: [PATCH 09/10] Race condition fix --- test/testenv/testcaseenv.go | 67 +++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/test/testenv/testcaseenv.go b/test/testenv/testcaseenv.go index 3987226ab..d7ec1ca4d 100644 --- a/test/testenv/testcaseenv.go +++ b/test/testenv/testcaseenv.go @@ -344,45 +344,56 @@ func (testenv *TestCaseEnv) createRoleBinding() error { } func (testenv *TestCaseEnv) attachPVCToOperator(name string) error { - var err error - // volume name which refers to PVC to be attached volumeName := "app-staging" - namespacedName := client.ObjectKey{Name: testenv.operatorName, Namespace: testenv.namespace} - operator := &appsv1.Deployment{} - err = testenv.GetKubeClient().Get(context.TODO(), namespacedName, operator) - if err != nil { - testenv.Log.Error(err, "Unable to get operator", "operator name", testenv.operatorName) - return err + + retryBackoff := wait.Backoff{ + Duration: 100 * time.Millisecond, + Factor: 2.0, + Jitter: 0.1, + Steps: 5, } - volume := corev1.Volume{ - Name: volumeName, - VolumeSource: corev1.VolumeSource{ - PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ - ClaimName: name, + return wait.ExponentialBackoff(retryBackoff, func() (bool, error) { + operator := &appsv1.Deployment{} + err := testenv.GetKubeClient().Get(context.TODO(), namespacedName, operator) + if err != nil { + testenv.Log.Error(err, "Unable to get operator", "operator name", testenv.operatorName) + return false, err + } + + volume := corev1.Volume{ + Name: volumeName, + VolumeSource: corev1.VolumeSource{ + PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ + ClaimName: name, + }, }, - }, - } + } - operator.Spec.Template.Spec.Volumes = append(operator.Spec.Template.Spec.Volumes, volume) + operator.Spec.Template.Spec.Volumes = append(operator.Spec.Template.Spec.Volumes, volume) - volumeMount := corev1.VolumeMount{ - Name: volumeName, - MountPath: splcommon.AppDownloadVolume, - } + volumeMount := corev1.VolumeMount{ + Name: volumeName, + MountPath: splcommon.AppDownloadVolume, + } - operator.Spec.Template.Spec.Containers[0].VolumeMounts = append(operator.Spec.Template.Spec.Containers[0].VolumeMounts, volumeMount) + operator.Spec.Template.Spec.Containers[0].VolumeMounts = append(operator.Spec.Template.Spec.Containers[0].VolumeMounts, volumeMount) - // update the operator deployment now - err = testenv.GetKubeClient().Update(context.TODO(), operator) - if err != nil { - testenv.Log.Error(err, "Unable to update operator", "operator name", testenv.operatorName) - return err - } + // update the operator deployment now + err = testenv.GetKubeClient().Update(context.TODO(), operator) + if err != nil { + if errors.IsConflict(err) { + testenv.Log.Info("Conflict updating operator, retrying", "operator name", testenv.operatorName) + return false, nil + } + testenv.Log.Error(err, "Unable to update operator", "operator name", testenv.operatorName) + return false, err + } - return err + return true, nil + }) } func (testenv *TestCaseEnv) createOperator() error { From d9dc151ee0c94fd0b57af2bd698a638266cb2e65 Mon Sep 17 00:00:00 2001 From: Kasia Koziol Date: Thu, 26 Feb 2026 08:57:20 +0100 Subject: [PATCH 10/10] Increasing timeout for int tests --- .github/workflows/int-test-azure-workflow.yml | 2 +- .github/workflows/int-test-workflow.yml | 2 +- test/appframework_aws/m4/appframework_aws_suite_test.go | 2 +- test/appframework_az/m4/appframework_azure_suite_test.go | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/int-test-azure-workflow.yml b/.github/workflows/int-test-azure-workflow.yml index d944d6ea2..34b57b542 100644 --- a/.github/workflows/int-test-azure-workflow.yml +++ b/.github/workflows/int-test-azure-workflow.yml @@ -219,7 +219,7 @@ jobs: mkdir -p ./bin cp /snap/bin/kustomize ./bin/kustomize - name: Run Integration test - timeout-minutes: 240 + timeout-minutes: 300 run: | make int-test - name: Collect Test Logs diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml index 0c18fca51..7196357bb 100644 --- a/.github/workflows/int-test-workflow.yml +++ b/.github/workflows/int-test-workflow.yml @@ -189,7 +189,7 @@ jobs: mkdir -p ./bin cp /snap/bin/kustomize ./bin/kustomize - name: Run Integration test - timeout-minutes: 240 + timeout-minutes: 300 env: TEST_S3_ACCESS_KEY_ID: ${{ vars.TEST_S3_ACCESS_KEY_ID }} TEST_S3_SECRET_ACCESS_KEY: ${{ secrets.TEST_S3_SECRET_ACCESS_KEY }} diff --git a/test/appframework_aws/m4/appframework_aws_suite_test.go b/test/appframework_aws/m4/appframework_aws_suite_test.go index aa21c7084..f2c7205b2 100644 --- a/test/appframework_aws/m4/appframework_aws_suite_test.go +++ b/test/appframework_aws/m4/appframework_aws_suite_test.go @@ -56,7 +56,7 @@ func TestBasic(t *testing.T) { RegisterFailHandler(Fail) sc, _ := GinkgoConfiguration() - sc.Timeout = 240 * time.Minute + sc.Timeout = 300 * time.Minute RunSpecs(t, "Running "+testSuiteName, sc) } diff --git a/test/appframework_az/m4/appframework_azure_suite_test.go b/test/appframework_az/m4/appframework_azure_suite_test.go index 6184e543b..5b1459a67 100644 --- a/test/appframework_az/m4/appframework_azure_suite_test.go +++ b/test/appframework_az/m4/appframework_azure_suite_test.go @@ -56,7 +56,10 @@ func TestBasic(t *testing.T) { RegisterFailHandler(Fail) - RunSpecs(t, "Running "+testSuiteName) + sc, _ := GinkgoConfiguration() + sc.Timeout = 300 * time.Minute + + RunSpecs(t, "Running "+testSuiteName, sc) } var _ = BeforeSuite(func() {