Skip to content

Commit 5cb11a9

Browse files
nginx-botnginx-bot
authored
[cherry-pick] Update from nginxinc to nginx (#7133)
* Update from nginxinc to nginx (#7103) * remove unused imports in release branch * remove ubi images from CI (#7093) * remove additional ubi config (#7104)
1 parent 38aad08 commit 5cb11a9

File tree

245 files changed

+1662
-1757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+1662
-1757
lines changed

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ contact_links:
44
url: https://docs.nginx.com/nginx-ingress-controller
55
about: Check out our documentation.
66
- name: General inquiries
7-
url: https://github.com/nginxinc/kubernetes-ingress/discussions
7+
url: https://github.com/nginx/kubernetes-ingress/discussions
88
about: Please use Discussions for all other questions.

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ that issue here in this description (not in the title of the PR).
77

88
Before creating a PR, run through this checklist and mark each as complete.
99

10-
- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/kubernetes-ingress/blob/main/CONTRIBUTING.md) doc
10+
- [ ] I have read the [CONTRIBUTING](https://github.com/nginx/kubernetes-ingress/blob/main/CONTRIBUTING.md) doc
1111
- [ ] I have added tests that prove my fix is effective or that my feature works
1212
- [ ] I have checked that all unit tests pass after adding my changes
1313
- [ ] I have updated necessary documentation

‎.github/config/config-gcr-retag

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev
2-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl" "-alpine-fips")
4-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
5-
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
2+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips" "-mktpl")
3+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-mktpl" "-alpine-fips")
4+
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips")
5+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
6+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
77
declare -a ADDITIONAL_TAGS=()

‎.github/config/config-oss-github

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export TARGET_REGISTRY=ghcr.io
2-
export TARGET_OSS_IMAGE_PREFIX="nginxinc/kubernetes-ingress"
2+
export TARGET_OSS_IMAGE_PREFIX="nginx/kubernetes-ingress"
33
export PUBLISH_PLUS=false
44
export PUBLISH_WAF=false
55
export PUBLISH_DOS=false

‎.github/config/config-plus-gcr-release

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release
2-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips" "-mktpl")
4-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-alpine-fips" "-ubi8")
5-
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
2+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips" "-mktpl")
3+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips" "-mktpl")
4+
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips")
5+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
6+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
77
declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}")
88
export PUBLISH_OSS=false

‎.github/config/config-plus-nginx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export TARGET_REGISTRY=docker-mgmt.nginx.com
22
export TARGET_NAP_WAF_DOS_IMAGE_PREFIX="nginx-ic-nap-dos/nginx-plus-ingress"
3-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips")
4-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
5-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
6-
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
7-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
3+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips")
4+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips")
5+
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips")
6+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("")
7+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("")
88
export PUBLISH_OSS=false

‎.github/data/matrix-images-nap.json

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,6 @@
1515
"waf,dos"
1616
],
1717
"include": [
18-
{
19-
"image": "ubi-8-plus-nap",
20-
"target": "goreleaser",
21-
"platforms": "linux/amd64",
22-
"nap_modules": "waf"
23-
},
24-
{
25-
"image": "ubi-8-plus-nap-v5",
26-
"target": "goreleaser",
27-
"platforms": "linux/amd64",
28-
"nap_modules": "waf"
29-
},
30-
{
31-
"image": "ubi-9-plus-nap",
32-
"target": "goreleaser",
33-
"platforms": "linux/amd64",
34-
"nap_modules": "waf"
35-
},
36-
{
37-
"image": "ubi-9-plus-nap",
38-
"target": "goreleaser",
39-
"platforms": "linux/amd64",
40-
"nap_modules": "dos"
41-
},
42-
{
43-
"image": "ubi-9-plus-nap",
44-
"target": "goreleaser",
45-
"platforms": "linux/amd64",
46-
"nap_modules": "waf,dos"
47-
},
4818
{
4919
"image": "alpine-plus-nap-fips",
5020
"target": "goreleaser",
@@ -62,12 +32,6 @@
6232
"target": "goreleaser",
6333
"platforms": "linux/amd64",
6434
"nap_modules": "waf"
65-
},
66-
{
67-
"image": "ubi-9-plus-nap-v5",
68-
"target": "goreleaser",
69-
"platforms": "linux/amd64",
70-
"nap_modules": "waf"
7135
}
7236
]
7337
}

