8000 Merge branch 'main' into endpoint-slices · nginx/kubernetes-ingress@704dcba · GitHub
[go: up one dir, main page]
Skip to content

Commit 704dcba

Browse files
shaun-nxshaun-nx
authored
Merge branch 'main' into endpoint-slices
2 parents b9b4019 + 4464caf commit 704dcba

9 files changed

+224
-159
lines changed

‎.github/workflows/build-oss.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,50 +28,50 @@ jobs:
2828
image_digest: ${{ steps.build-push.outputs.digest }}
2929
steps:
3030
- name: Checkout Repository
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
3232
with:
3333
ref: ${{ inputs.tag != '' && format('refs/tags/v{0}', inputs.tag) || github.ref }}
3434
fetch-depth: 0
3535

3636
- name: Fetch Cached Artifacts
37-
uses: actions/cache@v3
37+
uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
3838
with:
3939
path: ${{ github.workspace }}/dist
4040
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}-multi
4141

4242
- name: Setup QEMU
43-
uses: docker/setup-qemu-action@v2
43+
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
4444
with:
4545
platforms: arm,arm64,ppc64le,s390x
4646
if: github.event_name != 'pull_request'
4747

4848
- name: Docker Buildx
49-
uses: docker/setup-buildx-action@v2
49+
uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1
5050
- name: DockerHub Login
51-
uses: docker/login-action@v2
51+
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
5252
with:
5353
username: ${{ secrets.DOCKER_USERNAME }}
5454
password: ${{ secrets.DOCKER_PASSWORD }}
5555
if: github.event_name != 'pull_request'
5656

5757
- name: Login to GitHub Container Registry
58-
uses: docker/login-action@v2
58+
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
5959
with:
6060
registry: ghcr.io
6161
username: ${{ github.repository_owner }}
6262
password: ${{ secrets.GITHUB_TOKEN }}
6363
if: github.event_name != 'pull_request'
6464

6565
- name: Login to Public ECR
66-
uses: docker/login-action@v2
66+
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
6767
with:
6868
registry: public.ecr.aws
6969
username: ${{ secrets.AWS_ACCESS_KEY_ID }}
7070
password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
7171
if: github.event_name != 'pull_request'
7272

7373
- name: Login to Quay.io
74-
uses: docker/login-action@v2
74+
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
7575
with:
7676
registry: quay.io
7777
username: ${{ secrets.QUAY_USERNAME }}
@@ -88,7 +88,7 @@ jobs:
8888

8989
- name: Docker meta
9090
id: meta
91-
uses: docker/metadata-action@v4
91+
uses: docker/metadata-action@57396166ad8aefe6098280995947635806a0e6ea # v4.1.1
9292
with:
9393
images: |
9494
name=nginx/nginx-ingress
@@ -118,7 +118,7 @@ jobs:
118118
io.artifacthub.package.keywords=kubernetes,ingress,nginx,controller
119119
120120
- name: Build Docker image
121-
uses: docker/build-push-action@v3
121+
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
122122
id: build-push
123123
with:
124124
file: build/Dockerfile
@@ -138,7 +138,7 @@ jobs:
138138
IC_VERSION=${{ github.event_name == 'pull_request' && 'CI' || steps.meta.outputs.version }}
139139
140140
- name: Run Trivy vulnerability scanner
141-
uses: aquasecurity/trivy-action@0.8.0
141+
uses: aquasecurity/trivy-action@9ab158e8597f3b310480b9a69402b419bc03dbd5 # 0.8.0
142142
continue-on-error: true
143143
with:
144144
image-ref: nginx/nginx-ingress:${{ steps.meta.outputs.version }}
@@ -147,13 +147,13 @@ jobs:
147147
ignore-unfixed: 'true'
148148

149149
- name: Upload Trivy scan results to GitHub Security tab
150-
uses: github/codeql-action/upload-sarif@v2
150+
uses: github/codeql-action/upload-sarif@678fc3afe258fb2e0cdc165ccf77b85719de7b3c # v2.1.33
151151
continue-on-error: true
152152
with:
153153
sarif_file: 'trivy-results-${{ inputs.image }}.sarif'
154154

