8888 aws-access-key-id : ${{ secrets.AWS_ACCESS_KEY_ID }}
8989 aws-secret-access-key : ${{ secrets.AWS_SECRET_ACCESS_KEY }}
9090 aws-region : ${{ secrets.AWS_DEFAULT_REGION }}
91+ - name : Set Splunk Operator image
92+ run : |
93+ echo "SPLUNK_OPERATOR_IMAGE=${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA-distroless" >> $GITHUB_ENV
9194 - name : Login to Amazon ECR
9295 id : login-ecr
9396 uses : aws-actions/amazon-ecr-login@v1
@@ -96,11 +99,11 @@ jobs:
9699 export PLATFORMS=linux/arm64,linux/amd64
97100 export BASE_IMAGE=ubuntu
98101 export BASE_IMAGE_VERSION=24.10
99- export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA-distroless
102+ export IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}
100103 make docker-buildx PLATFORMS=$PLATFORMS BASE_IMAGE=$BASE_IMAGE BASE_IMAGE_VERSION=$BASE_IMAGE_VERSION IMG=$IMG
101104 - name : Sign Splunk Operator image with a key
102105 run : |
103- cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:${{ github.sha }}
106+ cosign sign --yes --key env://COSIGN_PRIVATE_KEY ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}
104107 env :
105108 COSIGN_PRIVATE_KEY : ${{ secrets.COSIGN_PRIVATE_KEY }}
106109 COSIGN_PASSWORD : ${{ secrets.COSIGN_PASSWORD }}
@@ -113,10 +116,10 @@ jobs:
113116 needs : build-operator-image-distroless
114117 env :
115118 SPLUNK_ENTERPRISE_IMAGE : ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }}
116- SPLUNK_OPERATOR_IMAGE_NAME : splunk/splunk-operator-distroless
119+ SPLUNK_OPERATOR_IMAGE_NAME : splunk/splunk-operator
117120 ECR_REPOSITORY : ${{ secrets.ECR_REPOSITORY }}
118121 S3_REGION : ${{ secrets.AWS_DEFAULT_REGION }}
119- IMAGE_NAME : ${{ secrets.ECR_REPOSITORY }}/splunk/splunk-operator-distroless :${{ github.sha }}
122+ IMAGE_NAME : ${{ secrets.ECR_REPOSITORY }}/splunk/splunk-operator:${{ github.sha }}-distroless
120123 steps :
121124 - name : Set up cosign
122125 uses : sigstore/cosign-installer@main
@@ -175,8 +178,8 @@ jobs:
175178 CLUSTER_WORKERS : 3
176179 SPLUNK_ENTERPRISE_IMAGE : ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }}
177180 SPLUNK_ENTERPRISE_RELEASE_IMAGE : ${{ secrets.SPLUNK_ENTERPRISE_IMAGE_ARM64 }}
178- SPLUNK_OPERATOR_IMAGE_NAME : splunk/splunk-operator-distroless
179- SPLUNK_OPERATOR_IMAGE_FILENAME : splunk-operator-distroless
181+ SPLUNK_OPERATOR_IMAGE_NAME : splunk/splunk-operator
182+ SPLUNK_OPERATOR_IMAGE_FILENAME : splunk-operator
180183 TEST_FOCUS : " ${{ matrix.test }}"
181184 # This regex matches any string not containing smoke keyword
182185 TEST_TO_SKIP : " ^(?:[^s]+|s(?:$|[^m]|m(?:$|[^o]|o(?:$|[^k]|k(?:$|[^e])))))*$"
0 commit comments