‎.github/data/matrix-images-oss.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,5 @@
55
],
66
"platforms": [
77
"linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
8-
],
9-
"include": [
10-
{
11-
"image": "ubi",
12-
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
13-
}
148
]
159
}

‎.github/data/matrix-images-plus.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
"image": "debian-plus",
1616
"platforms": "linux/arm64, linux/amd64",
1717
"target": "aws"
18-
},
19-
{
20-
"image": "ubi-9-plus",
21-
"platforms": "linux/arm64, linux/amd64",
22-
"target": "goreleaser"
2318
}
2419
]
2520
}

‎.github/data/matrix-smoke-nap.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"images": [
33
{
44
"label": "AP_WAF 1/4",
5-
"image": "ubi-8-plus-nap",
5+
"image": "debian-plus-nap",
66
"type": "plus",
77
"nap_modules": "waf",
88
"marker": "appprotect_waf_policies_allow",
99
"platforms": "linux/amd64"
1010
},
1111
{
1212
"label": "AP_WAF 2/4",
13-
"image": "ubi-9-plus-nap",
13+
"image": "debian-plus-nap",
1414
"type": "plus",
1515
"nap_modules": "waf",
1616
"marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow and not appprotect_waf_policies_vsr'",
@@ -58,7 +58,7 @@
5858
},
5959
{
6060
"label": "AP_DOS 3/3",
61-
"image": "ubi-9-plus-nap",
61+
"image": "debian-plus-nap",
6262
"type": "plus",
6363
"nap_modules": "dos",
6464
"marker": "dos_learning",

‎.github/data/matrix-smoke-oss.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
},
7373
{
7474
"label": "TS",
75-
"image": "ubi",
75+
"image": "debian",
7676
"type": "oss",
7777
"marker": "ts",
7878
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"

‎.github/data/matrix-smoke-plus.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
},
6666
{
6767
"label": "policies 1/2",
68-
"image": "ubi-9-plus",
68+
"image": "alpine-plus",
6969
"type": "plus",
7070
"marker": "'policies and not policies_ac and not policies_jwt and not policies_mtls'",
7171
"platforms": "linux/arm64, linux/amd64, linux/s390x"
7272
},
7373
{
7474
"label": "policies 2/2",
75-
"image": "ubi-9-plus",
75+
"image": "debian-plus",
7676
"type": "plus",
7777
"marker": "'policies_ac or policies_jwt or policies_mtls'",
7878
"platforms": "linux/arm64, linux/amd64, linux/s390x"

‎.github/data/patch-images.json

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
1212
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
1313
},
14-
{
15-
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-ingress",
16-
"source_os": "ubi",
17-
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress",
18-
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
19-
},
2014
{
2115
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
2216
"source_os": "debian",
@@ -41,12 +35,6 @@
4135
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
4236
"platforms": "linux/arm64, linux/amd64"
4337
},
44-
{
45-
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
46-
"source_os": "ubi",
47-
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
48-
"platforms": "linux/arm64, linux/amd64"
49-
},
5038
{
5139
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
5240
"source_os": "debian",
@@ -59,18 +47,6 @@
5947
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
6048
"platforms": "linux/amd64"
6149
},
62-
{
63-
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
64-
"source_os": "ubi",
65-
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
66-
"platforms": "linux/amd64"
67-
},
68-
{
69-
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
70-
"source_os": "ubi8",
71-
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
72-
"platforms": "linux/amd64"
73-
},
7450
{
7551
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
7652
"source_os": "alpine-fips",
@@ -83,18 +59,6 @@
8359
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
8460
"platforms": "linux/amd64"
8561
},
86-
{
87-
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
88-
"source_os": "ubi",
89-
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
90-
"platforms": "linux/amd64"
91-
},
92-
{
93-
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
94-
"source_os": "ubi8",
95-
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
96-
"platforms": "linux/amd64"
97-
},
9862
{
9963
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
10064
"source_os": "alpine-fips",
@@ -113,12 +77,6 @@
11377
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
11478
"platforms": "linux/amd64"
11579
},
116-
{
117-
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
118-
"source_os": "ubi",
119-
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress",
120-
"platforms": "linux/amd64"
121-
},
12280
{
12381
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
12482
"source_os": "debian",
@@ -130,11 +88,5 @@
13088
"source_os": "mktpl",
13189
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
13290
"platforms": "linux/amd64"
133-
},
134-
{
135-
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress",
136-
"source_os": "ubi",
137-
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress",
138-
"platforms": "linux/amd64"
13991
}
14092
]

