Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release pipeline fixes #5863

Merged
merged 5 commits into from
Jun 26, 2024
Merged

release pipeline fixes #5863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0c681d
add v prefix to milestone version
pdabelf5 Jun 26, 2024
582a277
remove string validation for boolean input
pdabelf5 Jun 26, 2024
e6ab896
don't publish wafv5 to marketplace
pdabelf5 Jun 26, 2024
b5338d1
correct syntax on cnab trigger
pdabelf5 Jun 26, 2024
2de3ab7
Merge branch 'release-3.6' into milestone-version
pdabelf5 Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/config/config-plus-azure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export TARGET_NAP_WAF_DOS_IMAGE_PREFIX="marketplaceimages/nginx-plus-ingress-nap
declare -a PLUS_TAG_POSTFIX_LIST=("")
declare -a NAP_WAF_TAG_POSTFIX_LIST=("")
declare -a NAP_DOS_TAG_POSTFIX_LIST=("")
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=()
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("")
declare -a ADDITIONAL_TAGS=()
export PUBLISH_OSS=false
9 changes: 5 additions & 4 deletions .github/config/config-plus-ecr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ export TARGET_PLUS_IMAGE_PREFIX=nginx/nginx-plus-ingress
export TARGET_NAP_WAF_IMAGE_PREFIX=nginx/nginx-plus-ingress-nap
export TARGET_NAP_DOS_IMAGE_PREFIX=nginx/nginx-plus-ingress-dos
export TARGET_NAP_WAF_DOS_IMAGE_PREFIX=nginx/nginx-plus-ingress-dos-nap
declare -a PLUS_TAG_POSTFIX_LIST=("-mktpl" "-alpine-mktpl" "-alpine-mktpl-fips")
declare -a NAP_WAF_TAG_POSTFIX_LIST=("-mktpl" "-ubi-mktpl")
declare -a NAP_DOS_TAG_POSTFIX_LIST=("-mktpl" "-ubi-mktpl")
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("-mktpl" "-ubi-mktpl")
declare -a PLUS_TAG_POSTFIX_LIST=("-mktpl")
declare -a NAP_WAF_TAG_POSTFIX_LIST=("-mktpl")
declare -a NAP_DOS_TAG_POSTFIX_LIST=("-mktpl")
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=()
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("-mktpl")
declare -a ADDITIONAL_TAGS=()
export PUBLISH_OSS=false
3 changes: 2 additions & 1 deletion .github/config/config-plus-gcr-public
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ export TARGET_NAP_WAF_IMAGE_PREFIX=nginxinc/nginx-plus-ingress-nap
export TARGET_NAP_DOS_IMAGE_PREFIX=nginxinc/nginx-plus-ingress-dos
declare -a PLUS_TAG_POSTFIX_LIST=("")
declare -a NAP_WAF_TAG_POSTFIX_LIST=("")
declare -a NAP_DOS_TAG_POSTFIX_LIST=("")
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=()
declare -a NAP_DOS_TAG_POSTFIX_LIST=()
declare -a ADDITIONAL_TAGS=(${ADDITIONAL_TAG})
4 changes: 2 additions & 2 deletions .github/workflows/publish-helm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
fetch-depth: 1
token: ${{ secrets.NGINX_PAT }}
path: helm-charts
if: ${{ inputs.nginx_helm_repo == 'true' }}
if: ${{ inputs.nginx_helm_repo }}

- name: Push Helm Chart to Helm Charts Repository
run: |
Expand All @@ -106,4 +106,4 @@ jobs:
git -c user.name='NGINX Kubernetes Team' -c user.email='kubernetes@nginx.com' \
commit -m "NGINX Ingress Controller - Release ${{ inputs.chart_version }}"
git push -u origin master
if: ${{ inputs.nginx_helm_repo == 'true' }}
if: ${{ inputs.nginx_helm_repo }}
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ jobs:
workflow_id: 'build-cnab.yml',
ref: 'main',
inputs: {
chart_version: '${{ inputs.chart_version }}'
ic_version: '${{ inputs.nic_version }}'
chart_version: '${{ inputs.chart_version }}',
ic_version: '${{ inputs.nic_version }}',
cnab_version: '${{ inputs.cnab_version }}'
},
})
Expand Down Expand Up @@ -419,7 +419,7 @@ jobs:
milestone_number=$(gh api \
-H "Accept: application/vnd.github.v3+json" \
/repos/${{ github.repository }}/milestones \
| jq --arg version ${{ inputs.nic_version }} -r \
| jq --arg version "v${{ inputs.nic_version }}" -r \
'.[] | select(.title == $version) | .number')
if ! ${{ inputs.dry_run }}; then
gh api --method PATCH -H "Accept: application/vnd.github.v3+json" \
Expand Down