155155
- name: Upload Scan Results
156-
uses: actions/upload-artifact@v3
156+
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
157157
continue-on-error: true
158158
with:
159159
name: 'trivy-results-${{ inputs.image }}.sarif'

‎.github/workflows/build-plus.yml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,40 +20,46 @@ defaults:
2020
run:
2121
shell: bash
2222

23+
permissions: # added using https://github.com/step-security/secure-workflows
24+
contents: read
25+
2326
jobs:
2427
build:
28+
permissions:
29+
contents: read # for docker/build-push-action to read repo content
30+
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
2531
runs-on: ubuntu-22.04
2632
steps:
2733
- name: Checkout Repository
28-
uses: actions/checkout@v3
34+
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
2935
with:
3036
fetch-depth: 0
3137

3238
- name: Fetch Cached Artifacts
33-
uses: actions/cache@v3
39+
uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
3440
with:
3541
path: ${{ github.workspace }}/dist
3642
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}-multi
3743

3844
- name: Setup QEMU
39-
uses: docker/setup-qemu-action@v2
45+
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0
4046
with:
4147
platforms: arm64
4248
if: github.event_name != 'pull_request'
4349

4450
- name: Docker Buildx
45-
uses: docker/setup-buildx-action@v2
51+
uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1
4652

4753
- name: GCR Login
48-
uses: docker/login-action@v2
54+
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
4955
with:
5056
registry: gcr.io
5157
username: _json_key
5258
password: ${{ secrets.GCR_JSON_KEY }}
5359
if: github.event_name != 'pull_request'
5460

5561
- name: Login to ECR
56-
uses: docker/login-action@v2
62+
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
5763
with:
5864
registry: 709825985650.dkr.ecr.us-east-1.amazonaws.com
5965
username: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -62,7 +68,7 @@ jobs:
6268

6369
- name: Docker meta
6470
id: meta
65-
uses: docker/metadata-action@v4
71+
uses: docker/metadata-action@57396166ad8aefe6098280995947635806a0e6ea # v4.1.1
6672
with:
6773
images: |
6874
name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}/nginx-plus-ingress
@@ -94,7 +100,7 @@ jobs:
94100
if: ${{ inputs.nap_modules != '' }}
95101

96102
- name: Build Plus Docker image
97-
uses: docker/build-push-action@v3
103+
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
98104
with:
99105
file: build/Dockerfile
100106
context: '.'
@@ -120,7 +126,7 @@ jobs:
120126
${{ inputs.nap_modules != '' && contains(inputs.image, 'ubi') && format('"rhel_license={0}"', secrets.RHEL_LICENSE) || '' }}
121127
122128
- name: Load image for Trivy
123-
uses: docker/build-push-action@v3
129+
uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # v3.2.0
124130
with:
125131
file: build/Dockerfile
126132
context: '.'
@@ -140,7 +146,7 @@ jobs:
140146
${{ inputs.nap_modules != '' && contains(inputs.image, 'ubi') && format('"rhel_license={0}"', secrets.RHEL_LICENSE) || '' }}
141147
142148
- name: Run Trivy vulnerability scanner
143-
uses: aquasecurity/trivy-action@0.8.0
149+
uses: aquasecurity/trivy-action@9ab158e8597f3b310480b9a69402b419bc03dbd5 # 0.8.0
144150
continue-on-error: true
145151
with:
146152
image-ref: docker.io/${{ inputs.image }}:${{ steps.meta.outputs.version }}
@@ -149,13 +155,13 @@ jobs:
149155
ignore-unfixed: 'true'
150156

151157
- name: Upload Trivy scan results to GitHub Security tab
152-
uses: github/codeql-action/upload-sarif@v2
158+
uses: github/codeql-action/upload-sarif@678fc3afe258fb2e0cdc165ccf77b85719de7b3c # v2.1.33
153159
continue-on-error: true
154160
with:
155161
sarif_file: 'trivy-results-${{ inputs.image }}.sarif'
156162