‎.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/build-oss.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
type=raw,value=${{ inputs.tag }}
8888
labels: |
8989
org.opencontainers.image.description=NGINX Ingress Controller for Kubernetes
90-
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/main/README.md
90+
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/nginx/kubernetes-ingress/main/README.md
9191
io.artifacthub.package.logo-url=https://docs.nginx.com/nginx-ingress-controller/images/icons/NGINX-Ingress-Controller-product-icon.svg
9292
io.artifacthub.package.maintainers=[{"name":"NGINX Inc","email":"[email protected]"}]
9393
io.artifacthub.package.license=Apache-2.0

‎.github/workflows/build-ot-dependency.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
7373
with:
7474
images: |
75-
name=ghcr.io/nginxinc/dependencies/nginx-ot,enable=true
75+
name=ghcr.io/nginx/dependencies/nginx-ot,enable=true
7676
flavor: suffix=${{ matrix.os != 'debian' && format('-{0}', matrix.os) || '' }},onlatest=true
7777
tags: |
7878
type=raw,value=nginx-${{ steps.var.outputs.nginx_version }},enable=true

‎.github/workflows/build-ubi-dependency.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
default: false
2020

2121
env:
22-
IMAGE_NAME: ghcr.io/nginxinc/dependencies/nginx-ubi-ppc64le
22+
IMAGE_NAME: ghcr.io/nginx/dependencies/nginx-ubi-ppc64le
2323

2424
concurrency:
2525
group: ${{ github.ref_name }}-ubi-ppc64le-build

‎.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
source .github/data/version.txt
101101
echo "ic_version=${IC_VERSION}" >> $GITHUB_OUTPUT
102102
echo "chart_version=${HELM_CHART_VERSION}" >> $GITHUB_OUTPUT
103-
echo "forked_workflow=${{ (github.event.pull_request && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) || github.repository != 'nginxinc/kubernetes-ingress' }}" >> $GITHUB_OUTPUT
103+
echo "forked_workflow=${{ (github.event.pull_request && github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) || github.repository != 'nginx/kubernetes-ingress' }}" >> $GITHUB_OUTPUT
104104
./.github/scripts/variables.sh go_code_md5 >> $GITHUB_OUTPUT
105105
./.github/scripts/variables.sh docker_md5 >> $GITHUB_OUTPUT
106106
./.github/scripts/variables.sh build_tag >> $GITHUB_OUTPUT
@@ -192,9 +192,9 @@ jobs:
192192

