8000 Merge branch 'main' into fix-allocateloadbalancernodeports · nginx/kubernetes-ingress@97575b7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 97575b7

Browse files
ciarams87ciarams87
authored
Merge branch 'main' into fix-allocateloadbalancernodeports
2 parents f9547b6 + aac5073 commit 97575b7

File tree

105 files changed

+9663
-6631
lines changed

Some content is hidden

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

105 files changed

+9663
-6631
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ on:
1212
tag:
1313
required: false
1414
type: string
15-
sha_long:
16-
required: false
17-
type: string
1815

1916
defaults:
2017
run:
@@ -101,6 +98,7 @@ jobs:
10198
id: meta
10299
uses: docker/metadata-action@c4ee3adeed93b1fa6a762f209fb01608c1a22f1e # v4.4.0
103100
with:
101+
context: ${{ inputs.tag != '' && 'git' || 'workflow' }}
104102
images: |
105103
name=nginx/nginx-ingress
106104
name=ghcr.io/nginxinc/kubernetes-ingress
@@ -121,7 +119,6 @@ jobs:
121119
org.opencontainers.image.description=NGINX Ingress Controller for Kubernetes
122120
org.opencontainers.image.documentation=https://docs.nginx.com/nginx-ingress-controller
123121
org.opencontainers.image.vendor=NGINX Inc <kubernetes@nginx.com>
124-
org.opencontainers.image.revision=${{ inputs.sha_long != '' && inputs.sha_long || github.sha }}
125122
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/main/README.md
126123
io.artifacthub.package.logo-url=https://docs.nginx.com/nginx-ingress-controller/images/icons/NGINX-Ingress-Controller-product-icon.svg
127124
io.artifacthub.package.maintainers=[{"name":"NGINX Inc","email":"kubernetes@nginx.com"}]
@@ -160,7 +157,7 @@ jobs:
160157
ignore-unfixed: "true"
161158

162159
- name: Upload Trivy scan results to GitHub Security tab
163-
uses: github/codeql-action/upload-sarif@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
160+
uses: github/codeql-action/upload-sarif@f3feb00acb00f31a6f60280e6ace9ca31d9 D30D 1c76a # v2.3.2
164161
continue-on-error: true
165162
with:
166163
sarif_file: "trivy-results-${{ inputs.image }}.sarif"
@@ -178,7 +175,6 @@ jobs:
178175
needs: build
179176
uses: ./.github/workflows/updates-notification.yml
180177
with:
181-
sha_long: ${{ inputs.sha_long }}
182178
tag: ${{ inputs.tag }}
183179
version: ${{ needs.build.outputs.version }}
184180
image_digest: ${{ needs.build.outputs.image_digest }}

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,21 @@ jobs:
5151
- name: Docker Buildx
5252
uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2.5.0
5353

54-
- name: GCR Login
54+
- name: Authenticate to Google Cloud
55+
id: auth
56+
uses: google-github-actions/auth@e8df18b60c5dd38ba618c121b779307266153fbf # v1.1.0
57+
with:
58+
token_format: access_token
59+
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
60+
service_account: ${{ secrets.GCR_SERVICE_ACCOUNT }}
61+
if: github.event_name != 'pull_request'
62+
63+
- name: Login to GCR
5564
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
5665
with:
5766
registry: gcr.io
58-
username: _json_key
59-
password: ${{ secrets.GCR_JSON_KEY }}
67+
username: oauth2accesstoken
68+
password: ${{ steps.auth.outputs.access_token }}
6069
if: github.event_name != 'pull_request'
6170

6271
- name: Configure AWS Credentials
@@ -161,7 +170,7 @@ jobs:
161170
ignore-unfixed: 'true'
162171

163172
- name: Upload Trivy scan results to GitHub Security tab
164-
uses: github/codeql-action/upload-sarif@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
173+
uses: github/codeql-action/upload-sarif@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2.3.2
165174
continue-on-error: true
166175
with:
167176
sarif_file: 'trivy-results-${{ inputs.image }}.sarif'

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
# Initializes the CodeQL tools for scanning.
3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
39+
uses: github/codeql-action/init@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2.3.2
4040
with:
4141
languages: ${{ matrix.language }}
4242
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,7 +47,7 @@ jobs:
4747
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4848
# If this step fails, then you should remove it and run the build manually (see below)
4949
- name: Autobuild
50-
uses: github/codeql-action/autobuild@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
50+
uses: github/codeql-action/autobuild@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2.3.2
5151

5252
# ℹ️ Command-line programs to run using the OS shell.
5353
# 📚 https://git.io/JvXDl
@@ -61,4 +61,4 @@ jobs:
6161
# make release
6262

6363
- name: Perform CodeQL Analysis
64-
uses: github/codeql-action/analyze@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
64+
uses: github/codeql-action/analyze@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2.3.2

‎.github/workflows/draft-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
1616

1717
- name: Create/Update Draft
18-
uses: lucacome/draft-release@e1aa7cbd04dbd6baa6c06add5f84e271b21e45ea # v0.1.1
18+
uses: lucacome/draft-release@b79be3ff634f771230b2b6ee9f47308c5793671a # v0.2.0
1919
with:
2020
minor-label: 'enhancement'
2121
major-label: 'change'

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ jobs:
5353

5454
# Upload the results to GitHub's code scanning dashboard.
5555
- name: "Upload to code-scanning"
56-
uses: github/codeql-action/upload-sarif@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 # v2.3.0
56+
uses: github/codeql-action/upload-sarif@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2.3.2
5757
with:
5858
sarif_file: results.sarif

