Skip to content

Commit bc763d3

Browse files
mohamadaldawamnahmohamadaldawamnah
authored
Merge branch 'main' into chore/update_crd_description
2 parents ba1d00e + d2dea55 commit bc763d3

File tree

6 files changed

+42
-38
lines changed

6 files changed

+42
-38
lines changed

‎.github/workflows/image-promotion.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ jobs:
5959
- name: Set Variables
6060
id: vars
6161
run: |
62-
echo "go_proxy="https://azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev" >> $GITHUB_OUTPUT
62+
echo "go_path=$(go env GOPATH)" >> $GITHUB_OUTPUT
63+
echo "go_proxy=https://azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev" >> $GITHUB_OUTPUT
6364
source .github/data/version.txt
6465
echo "ic_version=${IC_VERSION}" >> $GITHUB_OUTPUT
6566
echo "chart_version=${HELM_CHART_VERSION}" >> $GITHUB_OUTPUT
@@ -105,6 +106,7 @@ jobs:
105106
run: |
106107
echo go_code_md5: ${{ steps.vars.outputs.go_code_md5 }}
107108
echo go_path: ${{ steps.vars.outputs.go_path }}
109+
echo go_proxy: ${{ steps.vars.outputs.go_proxy }}
108110
echo binary_cache_hit: ${{ steps.binary-cache.outputs.cache-hit }}
109111
echo chart_version: ${{ steps.vars.outputs.chart_version }}
110112
echo ic_version: ${{ steps.vars.outputs.ic_version }}

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ jobs:
448448

449449
- name: Download Syft
450450
id: syft
451-
uses: anchore/sbom-action/download-syft@cee1b8e05ae5b2593a75e197229729eabaa9f8ec # v0.20.2
451+
uses: anchore/sbom-action/download-syft@7b36ad622f042cab6f59a75c2ac24ccb256e9b45 # v0.20.4
452452
if: ${{ needs.variables.outputs.binary_cache_sign_hit != 'true' }}
453453

454454
- name: Install Cosign

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ repos:
4444
pass_filenames: false
4545

4646
- repo: https://github.com/golangci/golangci-lint
47-
rev: v2.2.2
47+
rev: v2.3.0
4848
hooks:
4949
- id: golangci-lint
5050
args: [--new-from-patch=/tmp/diff.patch]

‎go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/nginx/kubernetes-ingress
33
go 1.24.4
44

