Skip to content

Commit acf89a1

Browse files
committed
Update packages
1 parent ef276a4 commit acf89a1

File tree

25 files changed

+67
-67
lines changed

25 files changed

+67
-67
lines changed

.github/CHANGELOG_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ COMPATIBILITY:
3636

3737
CONTAINER IMAGES:
3838

39-
- Control plane: `ghcr.io/nginxinc/nginx-gateway-fabric:%%VERSION%%`
40-
- Data plane: `ghcr.io/nginxinc/nginx-gateway-fabric/nginx:%%VERSION%%`
39+
- Control plane: `ghcr.io/nginx/nginx-gateway-fabric:%%VERSION%%`
40+
- Data plane: `ghcr.io/nginx/nginx-gateway-fabric/nginx:%%VERSION%%`
4141
- Data plane with NGINX Plus: `private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:%%VERSION%%`

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ jobs:
103103
with:
104104
context: ${{ inputs.tag != '' && 'git' || 'workflow' }}
105105
images: |
106-
name=ghcr.io/nginxinc/nginx-gateway-fabric,enable=${{ inputs.image == 'ngf' && github.event_name != 'pull_request' }}
107-
name=ghcr.io/nginxinc/nginx-gateway-fabric/nginx,enable=${{ inputs.image == 'nginx' && github.event_name != 'pull_request' }}
106+
name=ghcr.io/nginx/nginx-gateway-fabric,enable=${{ inputs.image == 'ngf' && github.event_name != 'pull_request' }}
107+
name=ghcr.io/nginx/nginx-gateway-fabric/nginx,enable=${{ inputs.image == 'nginx' && github.event_name != 'pull_request' }}
108108
name=docker-mgmt.nginx.com/nginx-gateway-fabric/nginx-plus,enable=${{ inputs.image == 'plus' && github.event_name != 'pull_request' }}
109109
name=us-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/nginx-gateway-fabric/nginx-plus,enable=${{ inputs.image == 'plus' && github.event_name != 'pull_request' }}
110110
name=localhost:5000/nginx-gateway-fabric/${{ inputs.image }}

.github/workflows/conformance.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
5656
with:
5757
images: |
58-
name=ghcr.io/nginxinc/nginx-gateway-fabric
58+
name=ghcr.io/nginx/nginx-gateway-fabric
5959
tags: |
6060
type=semver,pattern={{version}}
6161
type=edge
@@ -68,7 +68,7 @@ jobs:
6868
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
6969
with:
7070
images: |
71-
name=ghcr.io/nginxinc/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
71+
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
7272
tags: |
7373
type=semver,pattern={{version}}
7474
type=edge
@@ -78,7 +78,7 @@ jobs:
7878
7979
- name: Generate static deployment
8080
run: |
81-
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
81+
ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric
8282
ngf_tag=${{ steps.ngf-meta.outputs.version }}
8383
make generate-static-deployment PLUS_ENABLED=${{ inputs.image == 'plus' && 'true' || 'false' }} PREFIX=${ngf_prefix} TAG=${ngf_tag}
8484
working-directory: ./tests
@@ -147,7 +147,7 @@ jobs:
147147

148148
- name: Setup conformance tests
149149
run: |
150-
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
150+
ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric
151151
ngf_tag=${{ steps.ngf-meta.outputs.version }}
152152
if [ ${{ github.event_name }} == "schedule" ]; then export GW_API_VERSION=main; fi
153153
make helm-install-local${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag}