‎.github/workflows/update-docker-images.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Update Docker Images
22

33
on:
44
schedule:
5-
- cron: '0 1 * * *' # run every day at 01:00 UTC
5+
- cron: "0 1 * * *" # run every day at 01:00 UTC
66
workflow_dispatch:
77

88
defaults:
@@ -14,15 +14,12 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
jobs:
17-
1817
variables:
1918
name: Get versions of base images
2019
runs-on: ubuntu-22.04
2120
outputs:
2221
kic-tag: ${{ steps.kic.outputs.tag }}
2322
versions: ${{ steps.versions.outputs.matrix }}
24-
sha_short: ${{ steps.vars.outputs.sha_short }}
25-
sha_long: ${{ steps.vars.outputs.sha_long }}
2623
k8s_version: ${{ steps.vars.outputs.k8s_version }}
2724
steps:
2825
- name: Checkout Repository
@@ -48,8 +45,6 @@ jobs:
4845
- name: Set other variables
4946
id: vars
5047
run: |
51-
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
52-
echo "sha_long=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
5348
echo "k8s_version=$(grep -m1 'FROM kindest/node' <tests/docker/Dockerfile | awk -F'[:v]' '{print $3}')" >> $GITHUB_OUTPUT
5449
5550
check:
@@ -163,7 +158,6 @@ jobs:
163158
platforms: linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
164159
image: debian
165160
tag: ${{ needs.variables.outputs.kic-tag }}
166-
sha_long: ${{ needs.variables.outputs.sha_long }}
167161
secrets: inherit
168162
if: ${{ needs.check.outputs.needs-updating-debian == 'true' }}
169163

@@ -175,7 +169,6 @@ jobs:
175169
platforms: linux/arm,linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
176170
image: alpine
177171
tag: ${{ needs.variables.outputs.kic-tag }}
178-
sha_long: ${{ needs.variables.outputs.sha_long }}
179172
secrets: inherit
180173
if: ${{ needs.check.outputs.needs-updating-alpine == 'true' }}
181174

@@ -187,6 +180,5 @@ jobs:
187180
platforms: linux/arm64,linux/amd64,linux/ppc64le,linux/s390x
188181
image: ubi
189182
tag: ${{ needs.variables.outputs.kic-tag }}
190-
sha_long: ${{ needs.variables.outputs.sha_long }}
191183
secrets: inherit
192184
if: ${{ needs.check.outputs.needs-updating-ubi == 'true' }}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
version:
1010
required: true
1111
type: string
12-
sha_long:
13-
required: true
14-
type: string
1512
image_digest:
1613
required: true
1714
type: string
@@ -28,13 +25,14 @@ jobs:
2825
- name: Checkout Repository
2926
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
3027
with:
31-
ref: ${{ inputs.sha_long }}
28+
ref: ${{ inputs.tag }}
3229
- name: Get variables for Slack
3330
id: slack
3431
run: |
3532
echo "message=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
3633
echo "date=$(date +%s)" >> $GITHUB_OUTPUT
3734
echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
35+
echo "sha_long=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
3836
- name: Send Notification
3937
uses: 8398a7/action-slack@fbd6aa58ba854a740e11a35d0df80cb5d12101d8 # v3.15.1
4038
with:
@@ -64,7 +62,7 @@ jobs:
6462
},
6563
{
6664
title: "Commit Hash",
67-
value: `<https://github.com/${{ github.repository }}/commit/${{ inputs.sha_long }}|${{ steps.slack.outputs.sha_short }}>`,
65+
value: `<https://github.com/${{ github.repository }}/commit/${{ steps.slack.outputs.sha_long }}|${{ steps.slack.outputs.sha_short }}>`,
6866
short: true
6967
}],
7068
footer: "Update DockerHub Image",

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
### 3.1.1
4+
5+
An automatically generated list of changes can be found on GitHub at: [3.1.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.1.1)
6+
7+
A curated list of changes can be found on the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on the NGINX Documentation website.
8+
39
### 3.1.0
410

511
An automatically generated list of changes can be found on GitHub at: [3.1.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.1.0)

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Read [this doc](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-plus
5252

5353
We publish Ingress Controller releases on GitHub. See our [releases page](https://github.com/nginxinc/kubernetes-ingress/releases).
5454

55-
The latest stable release is [3.1.0](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.1.0). For production use, we recommend that you choose the latest stable release.
55+
The latest stable release is [3.1.1](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v3.1.1). For production use, we recommend that you choose the latest stable release.
5656

5757
The edge version is useful for experimenting with new features that are not yet published in a stable release. To use it, choose the *edge* version built from the [latest commit](https://github.com/nginxinc/kubernetes-ingress/commits/main) from the main branch.
5858

@@ -67,7 +67,7 @@ The table below summarizes the options regarding the images, manifests, helm cha
6767

6868
| Version | Description | Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples |
6969
| ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- |
70-
| Latest stable release | For production use | Use the 3.1.0 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 3.1.0 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v3.1.0/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v3.1.0/deployments/helm-chart). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
70+
| Latest stable release | For production use | Use the 3.1.1 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 3.1.1 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v3.1.1/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v3.1.1/deployments/helm-chart). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
7171
| Edge/Nightly | For testing and experimenting | Use the edge or nightly images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginxinc/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content/installation/building-ingress-controller-image.md). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content/installation/building-ingress-controller-image.md). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/main/docs/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples). |
7272

7373
## SBOM (Software Bill of Materials)

0 commit comments

Comments
 (0)
0