From ada76d566b7bc359476aecad185349cac7a6ff52 Mon Sep 17 00:00:00 2001 From: rlieberman-splunk Date: Wed, 5 Feb 2025 07:44:57 -0600 Subject: [PATCH 1/3] Move pushing latest image from build test workflow to automated release workflow (#1434) --- .../workflows/automated-release-workflow.yml | 2 ++ .../workflows/build-test-push-workflow.yml | 33 ------------------- .../distroless-build-test-push-workflow.yml | 33 ------------------- 3 files changed, 2 insertions(+), 66 deletions(-) diff --git a/.github/workflows/automated-release-workflow.yml b/.github/workflows/automated-release-workflow.yml index 280cd4a52..a2425a711 100644 --- a/.github/workflows/automated-release-workflow.yml +++ b/.github/workflows/automated-release-workflow.yml @@ -87,10 +87,12 @@ jobs: - name: Promote RC Image to Release run: | docker tag splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }} + docker tag splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }} splunk/splunk-operator:latest - name: Push Release Image run: | docker push splunk/splunk-operator:${{ github.event.inputs.operator_image_tag }} + docker push splunk/splunk-operator:latest - name: Sign Splunk Operator image with a key run: | diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml index 4c5cc8095..6b841816f 100644 --- a/.github/workflows/build-test-push-workflow.yml +++ b/.github/workflows/build-test-push-workflow.yml @@ -303,36 +303,3 @@ jobs: # 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 - push-latest: - needs: smoke-tests - if: github.ref == 'refs/heads/main' - runs-on: ubuntu-latest - env: - SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator - TAG: latest - steps: - - name: Checkout Code - uses: actions/checkout@v2 - - name: Dotenv Action - id: dotenv - uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - 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_PUSH_TOKEN}} - - 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 - uses: aws-actions/amazon-ecr-login@v1 - - name: Re-tag Splunk Operator Image - run: | - docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.TAG }} - - name: Push Splunk Operator Image to Docker Hub - run: docker push ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.TAG }} \ No newline at end of file diff --git a/.github/workflows/distroless-build-test-push-workflow.yml b/.github/workflows/distroless-build-test-push-workflow.yml index 9f659df44..0769db45a 100644 --- a/.github/workflows/distroless-build-test-push-workflow.yml +++ b/.github/workflows/distroless-build-test-push-workflow.yml @@ -301,36 +301,3 @@ jobs: # 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 - push-latest: - needs: smoke-tests - if: github.ref == 'refs/heads/main' - runs-on: ubuntu-latest - env: - SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator - TAG: latest - steps: - - name: Checkout Code - uses: actions/checkout@v2 - - name: Dotenv Action - id: dotenv - uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - - 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_PUSH_TOKEN}} - - 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 - uses: aws-actions/amazon-ecr-login@v1 - - name: Re-tag Splunk Operator Image - run: | - docker tag ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA-distroless ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.TAG }}-distroless - - name: Push Splunk Operator Image to Docker Hub - run: docker push ${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ env.TAG }} From 2be11ffe9702c19d97e6325207abbb031524f054 Mon Sep 17 00:00:00 2001 From: kasiakoziol Date: Thu, 8 May 2025 16:58:10 +0200 Subject: [PATCH 2/3] Update Changelog to remove unnecessary information --- docs/ChangeLog.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md index e0d5ef2d1..f6956780d 100644 --- a/docs/ChangeLog.md +++ b/docs/ChangeLog.md @@ -10,7 +10,7 @@ * CSPL-3673 - Github Issue #1157: Failed to install the operator - CRD metadata.annotations too long -* CSPL-3590 - DUE April 24: Vulnerability Fix: github.com/golang-jwt/jwt/v5, golang.org/x/net +* CSPL-3590 - Vulnerability Fix: github.com/golang-jwt/jwt/v5, golang.org/x/net * CSPL-3674 - Github Readme Updates @@ -18,7 +18,7 @@ * CSPL-3499 - Fix Segmentation Fault in Splunk Operator Due to App Volume Name Change -* CSPL-3547 - Support Amazon Agamotto Appframework migration to manager-app +* CSPL-3547 - Support Appframework migration to manager-app * CSPL-3529 - Disable ARM AL2023 tests for develop builds @@ -30,9 +30,9 @@ * CSPL-3518 - Task for Github Issue #1211 Splunk Operator: Why force ClusterIP and ignore k8s default field in service template -* CSPL-3460 - DUE APRIL 5: Container Scan: Upgrade google.golang.org/grpc from v1.49.0 to 1.58.3, 1.57.1, 1.56.3 for splunk/splunk-operator +* CSPL-3460 - Container Scan: Upgrade google.golang.org/grpc from v1.49.0 to 1.58.3, 1.57.1, 1.56.3 for splunk/splunk-operator -* CSPL-3435 - Support Amazon Agomotto team with Migration (Bias language migration) +* CSPL-3435 - Support with Bias language migration * CSPL-3434 - Update base image to ubi-minimal From 510e771b8da3c21fbd088cfa27fa030f0c237aa8 Mon Sep 17 00:00:00 2001 From: kasiakoziol Date: Thu, 8 May 2025 17:00:52 +0200 Subject: [PATCH 3/3] Update docs --- docs/Images.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Images.md b/docs/Images.md index 1563d00c1..7ef97bd51 100644 --- a/docs/Images.md +++ b/docs/Images.md @@ -5,7 +5,7 @@ The Splunk Operator requires these docker images to be present or available to y * `splunk/splunk-operator`: The Splunk Operator image built by this repository or the [official release](https://hub.docker.com/r/splunk/splunk-operator) * `splunk/splunk:`: The [Splunk Enterprise image](https://github.com/splunk/docker-splunk) -All of these images are publicly available, and published on [Docker Hub](https://hub.docker.com/). Starting with release 2.7.2, the base image for the released image is registry.access.redhat.com/ubi8/ubi-minimal, which minimizes security risks and reduces unneeded packages in the image. A released image based on the distroless base image is also available under the `-distroless` suffix tag on Docker Hub. +All of these images are publicly available, and published on [Docker Hub](https://hub.docker.com/). Starting with release 2.8.0, the base image for the released image is registry.access.redhat.com/ubi8/ubi-minimal, which minimizes security risks and reduces unneeded packages in the image. A released image based on the distroless base image is also available under the `-distroless` suffix tag on Docker Hub. If your cluster does not have access to pull directly from Docker Hub, you will need to manually download and push these images to an accessible registry. You will also need to specify the location of these images by using an environment variable passed to the Operator, or by adding additional `spec` parameters to your custom resource definition.