193193
- name: Check if Codegen changed
194194
run: |
195-
cd ../.. && mkdir -p github.com/nginxinc && mv kubernetes-ingress/kubernetes-ingress github.com/nginxinc/ && cd github.com/nginxinc/kubernetes-ingress
195+
cd ../.. && mkdir -p github.com/nginx && mv kubernetes-ingress/kubernetes-ingress github.com/nginx/ && cd github.com/nginx/kubernetes-ingress
196196
make update-codegen && git diff --name-only --exit-code pkg/**
197-
cd ../../.. && mv github.com/nginxinc/kubernetes-ingress kubernetes-ingress/kubernetes-ingress
197+
cd ../../.. && mv github.com/nginx/kubernetes-ingress kubernetes-ingress/kubernetes-ingress
198198
199199
- name: Install gofumpt
200200
run: go install mvdan.cc/gofumpt@latest

‎.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
- name: "Dependency Review"
2727
uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
2828
with:
29-
config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"
29+
config-file: "nginx/k8s-common/dependency-review-config.yml@main"
3030
base-ref: ${{ github.event.pull_request.base.sha || github.event.repository.default_branch }}
3131
head-ref: ${{ github.event.pull_request.base.sha || github.ref }}

‎.github/workflows/image-promotion.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,13 +680,13 @@ jobs:
680680
helm-chart=${{ needs.checks.outputs.chart_version }}
681681
notes-footer: |
682682
## Upgrade
683-
- For NGINX, use the {{version}} images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress).
683+
- For NGINX, use the {{version}} images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress).
684684
- For NGINX Plus, use the {{version}} images from the F5 Container registry, the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE), the [GCP Marketplace](https://console.cloud.google.com/marketplace/browse?filter=partner:F5,%20Inc.&filter=solution-type:k8s&filter=category:networking), [Azure Marketplace](https://azuremarketplace.microsoft.com/en-gb/marketplace/apps/category/containers?page=1&search=f5&subcategories=container-apps) or build your own image using the {{version}} source code.
685685
- For Helm, use version {{helm-chart}} of the chart.
686686
687687
## Resources
688688
- Documentation -- https://docs.nginx.com/nginx-ingress-controller/
689-
- Configuration examples -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/examples
690-
- Helm Chart -- https://github.com/nginxinc/kubernetes-ingress/tree/{{version}}/deployments/helm-chart
689+
- Configuration examples -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/examples
690+
- Helm Chart -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/deployments/helm-chart
691691
- Operator -- https://github.com/nginxinc/nginx-ingress-helm-operator
692692
if: ${{ github.event_name == 'push' && contains(github.ref_name, 'release-') }}

‎.github/workflows/issues.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
id: controller
2121
if: contains(github.event.issue.body, 'nginx.ingress.kubernetes.io')
2222
run: |
23-
text="\n\n I\'ve parsed the text of your issue and it looks like you might be mixing up the two Ingress Controllers, please take a look at this [page](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-ingress-controllers) to see the differences between \`nginxinc/kubernetes-ingress\` (this repo) and \`kubernetes/ingress-nginx\`."
23+
text="\n\n I\'ve parsed the text of your issue and it looks like you might be mixing up the two Ingress Controllers, please take a look at this [page](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-ingress-controllers) to see the differences between \`nginx/kubernetes-ingress\` (this repo) and \`kubernetes/ingress-nginx\`."
2424
echo "text=$text" >> $GITHUB_OUTPUT
2525
2626
- name: Check if Issue author is Org member
@@ -53,5 +53,5 @@ jobs:
5353
issue_number: context.issue.number,
5454
owner: context.repo.owner,
5555
repo: context.repo.repo,
56-
body: 'Hi @${{github.event.issue.user.login}} thanks for reporting! \n\n Be sure to check out the [docs](https://docs.nginx.com/nginx-ingress-controller) and the [Contributing Guidelines](https://github.com/nginxinc/kubernetes-ingress/blob/main/CONTRIBUTING.md) while you wait for a human to take a look at this :slightly_smiling_face:${{ steps.controller.outputs.text }}\n\n Cheers!'
56+
body: 'Hi @${{github.event.issue.user.login}} thanks for reporting! \n\n Be sure to check out the [docs](https://docs.nginx.com/nginx-ingress-controller) and the [Contributing Guidelines](https://github.com/nginx/kubernetes-ingress/blob/main/CONTRIBUTING.md) while you wait for a human to take a look at this :slightly_smiling_face:${{ steps.controller.outputs.text }}\n\n Cheers!'
5757
})

‎.github/workflows/publish-helm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
8686
- name: Push to OCI registries
8787
run: |
88-
helm push ${{ steps.package.outputs.path }} oci://ghcr.io/nginxinc/charts
88+
helm push ${{ steps.package.outputs.path }} oci://ghcr.io/nginx/charts
8989
helm push ${{ steps.package.outputs.path }} oci://registry-1.docker.io/nginxcharts
9090
9191
- name: Checkout Repository

0 commit comments

Comments
 (0)