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",

0 commit comments

Comments
 (0)