Skip to content

Commit ae76aea

Browse files
frantsaofrantsao
authored
Merge branch 'main' into issue-6679
2 parents d7d59aa + f97a3e3 commit ae76aea

19 files changed

+349
-153
lines changed

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

Lines changed: 3 additions & 3 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/release
2-
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-mktpl")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl")
4-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8")
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")
55
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
66
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
77
declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}")

‎.github/config/config-plus-nginx

Lines changed: 3 additions & 3 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")
4-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8")
5-
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8")
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")
66
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
77
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
88
export PUBLISH_OSS=false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
{
2020
"label": "AP_WAF 3/4",
21-
"image": "debian-plus-nap",
21+
"image": "alpine-plus-nap-fips",
2222
"type": "plus",
2323
"nap_modules": "waf",
2424
"marker": "appprotect_waf_policies_grpc",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"label": "ingresses 2/2",
40-
"image": "alpine-plus",
40+
"image": "alpine-plus-fips",
4141
"type": "plus",
4242
"marker": "'annotations or basic_auth or hsts or watch_namespace or wildcard_tls'",
4343
"platforms": "linux/arm64, linux/amd64"
@@ -51,7 +51,7 @@
5151
},
5252
{
5353
"label": "VSR 2/3",
54-
"image": "alpine-plus",
54+
"image": "alpine-plus-fips",
5555
"type": "plus",
5656
"marker": "'vsr_basic or vsr_canned or vsr_rewrite or vsr_redirects or vsr_upstream'",
5757
"platforms": "linux/arm64, linux/amd64"

‎.github/data/patch-images.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@
3535
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
3636
"platforms": "linux/arm64, linux/amd64"
3737
},
38+
{
39+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
40+
"source_os": "alpine-fips",
41+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress",
42+
"platforms": "linux/arm64, linux/amd64"
43+
},
3844
{
3945
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress",
4046
"source_os": "ubi",
@@ -65,6 +71,12 @@
6571
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
6672
"platforms": "linux/amd64"
6773
},
74+
{
75+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress",
76+
"source_os": "alpine-fips",
77+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress",
78+
"platforms": "linux/amd64"
79+
},
6880
{
6981
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
7082
"source_os": "debian",
@@ -83,6 +95,12 @@
8395
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
8496
"platforms": "linux/amd64"
8597
},
98+
{
99+
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress",
100+
"source_os": "alpine-fips",
101+
"target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress",
102+
"platforms": "linux/amd64"
103+
},
86104
{
87105
"source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress",
88106
"source_os": "debian",

‎.github/workflows/image-promotion.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ jobs:
385385
scan-docker-oss:
386386
name: Scan ${{ matrix.image }}-${{ matrix.target }}
387387
runs-on: ubuntu-24.04
388-
needs: [checks]
388+
needs: [checks, tag-candidate]
389389
permissions:
390390
contents: read
391391
id-token: write
@@ -474,7 +474,7 @@ jobs:
474474
scan-docker-plus:
475475
name: Scan ${{ matrix.image }}-${{ matrix.target }}
476476
runs-on: ubuntu-24.04
477-
needs: [checks]
477+
needs: [checks, tag-candidate]
478478
permissions:
479479
contents: read
480480
id-token: write
@@ -563,7 +563,7 @@ jobs:
563563
scan-docker-nap:
564564
name: Scan ${{ matrix.image }}-${{ matrix.target }}-${{ matrix.nap_modules }}
565565
runs-on: ubuntu-24.04
566-
needs: [checks]
566+
needs: [checks, tag-candidate]
567567
permissions:
568568
contents: read
569569
id-token: write
@@ -655,6 +655,7 @@ jobs:
655655
uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
656656
with:
657657
sarif_file: "${{ steps.directory.outputs.directory }}/"
658+
continue-on-error: true
658659

659660
update-release-draft:
660661
name: Update Release Draft

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ repos:
8787
args: ["--schemafile", "charts/nginx-ingress/values.schema.json"]
8888

8989
- repo: https://github.com/DavidAnson/markdownlint-cli2
90-
rev: v0.15.0
90+
rev: v0.16.0
9191
hooks:
9292
- id: markdownlint-cli2
9393

‎go.mod

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ require (
2222
go.opentelemetry.io/otel v1.32.0
2323
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
2424
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
25-
k8s.io/api v0.31.3
26-
k8s.io/apimachinery v0.31.3
27-
k8s.io/client-go v0.31.3
25+
k8s.io/api v0.32.0
26+
k8s.io/apimachinery v0.32.0
27+
k8s.io/client-go v0.32.0
2828
k8s.io/code-generator v0.31.3
29-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
29+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
3030
sigs.k8s.io/controller-tools v0.16.5
3131
)
3232

@@ -76,14 +76,14 @@ require (
7676
github.com/go-sql-driver/mysql v1.4.1 // indirect
7777
github.com/gobuffalo/flect v1.0.3 // indirect
7878
github.com/gogo/protobuf v1.3.2 // indirect
79-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8079
github.com/golang/protobuf v1.5.4 // indirect
8180
github.com/gonvenience/bunt v1.3.5 // indirect
8281
github.com/gonvenience/neat v1.3.12 // indirect
8382
github.com/gonvenience/term v1.0.2 // indirect
8483
github.com/gonvenience/text v1.0.7 // indirect
8584
github.com/gonvenience/wrap v1.1.2 // indirect
8685
github.com/gonvenience/ytbx v1.4.4 // indirect
86+
github.com/google/btree v1.1.2 // indirect
8787
github.com/google/gnostic-models v0.6.8 // indirect
8888
github.com/google/gofuzz v1.2.0 // indirect
8989
github.com/google/uuid v1.6.0 // indirect
@@ -94,7 +94,6 @@ require (
9494
github.com/hashicorp/errwrap v1.1.0 // indirect
9595
github.com/hashicorp/go-multierror v1.1.1 // indirect
9696
github.com/homeport/dyff v1.6.0 // indirect
97-
github.com/imdario/mergo v0.3.16 // indirect
9897
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9998
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
10099
github.com/josharian/intern v1.0.0 // indirect
@@ -113,7 +112,7 @@ require (
113112
github.com/mitchellh/go-homedir v1.1.0 // indirect
114113
github.com/mitchellh/go-ps v1.0.0 // indirect
115114
github.com/mitchellh/hashstructure v1.1.0 // indirect
116-
github.com/moby/spdystream v0.4.0 // indirect
115+
github.com/moby/spdystream v0.5.0 // indirect
117116
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
118117
github.com/modern-go/reflect2 v1.0.2 // indirect
119118
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -138,9 +137,9 @@ require (
138137
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
139138
github.com/x448/float16 v0.8.4 // indirect
140139
github.com/zeebo/errs v1.3.0 // indirect
141-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
142-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
143-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
140+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
141+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
142+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
144143
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
145144
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
146145
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
@@ -150,15 +149,15 @@ require (
150149
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
151150
go.uber.org/multierr v1.11.0 // indirect
152151
go.uber.org/zap v1.27.0 // indirect
153-
golang.org/x/crypto v0.28.0 // indirect
152+
golang.org/x/crypto v0.31.0 // indirect
154153
golang.org/x/mod v0.21.0 // indirect
155154
golang.org/x/net v0.30.0 // indirect
156155
golang.org/x/oauth2 v0.23.0 // indirect
157-
golang.org/x/sync v0.9.0 // indirect
158-
golang.org/x/sys v0.27.0 // indirect
159-
golang.org/x/term v0.25.0 // indirect
160-
golang.org/x/text v0.20.0 // indirect
161-
golang.org/x/time v0.6.0 // indirect
156+
golang.org/x/sync v0.10.0 // indirect
157+
golang.org/x/sys v0.28.0 // indirect
158+
golang.org/x/term v0.27.0 // indirect
159+
golang.org/x/text v0.21.0 // indirect
160+
golang.org/x/time v0.7.0 // indirect
162161
golang.org/x/tools v0.26.0 // indirect
163162
google.golang.org/appengine v1.6.7 // indirect
164163
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
@@ -170,15 +169,15 @@ require (
170169
gopkg.in/yaml.v2 v2.4.0 // indirect
171170
gopkg.in/yaml.v3 v3.0.1 // indirect
172171
k8s.io/apiextensions-apiserver v0.31.2 // indirect
173-
k8s.io/apiserver v0.31.2 // indirect
174-
k8s.io/component-base v0.31.2 // indirect
172+
k8s.io/apiserver v0.32.0 // indirect
173+
k8s.io/component-base v0.32.0 // indirect
175174
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
176175
k8s.io/klog/v2 v2.130.1 // indirect
177-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
178-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
176+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
177+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
179178
sigs.k8s.io/gateway-api v1.1.0 // indirect
180-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
181-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
179+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
180+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
182181
sigs.k8s.io/yaml v1.4.0 // indirect
183182
)
184183

0 commit comments

Comments
 (0)