55
require (
6-
github.com/aws/aws-sdk-go-v2/config v1.29.17
7-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.29.2
6+
github.com/aws/aws-sdk-go-v2/config v1.29.18
7+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.29.3
88
github.com/cert-manager/cert-manager v1.18.2
99
github.com/dlclark/regexp2 v1.11.5
1010
github.com/gkampitakis/go-snaps v0.5.13
@@ -36,13 +36,13 @@ require (
3636
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
3737
github.com/BurntSushi/toml v1.4.0 // indirect
3838
github.com/Microsoft/go-winio v0.6.2 // indirect
39-
github.com/aws/aws-sdk-go-v2 v1.36.5 // indirect
39+
github.com/aws/aws-sdk-go-v2 v1.36.6 // indirect
4040
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
41-
github.com/aws/aws-sdk-go-v2/credentials v1.17.70 // indirect
42-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
41+
github.com/aws/aws-sdk-go-v2/credentials v1.17.71 // indirect
42+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.33 // indirect
4343
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.41 // indirect
44-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
45-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
44+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37 // indirect
45+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37 // indirect
4646
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
4747
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.24 // indirect
4848
github.com/aws/aws-sdk-go-v2/service/acm v1.30.6 // indirect
@@ -56,7 +56,7 @@ require (
5656
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
5757
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.5 // indirect
5858
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.5 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.18 // indirect
6060
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5 // indirect
6161
github.com/aws/aws-sdk-go-v2/service/kms v1.37.6 // indirect
6262
github.com/aws/aws-sdk-go-v2/service/lambda v1.69.0 // indirect
@@ -67,9 +67,9 @@ require (
6767
github.com/aws/aws-sdk-go-v2/service/sns v1.33.6 // indirect
6868
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.1 // indirect
6969
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.0 // indirect
70-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 // indirect
71-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 // indirect
72-
github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 // indirect
70+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.6 // indirect
71+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.4 // indirect
72+
github.com/aws/aws-sdk-go-v2/service/sts v1.34.1 // indirect
7373
github.com/aws/smithy-go v1.22.4 // indirect
7474
github.com/beorn7/perks v1.0.1 // indirect
7575
github.com/blang/semver/v4 v4.0.0 // indirect

‎go.sum

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7V
1111
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
1212
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
1313
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
14-
github.com/aws/aws-sdk-go-v2 v1.36.5 h1:0OF9RiEMEdDdZEMqF9MRjevyxAQcf6gY+E7vwBILFj0=
15-
github.com/aws/aws-sdk-go-v2 v1.36.5/go.mod h1:EYrzvCCN9CMUTa5+6lf6MM4tq3Zjp8UhSGR/cBsjai0=
14+
github.com/aws/aws-sdk-go-v2 v1.36.6 h1:zJqGjVbRdTPojeCGWn5IR5pbJwSQSBh5RWFTQcEQGdU=
15+
github.com/aws/aws-sdk-go-v2 v1.36.6/go.mod h1:EYrzvCCN9CMUTa5+6lf6MM4tq3Zjp8UhSGR/cBsjai0=
1616
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwUGOZdsFFnQ5uLvR0hWqqhyE7Q9M8=
1717
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7/go.mod h1:QraP0UcVlQJsmHfioCrveWOC1nbiWUl3ej08h4mXWoc=
18-
github.com/aws/aws-sdk-go-v2/config v1.29.17 h1:jSuiQ5jEe4SAMH6lLRMY9OVC+TqJLP5655pBGjmnjr0=
19-
github.com/aws/aws-sdk-go-v2/config v1.29.17/go.mod h1:9P4wwACpbeXs9Pm9w1QTh6BwWwJjwYvJ1iCt5QbCXh8=
20-
github.com/aws/aws-sdk-go-v2/credentials v1.17.70 h1:ONnH5CM16RTXRkS8Z1qg7/s2eDOhHhaXVd72mmyv4/0=
21-
github.com/aws/aws-sdk-go-v2/credentials v1.17.70/go.mod h1:M+lWhhmomVGgtuPOhO85u4pEa3SmssPTdcYpP/5J/xc=
22-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 h1:KAXP9JSHO1vKGCr5f4O6WmlVKLFFXgWYAGoJosorxzU=
23-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32/go.mod h1:h4Sg6FQdexC1yYG9RDnOvLbW1a/P986++/Y/a+GyEM8=
18+
github.com/aws/aws-sdk-go-v2/config v1.29.18 h1:x4T1GRPnqKV8HMJOMtNktbpQMl3bIsfx8KbqmveUO2I=
19+
github.com/aws/aws-sdk-go-v2/config v1.29.18/go.mod h1:bvz8oXugIsH8K7HLhBv06vDqnFv3NsGDt2Znpk7zmOU=
20+
github.com/aws/aws-sdk-go-v2/credentials v1.17.71 h1:r2w4mQWnrTMJjOyIsZtGp3R3XGY3nqHn8C26C2lQWgA=
21+
github.com/aws/aws-sdk-go-v2/credentials v1.17.71/go.mod h1:E7VF3acIup4GB5ckzbKFrCK0vTvEQxOxgdq4U3vcMCY=
22+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.33 h1:D9ixiWSG4lyUBL2DDNK924Px9V/NBVpML90MHqyTADY=
23+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.33/go.mod h1:caS/m4DI+cij2paz3rtProRBI4s/+TCiWoaWZuQ9010=
2424
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.41 h1:hqcxMc2g/MwwnRMod9n6Bd+t+9Nf7d5qRg7RaXKPd6o=
2525
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.41/go.mod h1:d1eH0VrttvPmrCraU68LOyNdu26zFxQFjrVSb5vdhog=
26-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 h1:SsytQyTMHMDPspp+spo7XwXTP44aJZZAC7fBV2C5+5s=
27-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36/go.mod h1:Q1lnJArKRXkenyog6+Y+zr7WDpk4e6XlR6gs20bbeNo=
28-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 h1:i2vNHQiXUvKhs3quBR6aqlgJaiaexz/aNvdCktW/kAM=
29-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36/go.mod h1:UdyGa7Q91id/sdyHPwth+043HhmP6yP9MBHgbZM0xo8=
26+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37 h1:osMWfm/sC/L4tvEdQ65Gri5ZZDCUpuYJZbTTDrsn4I0=
27+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37/go.mod h1:ZV2/1fbjOPr4G4v38G3Ww5TBT4+hmsK45s/rxu1fGy0=
28+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37 h1:v+X21AvTb2wZ+ycg1gx+orkB/9U6L7AOp93R7qYxsxM=
29+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37/go.mod h1:G0uM1kyssELxmJ2VZEfG0q2npObR3BAkF3c1VsfVnfs=
3030
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
3131
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
3232
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.24 h1:JX70yGKLj25+lMC5Yyh8wBtvB01GDilyRuJvXJ4piD0=
@@ -53,16 +53,16 @@ github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.5 h1:gvZOjQKPxFXy1ft
5353
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.5/go.mod h1:DLWnfvIcm9IET/mmjdxeXbBKmTCm0ZB8p1za9BVteM8=
5454
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.5 h1:3Y457U2eGukmjYjeHG6kanZpDzJADa2m0ADqnuePYVQ=
5555
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.5/go.mod h1:CfwEHGkTjYZpkQ/5PvcbEtT7AJlG68KkEvmtwU8z3/U=
56-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 h1:t0E6FzREdtCsiLIoLCWsYliNsRBgyGD/MCK571qk4MI=
57-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17/go.mod h1:ygpklyoaypuyDvOM5ujWGrYWpAK3h7ugnmKCU/76Ys4=
56+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.18 h1:vvbXsA2TVO80/KT7ZqCbx934dt6PY+vQ8hZpUZ/cpYg=
57+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.18/go.mod h1:m2JJHledjBGNMsLOF1g9gbAxprzq3KjC8e4lxtn+eWg=
5858
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5 h1:P1doBzv5VEg1ONxnJss1Kh5ZG/ewoIE4MQtKKc6Crgg=
5959
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5/go.mod h1:NOP+euMW7W3Ukt28tAxPuoWao4rhhqJD3QEBk7oCg7w=
6060
github.com/aws/aws-sdk-go-v2/service/kms v1.37.6 h1:CZImQdb1QbU9sGgJ9IswhVkxAcjkkD1eQTMA1KHWk+E=
6161
github.com/aws/aws-sdk-go-v2/service/kms v1.37.6/go.mod h1:YJDdlK0zsyxVBxGU48AR/Mi8DMrGdc1E3Yij4fNrONA=
6262
github.com/aws/aws-sdk-go-v2/service/lambda v1.69.0 h1:BXt75frE/FYtAmEDBJRBa2HexOw+oAZWZl6QknZEFgg=
6363
github.com/aws/aws-sdk-go-v2/service/lambda v1.69.0/go.mod h1:guz2K3x4FKSdDaoeB+TPVgJNU9oj2gftbp5cR8ela1A=
64-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.29.2 h1:DGQhvwGFoPrJZWETxlWjruJzCN9wmutwnuqn7zkudB8=
65-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.29.2/go.mod h1:sXUjOw+8UVOJYV6NlmaVziTaoTuDuVE9q36XOINyqtM=
64+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.29.3 h1:lVbmn3NLDr5sVjoLtChJSFsxPbFO0pT6sgOhC1gTYxo=
65+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.29.3/go.mod h1:B57LC0jz08Q7WkAQFUDKQnmA9GFR/ym48Q12Ccp7o9E=
6666
github.com/aws/aws-sdk-go-v2/service/rds v1.91.0 h1:eqHz3Uih+gb0vLE5Cc4Xf733vOxsxDp6GFUUVQU4d7w=
6767
github.com/aws/aws-sdk-go-v2/service/rds v1.91.0/go.mod h1:h2jc7IleH3xHY7y+h8FH7WAZcz3IVLOB6/jXotIQ/qU=
6868
github.com/aws/aws-sdk-go-v2/service/route53 v1.46.2 h1:wmt05tPp/CaRZpPV5B4SaJ5TwkHKom07/BzHoLdkY1o=
@@ -77,12 +77,12 @@ github.com/aws/aws-sdk-go-v2/service/sqs v1.37.1 h1:39WvSrVq9DD6UHkD+fx5x19P5KpR
7777
github.com/aws/aws-sdk-go-v2/service/sqs v1.37.1/go.mod h1:3gwPzC9LER/BTQdQZ3r6dUktb1rSjABF1D3Sr6nS7VU=
7878
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.0 h1:mADKqoZaodipGgiZfuAjtlcr4IVBtXPZKVjkzUZCCYM=
7979
github.com/aws/aws-sdk-go-v2/service/ssm v1.56.0/go.mod h1:l9qF25TzH95FhcIak6e4vt79KE4I7M2Nf59eMUVjj6c=
80-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 h1:AIRJ3lfb2w/1/8wOOSqYb9fUKGwQbtysJ2H1MofRUPg=
81-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.5/go.mod h1:b7SiVprpU+iGazDUqvRSLf5XmCdn+JtT1on7uNL6Ipc=
82-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 h1:BpOxT3yhLwSJ77qIY3DoHAQjZsc4HEGfMCE4NGy3uFg=
83-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3/go.mod h1:vq/GQR1gOFLquZMSrxUK/cpvKCNVYibNyJ1m7JrU88E=
84-
github.com/aws/aws-sdk-go-v2/service/sts v1.34.0 h1:NFOJ/NXEGV4Rq//71Hs1jC/NvPs1ezajK+yQmkwnPV0=
85-
github.com/aws/aws-sdk-go-v2/service/sts v1.34.0/go.mod h1:7ph2tGpfQvwzgistp2+zga9f+bCjlQJPkPUmMgDSD7w=
80+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.6 h1:rGtWqkQbPk7Bkwuv3NzpE/scwwL9sC1Ul3tn9x83DUI=
81+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.6/go.mod h1:u4ku9OLv4TO4bCPdxf4fA1upaMaJmP9ZijGk3AAOC6Q=
82+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.4 h1:OV/pxyXh+eMA0TExHEC4jyWdumLxNbzz1P0zJoezkJc=
83+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.4/go.mod h1:8Mm5VGYwtm+r305FfPSuc+aFkrypeylGYhFim6XEPoc=
84+
github.com/aws/aws-sdk-go-v2/service/sts v1.34.1 h1:aUrLQwJfZtwv3/ZNG2xRtEen+NqI3iesuacjP51Mv1s=
85+
github.com/aws/aws-sdk-go-v2/service/sts v1.34.1/go.mod h1:3wFBZKoWnX3r+Sm7in79i54fBmNfwhdNdQuscCw7QIk=
8686
github.com/aws/smithy-go v1.22.4 h1:uqXzVZNuNexwc/xrh6Tb56u89WDlJY6HS+KC0S4QSjw=
8787
github.com/aws/smithy-go v1.22.4/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
8888
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

‎internal/nginx/manager.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,10 +634,12 @@ func (lm *LocalManager) AgentStart(agentDone chan error, instanceGroup string) {
634634
fmt.Sprintf("product-type=%s", metadataInfo.ProductType),
635635
fmt.Sprintf("product-version=%s", metadataInfo.ProductVersion),
636636
fmt.Sprintf("cluster-id=%s", metadataInfo.ClusterID),
637-
fmt.Sprintf("installation-name=%s", metadataInfo.InstallationName),
638637
fmt.Sprintf("installation-id=%s", metadataInfo.InstallationID),
639-
fmt.Sprintf("control-id=%s", metadataInfo.InstallationID), // control-id is required but is the same as installation-id
638+
fmt.Sprintf("installation-name=%s", metadataInfo.InstallationName),
640639
fmt.Sprintf("installation-namespace=%s", metadataInfo.InstallationNamespace),
640+
fmt.Sprintf("control-id=%s", metadataInfo.InstallationID), // control-id is required but is the same as installation-id
641+
fmt.Sprintf("control-name=%s", metadataInfo.InstallationName), // control-name is required but is the same as installation-name
642+
fmt.Sprintf("control-namespace=%s", metadataInfo.InstallationNamespace), // control-namespace is required but is the same as installation-namespace
641643
}
642644
metadataLabels := "--labels=" + strings.Join(labels, ",")
643645
args = append(args, metadataLabels)

0 commit comments

Comments
 (0)