157163
- name: Upload Scan Results
158-
uses: actions/upload-artifact@v3
164+
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
159165
continue-on-error: true
160166
with:
161167
name: 'trivy-results-${{ inputs.image }}.sarif'

‎.github/workflows/notifications.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
- "Lint"
1111
- "Update Docker Images"
1212
- "OpenSSF Scorecards"
13+
- "Build OSS"
14+
- "Build Plus"
1315
types:
1416
- completed
1517

‎.github/workflows/updates-notification.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-22.04
2727
steps:
2828
- name: Checkout Repository
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
3030
with:
3131
ref: ${{ inputs.sha_long }}
3232
- name: Get variables for Slack
@@ -36,7 +36,7 @@ jobs:
3636
echo "date=$(date +%s)" >> $GITHUB_OUTPUT
3737
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
3838
- name: Send Notification
39-
uses: 8398a7/action-slack@v3
39+
uses: 8398a7/action-slack@a189acbf0b7ea434558662ae25a0de71df69a435 # v3.14.0
4040
with:
4141
status: custom
4242
custom_payload: |

‎go.mod‎

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

55
require (
6-
github.com/aws/aws-sdk-go-v2/config v1.18.2
7-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.23
6+
github.com/aws/aws-sdk-go-v2/config v1.18.3
7+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.24
88
github.com/cert-manager/cert-manager v1.10.1
99
github.com/golang-jwt/jwt/v4 v4.4.2
1010
github.com/golang/glog v1.0.0
@@ -31,15 +31,15 @@ require (
3131
github.com/PuerkitoBio/purell v1.1.1 // indirect
3232
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3333
github.com/aws/aws-sdk-go-v2 v1.17.1 // indirect
34-
github.com/aws/aws-sdk-go-v2/credentials v1.13.2 // indirect
34+
github.com/aws/aws-sdk-go-v2/credentials v1.13.3 // indirect
3535
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.19 // indirect
3636
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25 // indirect
3737
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.19 // indirect
3838
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.26 // indirect
3939
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.19 // indirect
4040
github.com/aws/aws-sdk-go-v2/service/sso v1.11.25 // indirect
4141
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.8 // indirect
42-
github.com/aws/aws-sdk-go-v2/service/sts v1.17.4 // indirect
42+
github.com/aws/aws-sdk-go-v2/service/sts v1.17.5 // indirect
4343
github.com/aws/smithy-go v1.13.4 // indirect
4444
github.com/beorn7/perks v1.0.1 // indirect
4545
github.com/blang/semver/v4 v4.0.0 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5
2727
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
2828
github.com/aws/aws-sdk-go-v2 v1.17.1 h1:02c72fDJr87N8RAC2s3Qu0YuvMRZKNZJ9F+lAehCazk=
2929
github.com/aws/aws-sdk-go-v2 v1.17.1/go.mod h1:JLnGeGONAyi2lWXI1p0PCIOIy333JMVK1U7Hf0aRFLw=
30-
github.com/aws/aws-sdk-go-v2/config v1.18.2 h1:tRhTb3xMZsB0gW0sXWpqs9FeIP8iQp5SvnvwiPXzHwo=
31-
github.com/aws/aws-sdk-go-v2/config v1.18.2/go.mod h1:9XVoZTdD8ICjrgI5ddb8j918q6lEZkFYpb7uohgvU6c=
32-
github.com/aws/aws-sdk-go-v2/credentials v1.13.2 h1:F/v1w0XcFDZjL0bCdi9XWJenoPKjGbzljBhDKcryzEQ=
33-
github.com/aws/aws-sdk-go-v2/credentials v1.13.2/go.mod h1:eAT5aj/WJ2UDIA0IVNFc2byQLeD89SDEi4cjzH/MKoQ=
30+
github.com/aws/aws-sdk-go-v2/config v1.18.3 h1:3kfBKcX3votFX84dm00U8RGA1sCCh3eRMOGzg5dCWfU=
31+
github.com/aws/aws-sdk-go-v2/config v1.18.3/go.mod h1:BYdrbeCse3ZnOD5+2/VE/nATOK8fEUpBtmPMdKSyhMU=
32+
github.com/aws/aws-sdk-go-v2/credentials v1.13.3 h1:ur+FHdp4NbVIv/49bUjBW+FE7e57HOo03ELodttmagk=
33+
github.com/aws/aws-sdk-go-v2/credentials v1.13.3/go.mod h1:/rOMmqYBcFfNbRPU0iN9IgGqD5+V2yp3iWNmIlz0wI4=
3434
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.19 h1:E3PXZSI3F2bzyj6XxUXdTIfvp425HHhwKsFvmzBwHgs=
3535
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.19/go.mod h1:VihW95zQpeKQWVPGkwT+2+WJNQV8UXFfMTWdU6VErL8=
3636
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.25 h1:nBO/RFxeq/IS5G9Of+ZrgucRciie2qpLy++3UGZ+q2E=
@@ -41,14 +41,14 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.26 h1:Mza+vlnZr+fPKFKRq/lKGVvM6B/
4141
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.26/go.mod h1:Y2OJ+P+MC1u1VKnavT+PshiEuGPyh/7DqxoDNij4/bg=
4242
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.19 h1:GE25AWCdNUPh9AOJzI9KIJnja7IwUc1WyUqz/JTyJ/I=
4343
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.19/go.mod h1:02CP6iuYP+IVnBX5HULVdSAku/85eHB2Y9EsFhrkEwU=
44-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.23 h1:NZKyAfM6J2OPehuSZI8woNGTxYi5jMkTDWGEFwR6/FA=
45-
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.23/go.mod h1:mRGY+k3s1yt7yQA3AfzJhnr68OCs1xDfQfIABFUk+ek=
44+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.24 h1:DYr+X4xrRzcthq2OLJzsiS/uSJhZ/HHxXG0yUgGZceU=
45+
github.com/aws/aws-sdk-go-v2/service/marketplacemetering v1.13.24/go.mod h1:mRGY+k3s1yt7yQA3AfzJhnr68OCs1xDfQfIABFUk+ek=
4646
github.com/aws/aws-sdk-go-v2/service/sso v1.11.25 h1:GFZitO48N/7EsFDt8fMa5iYdmWqkUDDB3Eje6z3kbG0=
4747
github.com/aws/aws-sdk-go-v2/service/sso v1.11.25/go.mod h1:IARHuzTXmj1C0KS35vboR0FeJ89OkEy1M9mWbK2ifCI=
4848
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.8 h1:jcw6kKZrtNfBPJkaHrscDOZoe5gvi9wjudnxvozYFJo=
4949
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.8/go.mod h1:er2JHN+kBY6FcMfcBBKNGCT3CarImmdFzishsqBmSRI=
50-
github.com/aws/aws-sdk-go-v2/service/sts v1.17.4 h1:YNncBj5dVYd05i4ZQ+YicOotSXo0ufc9P8kTioi13EM=
51-
github.com/aws/aws-sdk-go-v2/service/sts v1.17.4/go.mod h1:bXcN3koeVYiJcdDU89n3kCYILob7Y34AeLopUbZgLT4=
50+
github.com/aws/aws-sdk-go-v2/service/sts v1.17.5 h1:60SJ4lhvn///8ygCzYy2l53bFW/Q15bVfyjyAWo6zuw=
51+
github.com/aws/aws-sdk-go-v2/service/sts v1.17.5/go.mod h1:bXcN3koeVYiJcdDU89n3kCYILob7Y34AeLopUbZgLT4=
5252
github.com/aws/smithy-go v1.13.4 h1:/RN2z1txIJWeXeOkzX+Hk/4Uuvv7dWtCjbmVJcrskyk=
5353
github.com/aws/smithy-go v1.13.4/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
5454
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=

0 commit comments

Comments
 (0)
0