Skip to content

Commit cd469a0

Browse files
authored
remove gcr marketplace publish step (#5309)
1 parent 1cfb623 commit cd469a0

File tree

2 files changed

+0
-23
lines changed

2 files changed

+0
-23
lines changed

.github/workflows/build-plus.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ on:
3030
publish-aws-market-place:
3131
required: false
3232
type: boolean
33-
publish-gcp-market-place:
34-
required: false
35-
type: boolean
3633
publish-nginx-reqistry:
3734
required: false
3835
type: boolean
@@ -92,23 +89,6 @@ jobs:
9289
password: ${{ steps.auth.outputs.access_token }}
9390
if: ${{ inputs.publish-image || ! inputs.forked-workflow }}
9491

95-
- name: Authenticate to Google Cloud Marketplace
96-
id: auth-mktpl
97-
uses: google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c # v2.1.2
98-
with:
99-
token_format: access_token
100-
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY_MKTPL }}
101-
service_account: ${{ secrets.GCR_SERVICE_ACCOUNT_MKTPL }}
102-
if: ${{ inputs.publish-gcp-market-place }}
103-
104-
- name: Login to GCR for Marketplace
105-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
106-
with:
107-
registry: gcr.io
108-
username: oauth2accesstoken
109-
password: ${{ steps.auth-mktpl.outputs.access_token }}
110-
if: ${{ inputs.publish-gcp-market-place }}
111-
11292
- name: Configure AWS Credentials
11393
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
11494
with:
@@ -144,7 +124,6 @@ jobs:
144124
with:
145125
images: |
146126
name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}/nginx-plus-ingress
147-
name=gcr.io/f5-7626-networks-public/nginxinc/nginx-plus-ingress${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }},enable=${{ inputs.publish-gcp-market-place && ! contains(inputs.target, 'aws') && ! contains(inputs.image, 'alpine') && ! contains(inputs.image, 'ubi') }}
148127
name=docker-mgmt.nginx.com/nginx-ic${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}/nginx-plus-ingress,enable=${{ inputs.publish-nginx-reqistry && ! contains(inputs.target, 'aws') }}
149128
name=709825985650.dkr.ecr.us-east-1.amazonaws.com/nginx/nginx-plus-ingress${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }},enable=${{ inputs.publish-aws-market-place && contains(inputs.target, 'aws') }}
150129
flavor: |

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,6 @@ jobs:
609609
release-url: ${{ needs.release-notes.outputs.release-url }}
610610
publish-image: ${{ needs.checks.outputs.publish_images == 'true' }}
611611
publish-aws-market-place: ${{ github.ref_type == 'tag' && startsWith(github.ref, 'refs/heads/release-') && contains(matrix.target, 'aws') }}
612-
publish-gcp-market-place: ${{ github.ref_type == 'tag' && startsWith(github.ref, 'refs/heads/release-') && ! contains(matrix.target, 'aws') }}
613612
publish-nginx-reqistry: ${{ needs.checks.outputs.publish_images == 'true' && ! contains(matrix.target, 'aws') }}
614613
forked-workflow: ${{ needs.checks.outputs.forked_workflow == 'true' }}
615614
permissions:
@@ -668,7 +667,6 @@ jobs:
668667
release-url: ${{ needs.release-notes.outputs.release-url }}
669668
publish-image: ${{ needs.checks.outputs.publish_images == 'true' }}
670669
publish-aws-market-place: ${{ github.ref_type == 'tag' && startsWith(github.ref, 'refs/heads/release-') && contains(matrix.target, 'aws') }}
671-
publish-gcp-market-place: ${{ github.ref_type == 'tag' && startsWith(github.ref, 'refs/heads/release-') && ! contains(matrix.target, 'aws') }}
672670
publish-nginx-reqistry: ${{ needs.checks.outputs.publish_images == 'true' && ! contains(matrix.target, 'aws') }}
673671
forked-workflow: ${{ needs.checks.outputs.forked_workflow == 'true' }}
674672
permissions:

0 commit comments

Comments
 (0)