.github/workflows/functional.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
5050
with:
5151
images: |
52-
name=ghcr.io/nginxinc/nginx-gateway-fabric
52+
name=ghcr.io/nginx/nginx-gateway-fabric
5353
tags: |
5454
type=semver,pattern={{version}}
5555
type=schedule
@@ -62,7 +62,7 @@ jobs:
6262
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
6363
with:
6464
images: |
65-
name=ghcr.io/nginxinc/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
65+
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
6666
tags: |
6767
type=semver,pattern={{version}}
6868
type=edge
@@ -126,21 +126,21 @@ jobs:
126126
127127
- name: Run functional telemetry tests
128128
run: |
129-
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
129+
ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric
130130
ngf_tag=${{ steps.ngf-meta.outputs.version }}
131131
make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GINKGO_LABEL=telemetry GW_SERVICE_TYPE=LoadBalancer CLUSTER_NAME=${{ github.run_id }} CI=true
132132
working-directory: ./tests
133133

134134
- name: Run functional graceful-recovery tests
135135
run: |
136-
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
136+
ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric
137137
ngf_tag=${{ steps.ngf-meta.outputs.version }}
138138
make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GINKGO_LABEL=graceful-recovery GW_SERVICE_TYPE=LoadBalancer CLUSTER_NAME=${{ github.run_id }} CI=true
139139
working-directory: ./tests
140140

141141
- name: Run functional tests
142142
run: |
143-
ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
143+
ngf_prefix=ghcr.io/nginx/nginx-gateway-fabric
144144
ngf_tag=${{ steps.ngf-meta.outputs.version }}
145145
make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GW_SERVICE_TYPE=LoadBalancer CLUSTER_NAME=${{ github.run_id }} CI=true
146146
working-directory: ./tests

.github/workflows/helm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
3939
with:
4040
images: |
41-
name=ghcr.io/nginxinc/nginx-gateway-fabric
41+
name=ghcr.io/nginx/nginx-gateway-fabric
4242
tags: |
4343
type=semver,pattern={{version}}
4444
type=edge
@@ -51,7 +51,7 @@ jobs:
5151
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
5252
with:
5353
images: |
54-
name=ghcr.io/nginxinc/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
54+
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
5555
tags: |
5656
type=semver,pattern={{version}}
5757
type=edge
@@ -120,7 +120,7 @@ jobs:
120120
- name: Install Chart
121121
run: |
122122
ct install --config .ct.yaml --namespace nginx-gateway --helm-extra-set-args="--set=nginxGateway.image.tag=${{ steps.ngf-meta.outputs.version }} \
123-
--set=nginx.image.repository=ghcr.io/nginxinc/nginx-gateway-fabric/nginx${{ inputs.image == 'plus' && '-plus' || ''}} \
123+
--set=nginx.image.repository=ghcr.io/nginx/nginx-gateway-fabric/nginx${{ inputs.image == 'plus' && '-plus' || ''}} \
124124
--set=nginx.plus=${{ inputs.image == 'plus' }} \
125125
--set=nginx.image.tag=${{ steps.nginx-meta.outputs.version }} \
126126
--set=nginxGateway.image.pullPolicy=Never \

.github/workflows/nfr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ jobs:
103103
run: |
104104
echo "RESOURCE_NAME=nfr-tests-${{ github.run_id }}-${{ matrix.type }}" >> vars.env
105105
echo "TAG=${{ needs.vars.outputs.image_tag }}" >> vars.env
106-
echo "PREFIX=ghcr.io/nginxinc/nginx-gateway-fabric" >> vars.env
107-
echo "NGINX_PREFIX=ghcr.io/nginxinc/nginx-gateway-fabric/nginx" >> vars.env
106+
echo "PREFIX=ghcr.io/nginx/nginx-gateway-fabric" >> vars.env
107+
echo "NGINX_PREFIX=ghcr.io/nginx/nginx-gateway-fabric/nginx" >> vars.env
108108
echo "NGINX_PLUS_PREFIX=us-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/nginx-gateway-fabric/nginx-plus" >> vars.env
109109
echo "GKE_CLUSTER_NAME=nfr-tests-${{ github.run_id }}-${{ matrix.type }}" >> vars.env
110110
echo "GKE_CLUSTER_ZONE=us-west1-b" >> vars.env

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
uses: lucacome/docker-image-update-checker@a233de0585661c019fb71f9601328db37051cc66 # v2.0.0
7171
with:
7272
base-image: ${{ needs.variables.outputs.nginx_version }}
73-
image: ghcr.io/nginxinc/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }}
73+
image: ghcr.io/nginx/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }}
7474

