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 da44c6a2c..d80c218b6 100644 --- a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml +++ b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml @@ -1,6 +1,15 @@ name: Arm AL2023 Smoke Test WorkFlow +permissions: + contents: read + packages: write + id-token: write + pull-requests: write on: workflow_dispatch: + inputs: + splunk_image_repository_tag: + description: 'Splunk AL2023-based Docker Image repository and tag (e.g. repository-name:tag)' + required: true jobs: check-formating: runs-on: ubuntu-latest @@ -50,7 +59,7 @@ jobs: runs-on: ubuntu-latest needs: unit-tests env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + 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 }} @@ -118,8 +127,8 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }} + 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 }}" @@ -138,6 +147,7 @@ jobs: CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" + GRAVITON_TESTING: "true" steps: - name: Set Test Cluster Name run: | diff --git a/.github/workflows/arm-AL2023-int-test-workflow.yml b/.github/workflows/arm-AL2023-int-test-workflow.yml index 0bbdbd760..ff52c3b26 100644 --- a/.github/workflows/arm-AL2023-int-test-workflow.yml +++ b/.github/workflows/arm-AL2023-int-test-workflow.yml @@ -1,12 +1,21 @@ name: Arm AL2023 Integration Test WorkFlow +permissions: + contents: read + packages: write + id-token: write + pull-requests: write on: workflow_dispatch: + inputs: + splunk_image_repository_tag: + description: 'Splunk AL2023-based Docker Image repository and tag (e.g. repository-name:tag)' + required: true jobs: build-operator-image-arm-al2023: runs-on: ubuntu-latest timeout-minutes: 360 env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + 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 }} @@ -67,8 +76,8 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }} + 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 }}" @@ -86,6 +95,7 @@ jobs: CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" + GRAVITON_TESTING: "true" steps: - name: Set Test Cluster Name run: | @@ -194,11 +204,4 @@ jobs: - name: Cleanup up EKS cluster if: ${{ always() }} run: | - make cluster-down - #- name: Test Report - # uses: dorny/test-reporter@v1 - # if: success() || failure() # run this step even if previous step failed - # with: - # name: Integration Tests # Name of the check run which will be created - # path: inttest-*.xml # Path to test results - # reporter: jest-junit # Format of test results \ No newline at end of file + make cluster-down \ No newline at end of file diff --git a/.github/workflows/arm-RHEL-build-test-push-workflow.yml b/.github/workflows/arm-RHEL-build-test-push-workflow.yml new file mode 100644 index 000000000..ebc018e78 --- /dev/null +++ b/.github/workflows/arm-RHEL-build-test-push-workflow.yml @@ -0,0 +1,205 @@ +name: ARM RHEL Integration Test WorkFlow +permissions: + contents: read + packages: write + id-token: write + pull-requests: write +on: + workflow_dispatch: + inputs: + splunk_image_repository_tag: + description: 'Splunk RHEL-based Docker Image repository and tag (e.g. repository-name:tag)' + required: true +jobs: + build-operator-image-arm-rhel: + runs-on: ubuntu-latest + timeout-minutes: 360 + env: + 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 }} + steps: + - uses: actions/checkout@v2 + - name: Dotenv Action + id: dotenv + uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Setup Go + uses: actions/setup-go@v2 + with: + go-version: ${{ steps.dotenv.outputs.GO_VERSION }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2.5.0 + - name: Install Operator SDK + run: | + export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac) + export OS=$(uname | awk '{print tolower($0)}') + export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/${{ steps.dotenv.outputs.OPERATOR_SDK_VERSION }} + sudo curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} + sudo chmod +x operator-sdk_${OS}_${ARCH} + sudo mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_DEFAULT_REGION }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: Build and push Splunk Operator Image + run: | + 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 + make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG + int-tests-arm-rhel: + strategy: + fail-fast: false + matrix: + test: + [ + appframeworksS1, + managersecret, + managersmartstore, + managermc1, + managermc2, + managercrcrud, + licensemanager, + managerdeletecr, + ] + runs-on: ubuntu-latest + needs: build-operator-image-arm-rhel + env: + 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 }}" + # 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_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 }} + TEST_BUCKET: ${{ secrets.TEST_BUCKET }} + 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 }} + ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }} + CLUSTER_WIDE: "true" + DEPLOYMENT_TYPE: "" + ARM64: "true" + GRAVITON_TESTING: "true" + steps: + - name: Set Test Cluster Name + run: | + echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV + - name: Set Test Cluster Nodes and Parallel Runs + run: >- + if grep -q "appframework" <<< "${{ matrix.test }}"; then + echo "CLUSTER_WORKERS=5" >> $GITHUB_ENV + echo "CLUSTER_NODES=2" >> $GITHUB_ENV + fi + - name: Checkcout code + uses: actions/checkout@v2 + - 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: + version: ${{ steps.dotenv.outputs.KUBECTL_VERSION }} + - name: Install Python + uses: actions/setup-python@v2 + - name: Install AWS CLI + run: | + curl "${{ steps.dotenv.outputs.AWSCLI_URL}}" -o "awscliv2.zip" + unzip awscliv2.zip + sudo ./aws/install --update + aws --version + - name: Setup Go + uses: actions/setup-go@v2 + with: + go-version: ${{ steps.dotenv.outputs.GO_VERSION }} + - name: Install Ginkgo + run: | + make setup/ginkgo + - name: Install Helm + run: | + curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 + chmod 700 get_helm.sh + ./get_helm.sh + DESIRED_VERSION=v3.8.2 bash get_helm.sh + - name: Install EKS CTL + run: | + curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp + sudo mv /tmp/eksctl /usr/local/bin + eksctl version + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2.5.0 + - name: Configure Docker Hub credentials + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN}} + - name: Set Splunk Operator image + run: | + echo "SPLUNK_OPERATOR_IMAGE=${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA" >> $GITHUB_ENV + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_DEFAULT_REGION }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: Pull Splunk Enterprise Image + run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }} + - name: Create EKS cluster + run: | + export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }} + export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }} + make cluster-up + - name: install metric server + run: | + kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml + - name: install k8s dashboard + run: | + kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.5/aio/deploy/recommended.yaml + - name: Setup Kustomize + run: | + sudo snap install kustomize + mkdir -p ./bin + cp /snap/bin/kustomize ./bin/kustomize + - name: Run Integration test + run: | + make int-test + - name: Collect Test Logs + if: ${{ always() }} + run: | + mkdir -p /tmp/pod_logs + find ./test -name "*.log" -exec cp {} /tmp/pod_logs \; + - name: Archive Pod Logs + if: ${{ always() }} + uses: actions/upload-artifact@v4.4.0 + with: + name: "splunk-pods-logs--artifacts-${{ matrix.test }}" + path: "/tmp/pod_logs/**" + - name: Cleanup Test Case artifacts + if: ${{ always() }} + run: | + make cleanup + make clean + - name: Cleanup up EKS cluster + if: ${{ always() }} + run: | + make cluster-down \ No newline at end of file diff --git a/.github/workflows/arm-RHEL-int-test-workflow.yml b/.github/workflows/arm-RHEL-int-test-workflow.yml new file mode 100644 index 000000000..ebc018e78 --- /dev/null +++ b/.github/workflows/arm-RHEL-int-test-workflow.yml @@ -0,0 +1,205 @@ +name: ARM RHEL Integration Test WorkFlow +permissions: + contents: read + packages: write + id-token: write + pull-requests: write +on: + workflow_dispatch: + inputs: + splunk_image_repository_tag: + description: 'Splunk RHEL-based Docker Image repository and tag (e.g. repository-name:tag)' + required: true +jobs: + build-operator-image-arm-rhel: + runs-on: ubuntu-latest + timeout-minutes: 360 + env: + 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 }} + steps: + - uses: actions/checkout@v2 + - name: Dotenv Action + id: dotenv + uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 + - name: Setup Go + uses: actions/setup-go@v2 + with: + go-version: ${{ steps.dotenv.outputs.GO_VERSION }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2.5.0 + - name: Install Operator SDK + run: | + export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac) + export OS=$(uname | awk '{print tolower($0)}') + export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/${{ steps.dotenv.outputs.OPERATOR_SDK_VERSION }} + sudo curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} + sudo chmod +x operator-sdk_${OS}_${ARCH} + sudo mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_DEFAULT_REGION }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: Build and push Splunk Operator Image + run: | + 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 + make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG + int-tests-arm-rhel: + strategy: + fail-fast: false + matrix: + test: + [ + appframeworksS1, + managersecret, + managersmartstore, + managermc1, + managermc2, + managercrcrud, + licensemanager, + managerdeletecr, + ] + runs-on: ubuntu-latest + needs: build-operator-image-arm-rhel + env: + 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 }}" + # 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_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 }} + TEST_BUCKET: ${{ secrets.TEST_BUCKET }} + 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 }} + ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }} + CLUSTER_WIDE: "true" + DEPLOYMENT_TYPE: "" + ARM64: "true" + GRAVITON_TESTING: "true" + steps: + - name: Set Test Cluster Name + run: | + echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV + - name: Set Test Cluster Nodes and Parallel Runs + run: >- + if grep -q "appframework" <<< "${{ matrix.test }}"; then + echo "CLUSTER_WORKERS=5" >> $GITHUB_ENV + echo "CLUSTER_NODES=2" >> $GITHUB_ENV + fi + - name: Checkcout code + uses: actions/checkout@v2 + - 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: + version: ${{ steps.dotenv.outputs.KUBECTL_VERSION }} + - name: Install Python + uses: actions/setup-python@v2 + - name: Install AWS CLI + run: | + curl "${{ steps.dotenv.outputs.AWSCLI_URL}}" -o "awscliv2.zip" + unzip awscliv2.zip + sudo ./aws/install --update + aws --version + - name: Setup Go + uses: actions/setup-go@v2 + with: + go-version: ${{ steps.dotenv.outputs.GO_VERSION }} + - name: Install Ginkgo + run: | + make setup/ginkgo + - name: Install Helm + run: | + curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 + chmod 700 get_helm.sh + ./get_helm.sh + DESIRED_VERSION=v3.8.2 bash get_helm.sh + - name: Install EKS CTL + run: | + curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp + sudo mv /tmp/eksctl /usr/local/bin + eksctl version + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2.5.0 + - name: Configure Docker Hub credentials + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN}} + - name: Set Splunk Operator image + run: | + echo "SPLUNK_OPERATOR_IMAGE=${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA" >> $GITHUB_ENV + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ secrets.AWS_DEFAULT_REGION }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: Pull Splunk Enterprise Image + run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }} + - name: Create EKS cluster + run: | + export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }} + export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }} + make cluster-up + - name: install metric server + run: | + kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml + - name: install k8s dashboard + run: | + kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.5/aio/deploy/recommended.yaml + - name: Setup Kustomize + run: | + sudo snap install kustomize + mkdir -p ./bin + cp /snap/bin/kustomize ./bin/kustomize + - name: Run Integration test + run: | + make int-test + - name: Collect Test Logs + if: ${{ always() }} + run: | + mkdir -p /tmp/pod_logs + find ./test -name "*.log" -exec cp {} /tmp/pod_logs \; + - name: Archive Pod Logs + if: ${{ always() }} + uses: actions/upload-artifact@v4.4.0 + with: + name: "splunk-pods-logs--artifacts-${{ matrix.test }}" + path: "/tmp/pod_logs/**" + - name: Cleanup Test Case artifacts + if: ${{ always() }} + run: | + make cleanup + make clean + - name: Cleanup up EKS cluster + if: ${{ always() }} + run: | + make cluster-down \ No newline at end of file diff --git a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml index eff3d4d60..c8187d66f 100644 --- a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml +++ b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml @@ -1,6 +1,15 @@ name: Arm Ubuntu Smoke Test WorkFlow +permissions: + contents: read + packages: write + id-token: write + pull-requests: write on: workflow_dispatch: + inputs: + splunk_image_repository_tag: + description: 'Splunk Ubuntu-based Docker Image repository and tag (e.g. repository-name:tag)' + required: true jobs: check-formating: runs-on: ubuntu-latest @@ -50,7 +59,7 @@ jobs: runs-on: ubuntu-latest needs: unit-tests env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + 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 }} @@ -91,8 +100,8 @@ jobs: - name: Build and push Splunk Operator Image run: | export PLATFORMS=linux/arm64,linux/amd64 - export BASE_IMAGE=ubuntu - export BASE_IMAGE_VERSION=24.10 + export BASE_IMAGE=redhat/ubi9-minimal + export BASE_IMAGE_VERSION=9.5-1747111267 export IMG=${{ secrets.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 @@ -118,8 +127,8 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }} + 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 }}" @@ -138,6 +147,7 @@ jobs: CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" + GRAVITON_TESTING: "true" steps: - name: Set Test Cluster Name run: | diff --git a/.github/workflows/arm-Ubuntu-int-test-workflow.yml b/.github/workflows/arm-Ubuntu-int-test-workflow.yml index 2fecf95ad..d458e1b8e 100644 --- a/.github/workflows/arm-Ubuntu-int-test-workflow.yml +++ b/.github/workflows/arm-Ubuntu-int-test-workflow.yml @@ -1,12 +1,21 @@ name: Arm Ubuntu Integration Test WorkFlow Ubuntu +permissions: + contents: read + packages: write + id-token: write + pull-requests: write on: workflow_dispatch: + inputs: + splunk_image_repository_tag: + description: 'Splunk Ubuntu-based Docker Image repository and tag (e.g. repository-name:tag)' + required: true jobs: build-operator-image-arm-ubuntu: runs-on: ubuntu-latest timeout-minutes: 360 env: - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }} + 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 }} @@ -41,8 +50,8 @@ jobs: - name: Build and push Splunk Operator Image run: | export PLATFORMS=linux/arm64,linux/amd64 - export BASE_IMAGE=ubuntu - export BASE_IMAGE_VERSION=24.10 + export BASE_IMAGE=redhat/ubi9-minimal + export BASE_IMAGE_VERSION=9.5-1747111267 export IMG=${{ secrets.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: @@ -67,8 +76,8 @@ jobs: env: CLUSTER_NODES: 1 CLUSTER_WORKERS: 3 - SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }} - SPLUNK_ENTERPRISE_RELEASE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }} + 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 }}" @@ -86,6 +95,7 @@ jobs: CLUSTER_WIDE: "true" DEPLOYMENT_TYPE: "" ARM64: "true" + GRAVITON_TESTING: "true" steps: - name: Set Test Cluster Name run: | diff --git a/test/appframework_aws/c3/appframework_aws_test.go b/test/appframework_aws/c3/appframework_aws_test.go index 70d309bf9..168f32c1d 100644 --- a/test/appframework_aws/c3/appframework_aws_test.go +++ b/test/appframework_aws/c3/appframework_aws_test.go @@ -139,6 +139,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -359,6 +360,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1495,6 +1497,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2130,6 +2133,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2258,6 +2262,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -3053,6 +3058,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterMasterRef: corev1.ObjectReference{ @@ -3163,6 +3169,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -3183,6 +3190,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterMasterRef: corev1.ObjectReference{ diff --git a/test/appframework_aws/c3/manager_appframework_test.go b/test/appframework_aws/c3/manager_appframework_test.go index 08d66d1ec..e9c4835ba 100644 --- a/test/appframework_aws/c3/manager_appframework_test.go +++ b/test/appframework_aws/c3/manager_appframework_test.go @@ -136,6 +136,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -329,7 +330,7 @@ var _ = Describe("c3appfw test", func() { // Upload V1 apps to S3 for Monitoring Console oldImage := "Refer to RELATED_SPLUNK_IMAGE_ENTERPRISE" - newImage := "splunk/splunk:latest" + newImage := testcaseEnvInst.GetSplunkImage() lm, err := deployment.DeployLicenseManager(ctx, deployment.GetName()) cm, err := deployment.DeployClusterManager(ctx, deployment.GetName(), lm.GetName(), "", "") @@ -338,6 +339,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ @@ -500,6 +502,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1636,6 +1639,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2271,6 +2275,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2399,6 +2404,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -3194,6 +3200,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ @@ -3304,6 +3311,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -3324,6 +3332,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ diff --git a/test/appframework_aws/m4/appframework_aws_test.go b/test/appframework_aws/m4/appframework_aws_test.go index 342c109aa..9bd1ebe21 100644 --- a/test/appframework_aws/m4/appframework_aws_test.go +++ b/test/appframework_aws/m4/appframework_aws_test.go @@ -137,6 +137,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -355,6 +356,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -968,6 +970,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1620,6 +1623,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1753,6 +1757,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, diff --git a/test/appframework_aws/m4/manager_appframework_test.go b/test/appframework_aws/m4/manager_appframework_test.go index 9671e745d..800382d50 100644 --- a/test/appframework_aws/m4/manager_appframework_test.go +++ b/test/appframework_aws/m4/manager_appframework_test.go @@ -136,6 +136,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -354,6 +355,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -967,6 +969,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1619,6 +1622,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1752,6 +1756,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, diff --git a/test/appframework_aws/s1/appframework_aws_test.go b/test/appframework_aws/s1/appframework_aws_test.go index affa66f49..91bdee3f4 100644 --- a/test/appframework_aws/s1/appframework_aws_test.go +++ b/test/appframework_aws/s1/appframework_aws_test.go @@ -131,6 +131,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -164,6 +165,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -309,6 +311,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -331,6 +334,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -478,6 +482,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -506,6 +511,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -663,6 +669,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -781,6 +788,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -886,6 +894,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -966,6 +975,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -994,6 +1004,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -1146,6 +1157,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1160,6 +1172,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1229,6 +1242,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1266,6 +1280,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -1342,6 +1357,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1438,6 +1454,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1511,6 +1528,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1620,6 +1638,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1739,6 +1758,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1834,6 +1854,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1896,6 +1917,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1967,6 +1989,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2004,6 +2027,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ diff --git a/test/appframework_az/c3/appframework_azure_test.go b/test/appframework_az/c3/appframework_azure_test.go index 97bcbea77..c626160cb 100644 --- a/test/appframework_az/c3/appframework_azure_test.go +++ b/test/appframework_az/c3/appframework_azure_test.go @@ -135,6 +135,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -349,6 +350,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -978,6 +980,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -998,6 +1001,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterMasterRef: corev1.ObjectReference{ @@ -1653,6 +1657,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2291,6 +2296,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2420,6 +2426,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -3219,6 +3226,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterMasterRef: corev1.ObjectReference{ diff --git a/test/appframework_az/c3/manager_appframework_azure_test.go b/test/appframework_az/c3/manager_appframework_azure_test.go index 503b3cce3..975fdc1ab 100644 --- a/test/appframework_az/c3/manager_appframework_azure_test.go +++ b/test/appframework_az/c3/manager_appframework_azure_test.go @@ -134,6 +134,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -347,6 +348,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -976,6 +978,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -996,6 +999,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ @@ -1653,6 +1657,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2291,6 +2296,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2420,6 +2426,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -3219,6 +3226,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ diff --git a/test/appframework_az/m4/appframework_azure_test.go b/test/appframework_az/m4/appframework_azure_test.go index 6bf739a7e..e6f39edb1 100644 --- a/test/appframework_az/m4/appframework_azure_test.go +++ b/test/appframework_az/m4/appframework_azure_test.go @@ -137,6 +137,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -344,6 +345,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -941,6 +943,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1595,6 +1598,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1729,6 +1733,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, diff --git a/test/appframework_az/m4/manager_appframework_azure_test.go b/test/appframework_az/m4/manager_appframework_azure_test.go index 657cb7501..f3bbe2a71 100644 --- a/test/appframework_az/m4/manager_appframework_azure_test.go +++ b/test/appframework_az/m4/manager_appframework_azure_test.go @@ -136,6 +136,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -343,6 +344,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -940,6 +942,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1594,6 +1597,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1728,6 +1732,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, diff --git a/test/appframework_az/s1/appframework_azure_test.go b/test/appframework_az/s1/appframework_azure_test.go index 7d23f92d4..a9db51a5d 100644 --- a/test/appframework_az/s1/appframework_azure_test.go +++ b/test/appframework_az/s1/appframework_azure_test.go @@ -134,6 +134,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -165,6 +166,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -300,6 +302,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -322,6 +325,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -472,6 +476,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -501,6 +506,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -641,6 +647,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -762,6 +769,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -865,6 +873,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -945,6 +954,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -973,6 +983,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -1124,6 +1135,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1138,6 +1150,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1207,6 +1220,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1245,6 +1259,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -1323,6 +1338,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1393,6 +1409,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1467,6 +1484,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1578,6 +1596,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1698,6 +1717,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1792,6 +1812,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1855,6 +1876,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1926,6 +1948,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1963,6 +1986,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ diff --git a/test/appframework_gcp/c3/appframework_gcs_test.go b/test/appframework_gcp/c3/appframework_gcs_test.go index d73a02eeb..48d7e2c1a 100644 --- a/test/appframework_gcp/c3/appframework_gcs_test.go +++ b/test/appframework_gcp/c3/appframework_gcs_test.go @@ -140,6 +140,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -360,6 +361,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, diff --git a/test/appframework_gcp/c3/manager_appframework_test.go b/test/appframework_gcp/c3/manager_appframework_test.go index 4bf7d8dcd..c33384949 100644 --- a/test/appframework_gcp/c3/manager_appframework_test.go +++ b/test/appframework_gcp/c3/manager_appframework_test.go @@ -137,6 +137,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -344,6 +345,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ @@ -503,6 +505,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1639,6 +1642,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2274,6 +2278,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2402,6 +2407,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -3197,6 +3203,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ @@ -3307,6 +3314,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -3327,6 +3335,7 @@ var _ = Describe("c3appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ diff --git a/test/appframework_gcp/m4/appframework_gcs_test.go b/test/appframework_gcp/m4/appframework_gcs_test.go index 33edbe233..1ab7d656e 100644 --- a/test/appframework_gcp/m4/appframework_gcs_test.go +++ b/test/appframework_gcp/m4/appframework_gcs_test.go @@ -137,6 +137,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -355,6 +356,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -968,6 +970,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1620,6 +1623,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1753,6 +1757,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, diff --git a/test/appframework_gcp/m4/manager_appframework_test.go b/test/appframework_gcp/m4/manager_appframework_test.go index 971c3f513..1f62b3a8c 100644 --- a/test/appframework_gcp/m4/manager_appframework_test.go +++ b/test/appframework_gcp/m4/manager_appframework_test.go @@ -136,6 +136,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -354,6 +355,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -967,6 +969,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1619,6 +1622,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1752,6 +1756,7 @@ var _ = Describe("m4appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, diff --git a/test/appframework_gcp/s1/appframework_gcs_test.go b/test/appframework_gcp/s1/appframework_gcs_test.go index a36559db9..ae3013830 100644 --- a/test/appframework_gcp/s1/appframework_gcs_test.go +++ b/test/appframework_gcp/s1/appframework_gcs_test.go @@ -131,6 +131,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -164,6 +165,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -309,6 +311,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -331,6 +334,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -478,6 +482,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -506,6 +511,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -663,6 +669,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -781,6 +788,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -886,6 +894,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -966,6 +975,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -994,6 +1004,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -1143,6 +1154,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1157,6 +1169,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1226,6 +1239,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1263,6 +1277,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -1339,6 +1354,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1435,6 +1451,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1508,6 +1525,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1617,6 +1635,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1736,6 +1755,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1831,6 +1851,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1893,6 +1914,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -1964,6 +1986,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, @@ -2001,6 +2024,7 @@ var _ = Describe("s1appfw test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ diff --git a/test/delete_cr/deletecr_test.go b/test/delete_cr/deletecr_test.go index 300d3cd1f..273143377 100644 --- a/test/delete_cr/deletecr_test.go +++ b/test/delete_cr/deletecr_test.go @@ -62,6 +62,7 @@ var _ = Describe("DeleteCR test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, }, diff --git a/test/licensemanager/manager_lm_c3_test.go b/test/licensemanager/manager_lm_c3_test.go index d6cf4de92..8e7b81042 100644 --- a/test/licensemanager/manager_lm_c3_test.go +++ b/test/licensemanager/manager_lm_c3_test.go @@ -257,6 +257,7 @@ var _ = Describe("Licensemanager test", func() { LicenseURL: "/mnt/licenses/enterprise.lic", Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, }, AppFrameworkConfig: appFrameworkSpec, diff --git a/test/licensemaster/lm_c3_test.go b/test/licensemaster/lm_c3_test.go index 54dcb5a54..622e26902 100644 --- a/test/licensemaster/lm_c3_test.go +++ b/test/licensemaster/lm_c3_test.go @@ -255,6 +255,7 @@ var _ = Describe("licensemaster test", func() { LicenseURL: "/mnt/licenses/enterprise.lic", Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, }, AppFrameworkConfig: appFrameworkSpec, diff --git a/test/monitoring_console/manager_monitoring_console_test.go b/test/monitoring_console/manager_monitoring_console_test.go index 743ce0a00..3d2766388 100644 --- a/test/monitoring_console/manager_monitoring_console_test.go +++ b/test/monitoring_console/manager_monitoring_console_test.go @@ -92,6 +92,7 @@ var _ = Describe("Monitoring Console test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -190,6 +191,7 @@ var _ = Describe("Monitoring Console test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -235,6 +237,7 @@ var _ = Describe("Monitoring Console test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ "cpu": resource.MustParse("2"), @@ -341,6 +344,7 @@ var _ = Describe("Monitoring Console test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -529,6 +533,7 @@ var _ = Describe("Monitoring Console test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -972,6 +977,7 @@ var _ = Describe("Monitoring Console test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ @@ -1013,6 +1019,7 @@ var _ = Describe("Monitoring Console test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ "cpu": resource.MustParse("2"), diff --git a/test/monitoring_console/monitoring_console_test.go b/test/monitoring_console/monitoring_console_test.go index 99375cb59..aea489c16 100644 --- a/test/monitoring_console/monitoring_console_test.go +++ b/test/monitoring_console/monitoring_console_test.go @@ -168,6 +168,7 @@ var _ = Describe("Monitoring Console test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ diff --git a/test/secret/manager_secret_s1_test.go b/test/secret/manager_secret_s1_test.go index bbe7d5e9d..decc2a60e 100644 --- a/test/secret/manager_secret_s1_test.go +++ b/test/secret/manager_secret_s1_test.go @@ -280,6 +280,7 @@ var _ = Describe("Secret Test for SVA S1", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ diff --git a/test/secret/secret_s1_test.go b/test/secret/secret_s1_test.go index 88277f787..b5b710b60 100644 --- a/test/secret/secret_s1_test.go +++ b/test/secret/secret_s1_test.go @@ -280,6 +280,7 @@ var _ = Describe("Secret Test for SVA S1", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, MonitoringConsoleRef: corev1.ObjectReference{ diff --git a/test/smartstore/smartstore_test.go b/test/smartstore/smartstore_test.go index a01c175e6..a56740e08 100644 --- a/test/smartstore/smartstore_test.go +++ b/test/smartstore/smartstore_test.go @@ -294,6 +294,7 @@ var _ = Describe("Smartstore test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, EtcVolumeStorageConfig: enterpriseApi.StorageClassSpec{ @@ -330,6 +331,7 @@ var _ = Describe("Smartstore test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, VarVolumeStorageConfig: enterpriseApi.StorageClassSpec{ diff --git a/test/smoke/smoke_test.go b/test/smoke/smoke_test.go index ed8d82626..8fcc61c8e 100644 --- a/test/smoke/smoke_test.go +++ b/test/smoke/smoke_test.go @@ -140,6 +140,7 @@ var _ = Describe("Smoke test", func() { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: testcaseEnvInst.GetSplunkImage(), }, Volumes: []corev1.Volume{}, ServiceAccount: serviceAccountName, diff --git a/test/testenv/deployment.go b/test/testenv/deployment.go index 14f28d654..956af522d 100644 --- a/test/testenv/deployment.go +++ b/test/testenv/deployment.go @@ -150,7 +150,7 @@ func (d *Deployment) Teardown() error { // DeployStandalone deploys a standalone splunk enterprise instance on the specified testenv func (d *Deployment) DeployStandalone(ctx context.Context, name string, mcRef string, LicenseManager string) (*enterpriseApi.Standalone, error) { - standalone := newStandalone(name, d.testenv.namespace) + standalone := newStandalone(name, d.testenv.namespace, d.testenv.splunkImage) // If license file specified, deploy License Manager if LicenseManager != "" && d.testenv.licenseFilePath != "" { @@ -177,7 +177,7 @@ func (d *Deployment) DeployStandalone(ctx context.Context, name string, mcRef st // DeployMonitoringConsole deploys MC instance on specified testenv, // LicenseManagerRef is optional, pass empty string if MC should not be attached to a LM func (d *Deployment) DeployMonitoringConsole(ctx context.Context, name string, LicenseManagerRef string) (*enterpriseApi.MonitoringConsole, error) { - mc := newMonitoringConsoleSpec(name, d.testenv.namespace, LicenseManagerRef) + mc := newMonitoringConsoleSpec(name, d.testenv.namespace, LicenseManagerRef, d.testenv.splunkImage) deployed, err := d.deployCR(ctx, name, mc) if err != nil { return nil, err @@ -333,7 +333,7 @@ func (d *Deployment) DeployLicenseManager(ctx context.Context, name string) (*en return nil, fmt.Errorf("no license file path specified") } - lm := newLicenseManager(name, d.testenv.namespace, d.testenv.licenseCMName) + lm := newLicenseManager(name, d.testenv.namespace, d.testenv.licenseCMName, d.testenv.splunkImage) deployed, err := d.deployCR(ctx, name, lm) if err != nil { return nil, err @@ -351,7 +351,7 @@ func (d *Deployment) DeployLicenseMaster(ctx context.Context, name string) (*ent return nil, fmt.Errorf("no license file path specified") } - lm := newLicenseMaster(name, d.testenv.namespace, d.testenv.licenseCMName) + lm := newLicenseMaster(name, d.testenv.namespace, d.testenv.licenseCMName, d.testenv.splunkImage) deployed, err := d.deployCR(ctx, name, lm) if err != nil { return nil, err @@ -365,7 +365,7 @@ func (d *Deployment) DeployLicenseMaster(ctx context.Context, name string) (*ent // DeployClusterManager deploys the cluster manager func (d *Deployment) DeployClusterManager(ctx context.Context, name, LicenseManagerName string, ansibleConfig string, mcRef string) (*enterpriseApi.ClusterManager, error) { d.testenv.Log.Info("Deploying cluster-manager", "name", name, "LicenseRef", LicenseManagerName) - cm := newClusterManager(name, d.testenv.namespace, LicenseManagerName, ansibleConfig) + cm := newClusterManager(name, d.testenv.namespace, LicenseManagerName, ansibleConfig, d.testenv.splunkImage) if mcRef != "" { cm.Spec.MonitoringConsoleRef = corev1.ObjectReference{ Name: mcRef, @@ -385,7 +385,7 @@ func (d *Deployment) DeployClusterManager(ctx context.Context, name, LicenseMana // DeployClusterMaster deploys the cluster manager func (d *Deployment) DeployClusterMaster(ctx context.Context, name, LicenseManagerName string, ansibleConfig string, mcRef string) (*enterpriseApiV3.ClusterMaster, error) { d.testenv.Log.Info("Deploying cluster-master", "name", name, "LicenseRef", LicenseManagerName) - cm := newClusterMaster(name, d.testenv.namespace, LicenseManagerName, ansibleConfig) + cm := newClusterMaster(name, d.testenv.namespace, LicenseManagerName, ansibleConfig, d.testenv.splunkImage) if mcRef != "" { cm.Spec.MonitoringConsoleRef = corev1.ObjectReference{ Name: mcRef, @@ -405,7 +405,7 @@ func (d *Deployment) DeployClusterMaster(ctx context.Context, name, LicenseManag // DeployClusterManagerWithSmartStoreIndexes deploys the cluster manager with smartstore indexes func (d *Deployment) DeployClusterManagerWithSmartStoreIndexes(ctx context.Context, name, LicenseManagerName string, ansibleConfig string, smartstorespec enterpriseApi.SmartStoreSpec) (*enterpriseApi.ClusterManager, error) { d.testenv.Log.Info("Deploying cluster-manager", "name", name) - cm := newClusterManagerWithGivenIndexes(name, d.testenv.namespace, LicenseManagerName, ansibleConfig, smartstorespec) + cm := newClusterManagerWithGivenIndexes(name, d.testenv.namespace, LicenseManagerName, ansibleConfig, d.testenv.splunkImage, smartstorespec) deployed, err := d.deployCR(ctx, name, cm) if err != nil { return nil, err @@ -417,9 +417,9 @@ func (d *Deployment) DeployClusterManagerWithSmartStoreIndexes(ctx context.Conte } // DeployClusterMasterWithSmartStoreIndexes deploys the cluster manager with smartstore indexes -func (d *Deployment) DeployClusterMasterWithSmartStoreIndexes(ctx context.Context, name, LicenseManagerName string, ansibleConfig string, smartstorespec enterpriseApi.SmartStoreSpec) (*enterpriseApiV3.ClusterMaster, error) { +func (d *Deployment) DeployClusterMasterWithSmartStoreIndexes(ctx context.Context, name, LicenseManagerName, ansibleConfig string, smartstorespec enterpriseApi.SmartStoreSpec) (*enterpriseApiV3.ClusterMaster, error) { d.testenv.Log.Info("Deploying cluster-manager", "name", name) - cm := newClusterMasterWithGivenIndexes(name, d.testenv.namespace, LicenseManagerName, ansibleConfig, smartstorespec) + cm := newClusterMasterWithGivenIndexes(name, d.testenv.namespace, LicenseManagerName, ansibleConfig, d.testenv.splunkImage, smartstorespec) deployed, err := d.deployCR(ctx, name, cm) if err != nil { return nil, err @@ -433,7 +433,7 @@ func (d *Deployment) DeployClusterMasterWithSmartStoreIndexes(ctx context.Contex // DeployIndexerCluster deploys the indexer cluster func (d *Deployment) DeployIndexerCluster(ctx context.Context, name, LicenseManagerName string, count int, clusterManagerRef string, ansibleConfig string) (*enterpriseApi.IndexerCluster, error) { d.testenv.Log.Info("Deploying indexer cluster", "name", name, "CM", clusterManagerRef) - indexer := newIndexerCluster(name, d.testenv.namespace, LicenseManagerName, count, clusterManagerRef, ansibleConfig) + indexer := newIndexerCluster(name, d.testenv.namespace, LicenseManagerName, count, clusterManagerRef, ansibleConfig, d.testenv.splunkImage) pdata, _ := json.Marshal(indexer) d.testenv.Log.Info("indexer cluster spec", "cr", string(pdata)) deployed, err := d.deployCR(ctx, name, indexer) @@ -447,7 +447,7 @@ func (d *Deployment) DeployIndexerCluster(ctx context.Context, name, LicenseMana // DeploySearchHeadCluster deploys a search head cluster func (d *Deployment) DeploySearchHeadCluster(ctx context.Context, name, ClusterManagerRef, LicenseManagerName string, ansibleConfig string, mcRef string) (*enterpriseApi.SearchHeadCluster, error) { d.testenv.Log.Info("Deploying search head cluster", "name", name) - sh := newSearchHeadCluster(name, d.testenv.namespace, ClusterManagerRef, LicenseManagerName, ansibleConfig) + sh := newSearchHeadCluster(name, d.testenv.namespace, ClusterManagerRef, LicenseManagerName, ansibleConfig, d.testenv.splunkImage) if mcRef != "" { sh.Spec.MonitoringConsoleRef = corev1.ObjectReference{ Name: mcRef, @@ -889,7 +889,7 @@ func (d *Deployment) DeployStandaloneWithLMaster(ctx context.Context, name strin LicenseManager = name } - standalone := newStandaloneWithLM(name, d.testenv.namespace, LicenseManager) + standalone := newStandaloneWithLM(name, d.testenv.namespace, LicenseManager, d.testenv.splunkImage) if mcRef != "" { standalone.Spec.MonitoringConsoleRef = corev1.ObjectReference{ Name: mcRef, @@ -916,7 +916,7 @@ func (d *Deployment) DeployStandaloneWithLM(ctx context.Context, name string, mc LicenseManager = name } - standalone := newStandaloneWithLM(name, d.testenv.namespace, LicenseManager) + standalone := newStandaloneWithLM(name, d.testenv.namespace, LicenseManager, d.testenv.splunkImage) if mcRef != "" { standalone.Spec.MonitoringConsoleRef = corev1.ObjectReference{ Name: mcRef, @@ -946,6 +946,7 @@ func (d *Deployment) DeployStandaloneWithGivenSmartStoreSpec(ctx context.Context CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "IfNotPresent", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, }, @@ -1143,6 +1144,7 @@ func (d *Deployment) DeploySingleSiteClusterWithGivenAppFrameworkSpec(ctx contex CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, LicenseManagerRef: corev1.ObjectReference{ @@ -1169,6 +1171,7 @@ func (d *Deployment) DeploySingleSiteClusterWithGivenAppFrameworkSpec(ctx contex CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ @@ -1219,6 +1222,7 @@ func (d *Deployment) DeploySingleSiteClusterMasterWithGivenAppFrameworkSpec(ctx CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, LicenseMasterRef: corev1.ObjectReference{ @@ -1245,6 +1249,7 @@ func (d *Deployment) DeploySingleSiteClusterMasterWithGivenAppFrameworkSpec(ctx CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, ClusterMasterRef: corev1.ObjectReference{ @@ -1309,6 +1314,7 @@ func (d *Deployment) DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx con CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, LicenseManagerRef: corev1.ObjectReference{ @@ -1349,6 +1355,7 @@ func (d *Deployment) DeployMultisiteClusterWithSearchHeadAndAppFramework(ctx con CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ @@ -1411,6 +1418,7 @@ func (d *Deployment) DeployMultisiteClusterMasterWithSearchHeadAndAppFramework(c CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, LicenseMasterRef: corev1.ObjectReference{ @@ -1451,6 +1459,7 @@ func (d *Deployment) DeployMultisiteClusterMasterWithSearchHeadAndAppFramework(c CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, ClusterMasterRef: corev1.ObjectReference{ @@ -1499,6 +1508,7 @@ func (d *Deployment) DeploySingleSiteClusterWithGivenMonitoringConsole(ctx conte CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, LicenseManagerRef: corev1.ObjectReference{ @@ -1524,6 +1534,7 @@ func (d *Deployment) DeploySingleSiteClusterWithGivenMonitoringConsole(ctx conte CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ @@ -1569,6 +1580,7 @@ func (d *Deployment) DeploySingleSiteClusterMasterWithGivenMonitoringConsole(ctx CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, LicenseMasterRef: corev1.ObjectReference{ @@ -1594,6 +1606,7 @@ func (d *Deployment) DeploySingleSiteClusterMasterWithGivenMonitoringConsole(ctx CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, ClusterMasterRef: corev1.ObjectReference{ @@ -1653,6 +1666,7 @@ func (d *Deployment) DeployMultisiteClusterWithMonitoringConsole(ctx context.Con CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, LicenseManagerRef: corev1.ObjectReference{ @@ -1692,6 +1706,7 @@ func (d *Deployment) DeployMultisiteClusterWithMonitoringConsole(ctx context.Con CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, ClusterManagerRef: corev1.ObjectReference{ @@ -1751,6 +1766,7 @@ func (d *Deployment) DeployMultisiteClusterMasterWithMonitoringConsole(ctx conte CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, LicenseManagerRef: corev1.ObjectReference{ @@ -1790,6 +1806,7 @@ func (d *Deployment) DeployMultisiteClusterMasterWithMonitoringConsole(ctx conte CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: d.testenv.splunkImage, }, Volumes: []corev1.Volume{}, ClusterMasterRef: corev1.ObjectReference{ diff --git a/test/testenv/testcaseenv.go b/test/testenv/testcaseenv.go index b09e1c731..a1081e0a0 100644 --- a/test/testenv/testcaseenv.go +++ b/test/testenv/testcaseenv.go @@ -62,7 +62,11 @@ func (testenv *TestCaseEnv) GetKubeClient() client.Client { // NewDefaultTestCaseEnv creates a default test environment func NewDefaultTestCaseEnv(kubeClient client.Client, name string) (*TestCaseEnv, error) { - return NewTestCaseEnv(kubeClient, name, specifiedOperatorImage, specifiedSplunkImage, specifiedLicenseFilePath) + if os.Getenv("GRAVITON_TESTING") == "true" { + return NewTestCaseEnv(kubeClient, name, specifiedOperatorImage, os.Getenv("SPLUNK_ENTERPRISE_IMAGE"), specifiedLicenseFilePath) + } else { + return NewTestCaseEnv(kubeClient, name, specifiedOperatorImage, specifiedSplunkImage, specifiedLicenseFilePath) + } } // NewTestCaseEnv creates a new test environment to run tests againsts @@ -107,6 +111,11 @@ func (testenv *TestCaseEnv) GetName() string { return testenv.name } +// GetName returns the Splunk image of the testenv +func (testenv *TestCaseEnv) GetSplunkImage() string { + return testenv.splunkImage +} + // IsOperatorInstalledClusterWide returns if operator is installed clusterwide func (testenv *TestCaseEnv) IsOperatorInstalledClusterWide() string { return testenv.clusterWideOperator diff --git a/test/testenv/testenv.go b/test/testenv/testenv.go index a7556c1b7..434ace66a 100644 --- a/test/testenv/testenv.go +++ b/test/testenv/testenv.go @@ -185,7 +185,11 @@ func init() { flag.StringVar(&specifiedLicenseFilePath, "license-file", "", "Enterprise license file to use") flag.StringVar(&specifiedOperatorImage, "operator-image", defaultOperatorImage, "Splunk Operator image to use") - flag.StringVar(&specifiedSplunkImage, "splunk-image", defaultSplunkImage, "Splunk Enterprise (splunkd) image to use") + if os.Getenv("GRAVITON_TESTING") == "true" { + flag.StringVar(&specifiedSplunkImage, "splunk-image", os.Getenv("SPLUNK_ENTERPRISE_IMAGE"), "Splunk Enterprise (splunkd) image to use") + } else { + flag.StringVar(&specifiedSplunkImage, "splunk-image", defaultSplunkImage, "Splunk Enterprise (splunkd) image to use") + } flag.BoolVar(&specifiedSkipTeardown, "skip-teardown", false, "True to skip tearing down the test env after use") flag.IntVar(&SpecifiedTestTimeout, "test-timeout", defaultTestTimeout, "Max test timeout in seconds to use") flag.StringVar(&specifiedCommitHash, "commit-hash", "", "commit hash string to use as part of the name") @@ -199,7 +203,11 @@ func (testenv *TestEnv) GetKubeClient() client.Client { // NewDefaultTestEnv creates a default test environment func NewDefaultTestEnv(name string) (*TestEnv, error) { - return NewTestEnv(name, specifiedCommitHash, specifiedOperatorImage, specifiedSplunkImage, specifiedLicenseFilePath) + if os.Getenv("GRAVITON_TESTING") == "true" { + return NewTestEnv(name, specifiedCommitHash, specifiedOperatorImage, os.Getenv("SPLUNK_ENTERPRISE_IMAGE"), specifiedLicenseFilePath) + } else { + return NewTestEnv(name, specifiedCommitHash, specifiedOperatorImage, specifiedSplunkImage, specifiedLicenseFilePath) + } } // NewTestEnv creates a new test environment to run tests againsts diff --git a/test/testenv/util.go b/test/testenv/util.go index 02b8ffea6..ea601afdf 100644 --- a/test/testenv/util.go +++ b/test/testenv/util.go @@ -72,7 +72,7 @@ func RandomDNSName(n int) string { } // newStandalone creates and initializes CR for Standalone Kind -func newStandalone(name, ns string) *enterpriseApi.Standalone { +func newStandalone(name, ns, splunkImage string) *enterpriseApi.Standalone { new := enterpriseApi.Standalone{ TypeMeta: metav1.TypeMeta{ @@ -88,6 +88,7 @@ func newStandalone(name, ns string) *enterpriseApi.Standalone { CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, Volumes: []corev1.Volume{}, }, @@ -115,7 +116,7 @@ func newStandaloneWithGivenSpec(name, ns string, spec enterpriseApi.StandaloneSp return &new } -func newLicenseManager(name, ns, licenseConfigMapName string) *enterpriseApi.LicenseManager { +func newLicenseManager(name, ns, licenseConfigMapName, splunkImage string) *enterpriseApi.LicenseManager { new := enterpriseApi.LicenseManager{ TypeMeta: metav1.TypeMeta{ Kind: "LicenseManager", @@ -144,6 +145,7 @@ func newLicenseManager(name, ns, licenseConfigMapName string) *enterpriseApi.Lic LicenseURL: "/mnt/licenses/enterprise.lic", Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, }, }, @@ -152,7 +154,7 @@ func newLicenseManager(name, ns, licenseConfigMapName string) *enterpriseApi.Lic return &new } -func newLicenseMaster(name, ns, licenseConfigMapName string) *enterpriseApiV3.LicenseMaster { +func newLicenseMaster(name, ns, licenseConfigMapName, splunkImage string) *enterpriseApiV3.LicenseMaster { new := enterpriseApiV3.LicenseMaster{ TypeMeta: metav1.TypeMeta{ Kind: "LicenseMaster", @@ -181,6 +183,7 @@ func newLicenseMaster(name, ns, licenseConfigMapName string) *enterpriseApiV3.Li LicenseURL: "/mnt/licenses/enterprise.lic", Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, }, }, @@ -208,7 +211,7 @@ func swapLicenseManager(name string, licenseManagerName string) (string, string) } // newClusterManager creates and initialize the CR for ClusterManager Kind -func newClusterManager(name, ns, licenseManagerName string, ansibleConfig string) *enterpriseApi.ClusterManager { +func newClusterManager(name, ns, licenseManagerName, ansibleConfig, splunkImage string) *enterpriseApi.ClusterManager { licenseMasterRef, licenseManagerRef := swapLicenseManager(name, licenseManagerName) @@ -227,6 +230,7 @@ func newClusterManager(name, ns, licenseManagerName string, ansibleConfig string Volumes: []corev1.Volume{}, Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, LicenseManagerRef: corev1.ObjectReference{ Name: licenseManagerRef, @@ -243,7 +247,7 @@ func newClusterManager(name, ns, licenseManagerName string, ansibleConfig string } // newClusterManager creates and initialize the CR for ClusterManager Kind -func newClusterMaster(name, ns, licenseManagerName string, ansibleConfig string) *enterpriseApiV3.ClusterMaster { +func newClusterMaster(name, ns, licenseManagerName, ansibleConfig, splunkImage string) *enterpriseApiV3.ClusterMaster { licenseMasterRef, licenseManagerRef := swapLicenseManager(name, licenseManagerName) @@ -262,6 +266,7 @@ func newClusterMaster(name, ns, licenseManagerName string, ansibleConfig string) Volumes: []corev1.Volume{}, Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, LicenseManagerRef: corev1.ObjectReference{ Name: licenseManagerRef, @@ -278,7 +283,7 @@ func newClusterMaster(name, ns, licenseManagerName string, ansibleConfig string) } // newClusterManager creates and initialize the CR for ClusterManager Kind -func newClusterManagerWithGivenIndexes(name, ns, licenseManagerName string, ansibleConfig string, smartstorespec enterpriseApi.SmartStoreSpec) *enterpriseApi.ClusterManager { +func newClusterManagerWithGivenIndexes(name, ns, licenseManagerName, ansibleConfig, splunkImage string, smartstorespec enterpriseApi.SmartStoreSpec) *enterpriseApi.ClusterManager { licenseMasterRef, licenseManagerRef := swapLicenseManager(name, licenseManagerName) @@ -298,6 +303,7 @@ func newClusterManagerWithGivenIndexes(name, ns, licenseManagerName string, ansi Volumes: []corev1.Volume{}, Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, LicenseManagerRef: corev1.ObjectReference{ Name: licenseManagerRef, @@ -314,7 +320,7 @@ func newClusterManagerWithGivenIndexes(name, ns, licenseManagerName string, ansi } // newClusterManager creates and initialize the CR for ClusterManager Kind -func newClusterMasterWithGivenIndexes(name, ns, licenseManagerName string, ansibleConfig string, smartstorespec enterpriseApi.SmartStoreSpec) *enterpriseApiV3.ClusterMaster { +func newClusterMasterWithGivenIndexes(name, ns, licenseManagerName, ansibleConfig, splunkImage string, smartstorespec enterpriseApi.SmartStoreSpec) *enterpriseApiV3.ClusterMaster { licenseMasterRef, licenseManagerRef := swapLicenseManager(name, licenseManagerName) @@ -334,6 +340,7 @@ func newClusterMasterWithGivenIndexes(name, ns, licenseManagerName string, ansib Volumes: []corev1.Volume{}, Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, LicenseManagerRef: corev1.ObjectReference{ Name: licenseManagerRef, @@ -350,7 +357,7 @@ func newClusterMasterWithGivenIndexes(name, ns, licenseManagerName string, ansib } // newIndexerCluster creates and initialize the CR for IndexerCluster Kind -func newIndexerCluster(name, ns, licenseManagerName string, replicas int, clusterManagerRef string, ansibleConfig string) *enterpriseApi.IndexerCluster { +func newIndexerCluster(name, ns, licenseManagerName string, replicas int, clusterManagerRef, ansibleConfig, splunkImage string) *enterpriseApi.IndexerCluster { licenseMasterRef, licenseManagerRef := swapLicenseManager(name, licenseManagerName) clusterMasterRef, clusterManagerRef := swapClusterManager(name, clusterManagerRef) @@ -370,6 +377,7 @@ func newIndexerCluster(name, ns, licenseManagerName string, replicas int, cluste Volumes: []corev1.Volume{}, Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, ClusterManagerRef: corev1.ObjectReference{ Name: clusterManagerRef, @@ -392,7 +400,7 @@ func newIndexerCluster(name, ns, licenseManagerName string, replicas int, cluste return &new } -func newSearchHeadCluster(name, ns, clusterManagerRef, licenseManagerName string, ansibleConfig string) *enterpriseApi.SearchHeadCluster { +func newSearchHeadCluster(name, ns, clusterManagerRef, licenseManagerName, ansibleConfig, splunkImage string) *enterpriseApi.SearchHeadCluster { licenseMasterRef, licenseManagerRef := swapLicenseManager(name, licenseManagerName) clusterMasterRef, clusterManagerRef := swapClusterManager(name, clusterManagerRef) @@ -412,6 +420,7 @@ func newSearchHeadCluster(name, ns, clusterManagerRef, licenseManagerName string Volumes: []corev1.Volume{}, Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, ClusterManagerRef: corev1.ObjectReference{ Name: clusterManagerRef, @@ -601,7 +610,7 @@ func newOperator(name, ns, account, operatorImageAndTag, splunkEnterpriseImageAn } // newStandaloneWithLM creates and initializes CR for Standalone Kind with License Manager -func newStandaloneWithLM(name, ns string, licenseManagerName string) *enterpriseApi.Standalone { +func newStandaloneWithLM(name, ns, licenseManagerName, splunkImage string) *enterpriseApi.Standalone { licenseMasterRef, licenseManagerRef := swapLicenseManager(name, licenseManagerName) @@ -619,6 +628,7 @@ func newStandaloneWithLM(name, ns string, licenseManagerName string) *enterprise CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, LicenseManagerRef: corev1.ObjectReference{ Name: licenseManagerRef, @@ -670,7 +680,7 @@ func newStandaloneWithSpec(name, ns string, spec enterpriseApi.StandaloneSpec) * } // newMonitoringConsoleSpec returns MC Spec with given name, namespace and license manager Ref -func newMonitoringConsoleSpec(name string, ns string, LicenseManagerRef string) *enterpriseApi.MonitoringConsole { +func newMonitoringConsoleSpec(name, ns, LicenseManagerRef, splunkImage string) *enterpriseApi.MonitoringConsole { licenseMasterRef, licenseManagerRef := swapLicenseManager(name, LicenseManagerRef) @@ -688,6 +698,7 @@ func newMonitoringConsoleSpec(name string, ns string, LicenseManagerRef string) CommonSplunkSpec: enterpriseApi.CommonSplunkSpec{ Spec: enterpriseApi.Spec{ ImagePullPolicy: "Always", + Image: splunkImage, }, LicenseManagerRef: corev1.ObjectReference{ Name: licenseManagerRef,