Skip to content

Commit 1e35bee

Browse files
pdabelf5pdabelf5
authored
Merge branch 'main' into 7583-fix-service-insight
2 parents 9cf2d18 + 291b566 commit 1e35bee

File tree

339 files changed

+15309
-20253
lines changed

Some content is hidden

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

339 files changed

+15309
-20253
lines changed

‎.codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ coverage:
1414
ignore:
1515
- "pkg/client"
1616
- "**/*generated*.go"
17+
- "hack"

‎.fossa.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ targets:
44
- type: setuptools
55
paths:
66
exclude:
7-
- site

‎.github/actions/certify-openshift-image/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ inputs:
1818
platforms:
1919
description: A comma separated list of architectures in the image manifest to certify
2020
required: false
21-
default: "amd64,arm64,ppc64le,s390x"
21+
default: "amd64,arm64"
2222
submit:
2323
description: Submit results to Redhat PYAXIS
2424
required: false

‎.github/config/config-gcr-retag

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
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")
2+
## Disable AWS Marketplace tags
3+
# declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
4+
# declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl" "-alpine-fips")
5+
# declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6+
# declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
7+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips")
8+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
49
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")
10+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
11+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
712
declare -a ADDITIONAL_TAGS=()

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
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")
2+
## Disable AWS Marketplace tags
3+
# declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
4+
# declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips" "-mktpl")
5+
# declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6+
# declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
7+
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips")
8+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
49
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")
10+
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
11+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
712
declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}")
813
export PUBLISH_OSS=false

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"linux/amd64"
77
],
88
"target": [
9-
"goreleaser",
10-
"aws"
9+
"goreleaser"
1110
],
1211
"nap_modules": [
1312
"dos",

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
"goreleaser"
1212
],
1313
"include": [
14-
{
15-
"image": "debian-plus",
16-
"platforms": "linux/arm64, linux/amd64",
17-
"target": "aws"
18-
},
1914
{
2015
"image": "ubi-9-plus",
2116
"platforms": "linux/arm64, linux/amd64",

‎.github/data/matrix-regression.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"label": "regression",
1313
"image": "debian-plus",
1414
"type": "plus",
15-
"marker": "'not upgrade and not agent'",
15+
"marker": "'not upgrade and not agentv2'",
1616
"platforms": "linux/arm64, linux/amd64"
1717
},
1818
{
1919
"label": "regression",
2020
"image": "debian-plus-nap",
2121
"type": "plus",
2222
"nap_modules": "waf",
23-
"marker": "'appprotect or agent'",
23+
"marker": "'appprotect or agentv2'",
2424
"platforms": "linux/arm64, linux/amd64"
2525
},
2626
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"image": "ubi-8-plus-nap",
66
"type": "plus",
77
"nap_modules": "waf",
8-
"marker": "appprotect_waf_policies_allow",
8+
"marker": "'appprotect_waf_policies_allow or otel'",
99
"platforms": "linux/amd64"
1010
},
1111
{
@@ -21,23 +21,23 @@
2121
"image": "alpine-plus-nap-fips",
2222
"type": "plus",
2323
"nap_modules": "waf",
24-
"marker": "appprotect_waf_policies_grpc",
24+
"marker": "'appprotect_waf_policies_grpc or otel'",
2525
"platforms": "linux/amd64"
2626
},
2727
{
2828
"label": "AP_WAF 4/4",
2929
"image": "debian-plus-nap",
3030
"type": "plus",
3131
"nap_modules": "waf",
32-
"marker": "'appprotect_watch or appprotect_batch or appprotect_integration or appprotect_waf_policies_vsr'",
32+
"marker": "'appprotect_watch or appprotect_batch or appprotect_integration or appprotect_waf_policies_vsr or otel'",
3333
"platforms": "linux/amd64"
3434
},
3535
{
3636
"label": "AP_WAF_V5 1/1",
3737
"image": "debian-plus-nap-v5",
3838
"type": "plus",
3939
"nap_modules": "waf",
40-
"marker": "appprotect_waf_v5",
40+
"marker": "'appprotect_waf_v5 or otel'",
4141
"platforms": "linux/amd64"
4242
},
4343
{
@@ -61,7 +61,7 @@
6161
"image": "ubi-9-plus-nap",
6262
"type": "plus",
6363
"nap_modules": "dos",
64-
"marker": "dos_learning",
64+
"marker": "'dos_learning or otel'",
6565
"platforms": "linux/amd64"
6666
},
6767
{

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

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,77 +5,84 @@
55
"image": "debian",
66
"type": "oss",
77
"marker": "'ingresses and not annotations and not basic_auth and not hsts and not watch_namespace and not wildcard_tls'",
8-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
8+
"platforms": "linux/arm64, linux/amd64"
99
},
1010
{
1111
"label": "ingresses 2/2",
1212
"image": "debian",
1313
"type": "oss",
1414
"marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'",
15-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
15+
"platforms": "linux/arm64, linux/amd64"
1616
},
1717
{
1818
"label": "VSR 1/3",
1919
"image": "alpine",
2020
"type": "oss",
2121
"marker": "'vsr and not vsr_upstream and not vsr_grpc and not vsr_status and not vsr_canary and not vsr_routing and not vsr_api and not vsr_redirects and not vsr_rewrite and not vsr_canned and not vsr_basic'",
22-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
22+
"platforms": "linux/arm64, linux/amd64"
2323
},
2424
{
2525
"label": "VSR 2/3",
2626
"image": "alpine",
2727
"type": "oss",
2828
"marker": "'vsr_basic or vsr_canned or vsr_rewrite or vsr_redirects or vsr_upstream'",
29-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
29+
"platforms": "linux/arm64, linux/amd64"
3030
},
3131
{
3232
"label": "VSR 3/3",
3333
"image": "alpine",
3434
"type": "oss",
3535
"marker": "'vsr_api or vsr_routing or vsr_canary or vsr_status or vsr_grpc'",
36-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
36+
"platforms": "linux/arm64, linux/amd64"
3737
},
3838
{
3939
"label": "policies 1/2",
4040
"image": "alpine",
4141
"type": "oss",
4242
"marker": "'policies and not policies_rl and not policies_ac and not policies_jwt and not policies_mtls'",
43-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
43+
"platforms": "linux/arm64, linux/amd64"
4444
},
4545
{
4646
"label": "policies 2/2",
4747
"image": "alpine",
4848
"type": "oss",
49-
"marker": "'policies_rl or policies_ac or policies_jwt or policies_mtls'",
50-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
49+
"marker": "'policies_rl or policies_ac or policies_jwt or policies_mtls or otel'",
50+
"platforms": "linux/arm64, linux/amd64"
5151
},
5252
{
5353
"label": "VS 1/3",
5454
"image": "debian",
5555
"type": "oss",
5656
"marker": "'vs and not vs_ipv6 and not vs_rewrite and not vs_responses and not vs_grpc and not vs_redirects and not vs_externalname and not vs_externaldns and not vs_certmanager and not vs_api and not vs_backup and not vs_use_cluster_ip and not vs_canary and not vs_upstream and not vs_config_map'",
57-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
57+
"platforms": "linux/arm64, linux/amd64"
5858
},
5959
{
6060
"label": "VS 2/3",
6161
"image": "debian",
6262
"type": "oss",
6363
"marker": "'vs_grpc or vs_redirects or vs_externalname or vs_externaldns or vs_api or vs_backup or vs_use_cluster_ip or vs_canary or vs_upstream or vs_config_map'",
64-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
64+
"platforms": "linux/arm64, linux/amd64"
6565
},
6666
{
6767
"label": "VS 3/3",
6868
"image": "debian",
6969
"type": "oss",
70-
"marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager'",
71-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
70+
"marker": "'vs_responses or vs_ipv6 or vs_rewrite or vs_certmanager or otel'",
71+
"platforms": "linux/arm64, linux/amd64"
7272
},
7373
{
7474
"label": "TS",
7575
"image": "ubi",
7676
"type": "oss",
77-
"marker": "ts",
78-
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
77+
"marker": "'ts or otel'",
78+
"platforms": "linux/arm64, linux/amd64"
79+
},
80+
{
81+
"label": "agent 1/1",
82+
"image": "debian",
83+
"type": "oss",
84+
"marker": "'agentv3'",
85+
"platforms": "linux/arm64, linux/amd64"
7986
}
8087
],
8188
"k8s": []

0 commit comments

Comments
 (0)