7575
build:
7676
name: Build Image

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ For example to retrieve the SBOM for `linux/amd64` and analyze it using [grype](
9595
can run the following command:
9696

9797
```shell
98-
docker buildx imagetools inspect ghcr.io/nginxinc/nginx-gateway-fabric:edge --format '{{ json (index .SBOM "linux/amd64").SPDX }}' | grype
98+
docker buildx imagetools inspect ghcr.io/nginx/nginx-gateway-fabric:edge --format '{{ json (index .SBOM "linux/amd64").SPDX }}' | grype
9999
```
100100

101101
## Troubleshooting

charts/nginx-gateway-fabric/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri
264264
| `nginx.debug` | Enable debugging for NGINX. Uses the nginx-debug binary. The NGINX error log level should be set to debug in the NginxProxy resource. | bool | `false` |
265265
| `nginx.extraVolumeMounts` | extraVolumeMounts are the additional volume mounts for the nginx container. | list | `[]` |
266266
| `nginx.image.pullPolicy` | | string | `"Always"` |
267-
| `nginx.image.repository` | The NGINX image to use. | string | `"ghcr.io/nginxinc/nginx-gateway-fabric/nginx"` |
267+
| `nginx.image.repository` | The NGINX image to use. | string | `"ghcr.io/nginx/nginx-gateway-fabric/nginx"` |
268268
| `nginx.image.tag` | | string | `"edge"` |
269269
| `nginx.lifecycle` | The lifecycle of the nginx container. | object | `{}` |
270270
| `nginx.plus` | Is NGINX Plus image being used | bool | `false` |
@@ -282,7 +282,7 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri
282282
| `nginxGateway.gatewayControllerName` | The name of the Gateway controller. The controller name must be of the form: DOMAIN/PATH. The controller's domain is gateway.nginx.org. | string | `"gateway.nginx.org/nginx-gateway-controller"` |
283283
| `nginxGateway.gwAPIExperimentalFeatures.enable` | Enable the experimental features of Gateway API which are supported by NGINX Gateway Fabric. Requires the Gateway APIs installed from the experimental channel. | bool | `false` |
284284
| `nginxGateway.image.pullPolicy` | | string | `"Always"` |
285-
| `nginxGateway.image.repository` | The NGINX Gateway Fabric image to use | string | `"ghcr.io/nginxinc/nginx-gateway-fabric"` |
285+
| `nginxGateway.image.repository` | The NGINX Gateway Fabric image to use | string | `"ghcr.io/nginx/nginx-gateway-fabric"` |
286286
| `nginxGateway.image.tag` | | string | `"edge"` |
287287
| `nginxGateway.kind` | The kind of the NGINX Gateway Fabric installation - currently, only deployment is supported. | string | `"deployment"` |
288288
| `nginxGateway.leaderElection.enable` | Enable leader election. Leader election is used to avoid multiple replicas of the NGINX Gateway Fabric reporting the status of the Gateway API resources. If not enabled, all replicas of NGINX Gateway Fabric will update the statuses of the Gateway API resources. | bool | `true` |

charts/nginx-gateway-fabric/templates/deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ spec:
5050
- --destination
5151
- /etc/nginx/main-includes
5252
env:
53-
- name: POD_UID
54-
valueFrom:
55-
fieldRef:
56-
fieldPath: metadata.uid
53+
- name: POD_UID
54+
valueFrom:
55+
fieldRef:
56+
fieldPath: metadata.uid
5757
securityContext:
5858
seccompProfile:
5959
type: RuntimeDefault

0 commit comments

Comments
 (0)