Skip to content

Commit f523300

Browse files
authored
remove additional ubi config (#7104)
1 parent c558320 commit f523300

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

.github/scripts/copy-images.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ TARGET_NAP_WAFV5_IMAGE_PREFIX=${TARGET_NAP_WAFV5_IMAGE_PREFIX:-"nginx-ic-nap-v5/
4646
TARGET_NAP_DOS_IMAGE_PREFIX=${TARGET_NAP_DOS_IMAGE_PREFIX:-"nginx-ic-dos/nginx-plus-ingress"}
4747
TARGET_NAP_WAF_DOS_IMAGE_PREFIX=${TARGET_NAP_WAF_DOS_IMAGE_PREFIX:-"nginx-ic-dos-nap/nginx-plus-ingress"}
4848

49-
declare -a OSS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine")
50-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips")
51-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-alpine-fips")
52-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-alpine-fips")
53-
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
54-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
49+
declare -a OSS_TAG_POSTFIX_LIST=("" "-alpine")
50+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips")
51+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips")
52+
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips")
53+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("")
54+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("")
5555

5656
CONFIG_PATH=${CONFIG_PATH:-~/.nic-release/config}
5757
if [ -f "$CONFIG_PATH" ]; then

.github/workflows/release.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -294,14 +294,14 @@ jobs:
294294
with:
295295
ref: ${{ inputs.release_branch }}
296296

297-
- name: Certify UBI OSS images in quay
298-
uses: ./.github/actions/certify-openshift-image
299-
continue-on-error: true
300-
with:
301-
image: quay.io/nginx/nginx-ingress:${{ inputs.nic_version }}-ubi
302-
project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }}
303-
pyxis_token: ${{ secrets.PYXIS_API_TOKEN }}
304-
preflight_version: 1.11.1
297+
# - name: Certify UBI OSS images in quay
298+
# uses: ./.github/actions/certify-openshift-image
299+
# continue-on-error: true
300+
# with:
301+
# image: quay.io/nginx/nginx-ingress:${{ inputs.nic_version }}-ubi
302+
# project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }}
303+
# pyxis_token: ${{ secrets.PYXIS_API_TOKEN }}
304+
# preflight_version: 1.11.1
305305

306306
operator:
307307
if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'operator') && !contains(inputs.skip_step, 'publish-helm-chart') }}
@@ -621,7 +621,7 @@ jobs:
621621
strategy:
622622
fail-fast: false
623623
matrix:
624-
image: ["nginx/nginx-ingress:${{ inputs.nic_version }}", "nginx/nginx-ingress:${{ inputs.nic_version }}-ubi", "nginx/nginx-ingress:${{ inputs.nic_version }}-alpine"]
624+
image: ["nginx/nginx-ingress:${{ inputs.nic_version }}", "nginx/nginx-ingress:${{ inputs.nic_version }}-alpine"]
625625
steps:
626626
- name: Checkout Repository
627627
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/update-docker-images.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,12 @@ jobs:
177177
- name: Checkout Repository
178178
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
179179

180-
- name: Certify UBI OSS images in quay
181-
uses: ./.github/actions/certify-openshift-image
182-
with:
183-
image: quay.io/nginx/nginx-ingress:${{ needs.variables.outputs.tag }}-ubi
184-
project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }}
185-
pyxis_token: ${{ secrets.PYXIS_API_TOKEN }}
186-
platforms: ""
187-
preflight_version: 1.11.1
188-
submit: ${{ ! inputs.dry_run || true }}
180+
# - name: Certify UBI OSS images in quay
181+
# uses: ./.github/actions/certify-openshift-image
182+
# with:
183+
# image: quay.io/nginx/nginx-ingress:${{ needs.variables.outputs.tag }}-ubi
184+
# project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }}
185+
# pyxis_token: ${{ secrets.PYXIS_API_TOKEN }}
186+
# platforms: ""
187+
# preflight_version: 1.11.1
188+
# submit: ${{ ! inputs.dry_run || true }}

0 commit comments

Comments
 (0)