From c18ba1f0ada1e6c47e9800586223fae6b203afac Mon Sep 17 00:00:00 2001 From: nginx-bot Date: Fri, 10 Jan 2025 22:55:41 +0000 Subject: [PATCH 1/9] Release 1.6.0 --- CHANGELOG.md | 46 +++++++++++++++++++ Makefile | 2 +- README.md | 4 +- charts/nginx-gateway-fabric/Chart.yaml | 4 +- charts/nginx-gateway-fabric/README.md | 10 ++-- .../nginx-gateway-fabric/values.schema.json | 8 ++-- charts/nginx-gateway-fabric/values.yaml | 8 ++-- config/tests/static-deployment.yaml | 14 +++--- deploy/aws-nlb/deploy.yaml | 28 +++++------ deploy/azure/deploy.yaml | 28 +++++------ deploy/default/deploy.yaml | 28 +++++------ deploy/experimental-nginx-plus/deploy.yaml | 28 +++++------ deploy/experimental/deploy.yaml | 28 +++++------ deploy/nginx-plus/deploy.yaml | 28 +++++------ deploy/nodeport/deploy.yaml | 28 +++++------ deploy/openshift/deploy.yaml | 28 +++++------ .../snippets-filters-nginx-plus/deploy.yaml | 28 +++++------ deploy/snippets-filters/deploy.yaml | 28 +++++------ site/content/how-to/monitoring/prometheus.md | 4 +- .../traffic-management/advanced-routing.md | 4 +- .../traffic-management/client-settings.md | 6 +-- .../request-response-headers.md | 6 +-- .../how-to/traffic-management/snippets.md | 6 +-- .../upgrade-apps-without-downtime.md | 4 +- ...stall-gateway-api-experimental-features.md | 2 +- .../install-gateway-api-resources.md | 6 +-- .../uninstall-gateway-api-resources.md | 4 +- .../installation/building-the-images.md | 12 ++--- .../installation/installing-ngf/helm.md | 12 ++--- .../installation/installing-ngf/manifests.md | 26 +++++------ site/content/installation/nginx-plus-jwt.md | 2 +- site/content/overview/gateway-architecture.md | 6 +-- 32 files changed, 261 insertions(+), 215 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9375b42e6d..d9bad8afa8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,52 @@ This document includes a curated changelog for each release. We also publish a c a [GitHub release](https://github.com/nginx/nginx-gateway-fabric/releases), which, by contrast, is auto-generated and includes links to all PRs that went into the release. +## Release 1.6.0 + +* NGINX Plus R33 support by @sjberman in https://github.com/nginx/nginx-gateway-fabric/pull/2760 +* Update ObservabilityPolicy API to have minimum one target ref by @salonichf5 in https://github.com/nginx/nginx-gateway-fabric/pull/2753 +* Use state file for updating N+ upstreams by @sjberman in https://github.com/nginx/nginx-gateway-fabric/pull/2897 +* Add guide for UpstreamSettingsPolicy by @kate-osborn in https://github.com/nginx/nginx-gateway-fabric/pull/2987 + +%%DATE%% + +FEATURES: + +- + +BUG FIXES: + +- + +DOCUMENTATION: + +- + +HELM CHART: + +- The version of the Helm chart is now 1.6.0 +- + +UPGRADE: + +- + +KNOWN ISSUES: + +- + +COMPATIBILITY: + +- Gateway API version: `` +- NGINX version: `` +- NGINX Plus version: `` +- Kubernetes version: `` + +CONTAINER IMAGES: + +- Control plane: `ghcr.io/nginx/nginx-gateway-fabric:1.6.0` +- Data plane: `ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0` +- Data plane with NGINX Plus: `private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:1.6.0` ## Release 1.5.1 _December 16, 2024_ diff --git a/Makefile b/Makefile index 833247162e..4db2c7eab5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # variables that should not be overridden by the user -VERSION = edge +VERSION = 1.6.0 SELF_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) CHART_DIR = $(SELF_DIR)charts/nginx-gateway-fabric NGINX_CONF_DIR = internal/mode/static/nginx/conf diff --git a/README.md b/README.md index df592e367e..6170d72a81 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ You can find the comprehensive NGINX Gateway Fabric user documentation on the [N We publish NGINX Gateway Fabric releases on GitHub. See our [releases page](https://github.com/nginx/nginx-gateway-fabric/releases). -The latest release is [1.5.1](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v1.5.1). +The latest release is [1.6.0](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v1.6.0). The edge version is useful for experimenting with new features that are not yet published in a release. To use, choose the _edge_ version built from the [latest commit](https://github.com/nginx/nginx-gateway-fabric/commits/main) @@ -45,7 +45,7 @@ to the correct versions: | Version | Description | Installation Manifests | Documentation and Examples | |----------------|------------------------------------------|-----------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Latest release | For production use | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/examples). | +| Latest release | For production use | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.0/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.0/examples). | | Edge | For experimental use and latest features | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/main/deploy). | [Documentation](https://github.com/nginx/nginx-gateway-fabric/tree/main/site/content). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/main/examples). | ### Versioning diff --git a/charts/nginx-gateway-fabric/Chart.yaml b/charts/nginx-gateway-fabric/Chart.yaml index e99d10a25a..f238bfada3 100644 --- a/charts/nginx-gateway-fabric/Chart.yaml +++ b/charts/nginx-gateway-fabric/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: nginx-gateway-fabric description: NGINX Gateway Fabric type: application -version: 1.5.1 -appVersion: "edge" +version: 1.6.0 +appVersion: "1.6.0" kubeVersion: ">= 1.25.0-0" home: https://github.com/nginx/nginx-gateway-fabric icon: https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/main/charts/nginx-gateway-fabric/chart-icon.png diff --git a/charts/nginx-gateway-fabric/README.md b/charts/nginx-gateway-fabric/README.md index b949aee716..9df8a6fa82 100644 --- a/charts/nginx-gateway-fabric/README.md +++ b/charts/nginx-gateway-fabric/README.md @@ -1,7 +1,7 @@ # NGINX Gateway Fabric Helm Chart -![Version: 1.5.1](https://img.shields.io/badge/Version-1.5.1-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square) +![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) - [NGINX Gateway Fabric Helm Chart](#nginx-gateway-fabric-helm-chart) - [Introduction](#introduction) @@ -263,9 +263,9 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri | `nginx.config` | The configuration for the data plane that is contained in the NginxProxy resource. | object | `{}` | | `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` | | `nginx.extraVolumeMounts` | extraVolumeMounts are the additional volume mounts for the nginx container. | list | `[]` | -| `nginx.image.pullPolicy` | | string | `"Always"` | +| `nginx.image.pullPolicy` | | string | `"IfNotPresent"` | | `nginx.image.repository` | The NGINX image to use. | string | `"ghcr.io/nginx/nginx-gateway-fabric/nginx"` | -| `nginx.image.tag` | | string | `"edge"` | +| `nginx.image.tag` | | string | `"1.6.0"` | | `nginx.lifecycle` | The lifecycle of the nginx container. | object | `{}` | | `nginx.plus` | Is NGINX Plus image being used | bool | `false` | | `nginx.usage.caSecretName` | The name of the Secret containing the NGINX Instance Manager CA certificate. Must exist in the same namespace that the NGINX Gateway Fabric control plane is running in (default namespace: nginx-gateway). | string | `""` | @@ -281,9 +281,9 @@ The following table lists the configurable parameters of the NGINX Gateway Fabri | `nginxGateway.gatewayClassName` | The name of the GatewayClass that will be created as part of this release. Every NGINX Gateway Fabric must have a unique corresponding GatewayClass resource. NGINX Gateway Fabric only processes resources that belong to its class - i.e. have the "gatewayClassName" field resource equal to the class. | string | `"nginx"` | | `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"` | | `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` | -| `nginxGateway.image.pullPolicy` | | string | `"Always"` | +| `nginxGateway.image.pullPolicy` | | string | `"IfNotPresent"` | | `nginxGateway.image.repository` | The NGINX Gateway Fabric image to use | string | `"ghcr.io/nginx/nginx-gateway-fabric"` | -| `nginxGateway.image.tag` | | string | `"edge"` | +| `nginxGateway.image.tag` | | string | `"1.6.0"` | | `nginxGateway.kind` | The kind of the NGINX Gateway Fabric installation - currently, only deployment is supported. | string | `"deployment"` | | `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` | | `nginxGateway.leaderElection.lockName` | The name of the leader election lock. A Lease object with this name will be created in the same Namespace as the controller. | string | Autogenerated if not set or set to "". | diff --git a/charts/nginx-gateway-fabric/values.schema.json b/charts/nginx-gateway-fabric/values.schema.json index 048e4163cf..1ff6d72017 100644 --- a/charts/nginx-gateway-fabric/values.schema.json +++ b/charts/nginx-gateway-fabric/values.schema.json @@ -219,7 +219,7 @@ "image": { "properties": { "pullPolicy": { - "default": "Always", + "default": "IfNotPresent", "enum": [ "Always", "IfNotPresent", @@ -236,7 +236,7 @@ "type": "string" }, "tag": { - "default": "edge", + "default": "1.6.0", "required": [], "title": "tag", "type": "string" @@ -394,7 +394,7 @@ "image": { "properties": { "pullPolicy": { - "default": "Always", + "default": "IfNotPresent", "enum": [ "Always", "IfNotPresent", @@ -411,7 +411,7 @@ "type": "string" }, "tag": { - "default": "edge", + "default": "1.6.0", "required": [], "title": "tag", "type": "string" diff --git a/charts/nginx-gateway-fabric/values.yaml b/charts/nginx-gateway-fabric/values.yaml index 947212da97..8acd9a8eb5 100644 --- a/charts/nginx-gateway-fabric/values.yaml +++ b/charts/nginx-gateway-fabric/values.yaml @@ -82,14 +82,14 @@ nginxGateway: image: # -- The NGINX Gateway Fabric image to use repository: ghcr.io/nginx/nginx-gateway-fabric - tag: edge + tag: 1.6.0 # @schema # enum: # - Always # - IfNotPresent # - Never # @schema - pullPolicy: Always + pullPolicy: IfNotPresent securityContext: # -- Some environments may need this set to true in order for the control plane to successfully reload NGINX. @@ -122,14 +122,14 @@ nginx: image: # -- The NGINX image to use. repository: ghcr.io/nginx/nginx-gateway-fabric/nginx - tag: edge + tag: 1.6.0 # @schema # enum: # - Always # - IfNotPresent # - Never # @schema - pullPolicy: Always + pullPolicy: IfNotPresent # -- Is NGINX Plus image being used plus: false diff --git a/config/tests/static-deployment.yaml b/config/tests/static-deployment.yaml index 698f9b82ca..85136c69d3 100644 --- a/config/tests/static-deployment.yaml +++ b/config/tests/static-deployment.yaml @@ -8,7 +8,7 @@ metadata: labels: app.kubernetes.io/name: nginx-gateway app.kubernetes.io/instance: nginx-gateway - app.kubernetes.io/version: "edge" + app.kubernetes.io/version: "1.6.0" spec: replicas: 1 selector: @@ -23,8 +23,8 @@ spec: spec: initContainers: - name: init - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent command: - /usr/bin/gateway - initialize @@ -81,8 +81,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - name: health @@ -118,8 +118,8 @@ spec: mountPath: /var/run/nginx - name: nginx-includes mountPath: /etc/nginx/includes - - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge - imagePullPolicy: Always + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 diff --git a/deploy/aws-nlb/deploy.yaml b/deploy/aws-nlb/deploy.yaml index bd222a1ece..7b7b85bbde 100644 --- a/deploy/aws-nlb/deploy.yaml +++ b/deploy/aws-nlb/deploy.yaml @@ -9,7 +9,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -19,7 +19,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -133,7 +133,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -153,7 +153,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -166,7 +166,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -191,7 +191,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -236,8 +236,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -275,8 +275,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge - imagePullPolicy: Always + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -322,8 +322,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -372,7 +372,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -383,7 +383,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/deploy/azure/deploy.yaml b/deploy/azure/deploy.yaml index 990adedf38..37572aac04 100644 --- a/deploy/azure/deploy.yaml +++ b/deploy/azure/deploy.yaml @@ -9,7 +9,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -19,7 +19,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -133,7 +133,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -153,7 +153,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -163,7 +163,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -188,7 +188,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -233,8 +233,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -272,8 +272,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge - imagePullPolicy: Always + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -319,8 +319,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -371,7 +371,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -382,7 +382,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/deploy/default/deploy.yaml b/deploy/default/deploy.yaml index 9a0746a1d9..30e3464cda 100644 --- a/deploy/default/deploy.yaml +++ b/deploy/default/deploy.yaml @@ -9,7 +9,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -19,7 +19,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -133,7 +133,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -153,7 +153,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -163,7 +163,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -188,7 +188,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -233,8 +233,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -272,8 +272,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge - imagePullPolicy: Always + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -319,8 +319,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -369,7 +369,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -380,7 +380,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/deploy/experimental-nginx-plus/deploy.yaml b/deploy/experimental-nginx-plus/deploy.yaml index 69f8a68c58..de45f1b98f 100644 --- a/deploy/experimental-nginx-plus/deploy.yaml +++ b/deploy/experimental-nginx-plus/deploy.yaml @@ -11,7 +11,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -21,7 +21,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -146,7 +146,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -171,7 +171,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -181,7 +181,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -206,7 +206,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -254,8 +254,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -293,8 +293,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:edge - imagePullPolicy: Always + - image: private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -348,8 +348,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -403,7 +403,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -414,7 +414,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/deploy/experimental/deploy.yaml b/deploy/experimental/deploy.yaml index 0248ce832e..b1ffad30f0 100644 --- a/deploy/experimental/deploy.yaml +++ b/deploy/experimental/deploy.yaml @@ -9,7 +9,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -19,7 +19,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -138,7 +138,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -158,7 +158,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -168,7 +168,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -193,7 +193,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -239,8 +239,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -278,8 +278,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge - imagePullPolicy: Always + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -325,8 +325,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -375,7 +375,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -386,7 +386,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/deploy/nginx-plus/deploy.yaml b/deploy/nginx-plus/deploy.yaml index 4d7180632d..eec12427b9 100644 --- a/deploy/nginx-plus/deploy.yaml +++ b/deploy/nginx-plus/deploy.yaml @@ -11,7 +11,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -21,7 +21,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -141,7 +141,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -166,7 +166,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -176,7 +176,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -201,7 +201,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -248,8 +248,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -287,8 +287,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:edge - imagePullPolicy: Always + - image: private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -342,8 +342,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -397,7 +397,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -408,7 +408,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/deploy/nodeport/deploy.yaml b/deploy/nodeport/deploy.yaml index 414317999b..26b9830c31 100644 --- a/deploy/nodeport/deploy.yaml +++ b/deploy/nodeport/deploy.yaml @@ -9,7 +9,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -19,7 +19,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -133,7 +133,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -153,7 +153,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -163,7 +163,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -188,7 +188,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -233,8 +233,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -272,8 +272,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge - imagePullPolicy: Always + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -319,8 +319,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -369,7 +369,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -380,7 +380,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/deploy/openshift/deploy.yaml b/deploy/openshift/deploy.yaml index 61a8f82587..52775b481e 100644 --- a/deploy/openshift/deploy.yaml +++ b/deploy/openshift/deploy.yaml @@ -9,7 +9,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -19,7 +19,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -141,7 +141,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -161,7 +161,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -171,7 +171,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -196,7 +196,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -241,8 +241,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -280,8 +280,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge - imagePullPolicy: Always + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -327,8 +327,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -377,7 +377,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -388,7 +388,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/deploy/snippets-filters-nginx-plus/deploy.yaml b/deploy/snippets-filters-nginx-plus/deploy.yaml index 4e896d2f22..e21eeef01a 100644 --- a/deploy/snippets-filters-nginx-plus/deploy.yaml +++ b/deploy/snippets-filters-nginx-plus/deploy.yaml @@ -11,7 +11,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -21,7 +21,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -143,7 +143,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -168,7 +168,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -178,7 +178,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -203,7 +203,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -251,8 +251,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -290,8 +290,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:edge - imagePullPolicy: Always + - image: private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -345,8 +345,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -400,7 +400,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -411,7 +411,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/deploy/snippets-filters/deploy.yaml b/deploy/snippets-filters/deploy.yaml index 8f220c8fe3..3d12687f72 100644 --- a/deploy/snippets-filters/deploy.yaml +++ b/deploy/snippets-filters/deploy.yaml @@ -9,7 +9,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway --- @@ -19,7 +19,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway rules: - apiGroups: @@ -135,7 +135,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway roleRef: apiGroup: rbac.authorization.k8s.io @@ -155,7 +155,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-includes-bootstrap namespace: nginx-gateway --- @@ -165,7 +165,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -190,7 +190,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway namespace: nginx-gateway spec: @@ -236,8 +236,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: nginx-gateway ports: - containerPort: 9113 @@ -275,8 +275,8 @@ spec: name: nginx-run - mountPath: /etc/nginx/includes name: nginx-includes - - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:edge - imagePullPolicy: Always + - image: ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0 + imagePullPolicy: IfNotPresent name: nginx ports: - containerPort: 80 @@ -322,8 +322,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.uid - image: ghcr.io/nginx/nginx-gateway-fabric:edge - imagePullPolicy: Always + image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 + imagePullPolicy: IfNotPresent name: init securityContext: capabilities: @@ -372,7 +372,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx spec: controllerName: gateway.nginx.org/nginx-gateway-controller @@ -383,7 +383,7 @@ metadata: labels: app.kubernetes.io/instance: nginx-gateway app.kubernetes.io/name: nginx-gateway - app.kubernetes.io/version: edge + app.kubernetes.io/version: 1.6.0 name: nginx-gateway-config namespace: nginx-gateway spec: diff --git a/site/content/how-to/monitoring/prometheus.md b/site/content/how-to/monitoring/prometheus.md index 31fca23e9f..17746ba719 100644 --- a/site/content/how-to/monitoring/prometheus.md +++ b/site/content/how-to/monitoring/prometheus.md @@ -102,11 +102,11 @@ You can configure monitoring metrics for NGINX Gateway Fabric using Helm or Mani ### Using Helm -If you're setting up NGINX Gateway Fabric with Helm, you can adjust the `metrics.*` parameters to fit your needs. For detailed options and instructions, see the [Helm README](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/charts/nginx-gateway-fabric/README.md). +If you're setting up NGINX Gateway Fabric with Helm, you can adjust the `metrics.*` parameters to fit your needs. For detailed options and instructions, see the [Helm README](https://github.com/nginx/nginx-gateway-fabric/blob/v1.6.0/charts/nginx-gateway-fabric/README.md). ### Using Kubernetes manifests -For setups using Kubernetes manifests, change the metrics configuration by editing the NGINX Gateway Fabric manifest that you want to deploy. You can find some examples in the [deploy](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/deploy) directory. +For setups using Kubernetes manifests, change the metrics configuration by editing the NGINX Gateway Fabric manifest that you want to deploy. You can find some examples in the [deploy](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.0/deploy) directory. #### Disabling metrics diff --git a/site/content/how-to/traffic-management/advanced-routing.md b/site/content/how-to/traffic-management/advanced-routing.md index 25bfa34746..cdac87aa6b 100644 --- a/site/content/how-to/traffic-management/advanced-routing.md +++ b/site/content/how-to/traffic-management/advanced-routing.md @@ -45,7 +45,7 @@ The goal is to create a set of rules that will result in client requests being s Begin by deploying the `coffee-v1` and `coffee-v2` applications: ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/advanced-routing/coffee.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/advanced-routing/coffee.yaml ``` --- @@ -173,7 +173,7 @@ Let's deploy a different set of applications now called `tea` and `tea-post`. Th ### Deploy the Tea applications ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/advanced-routing/tea.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/advanced-routing/tea.yaml ``` --- diff --git a/site/content/how-to/traffic-management/client-settings.md b/site/content/how-to/traffic-management/client-settings.md index 4d7b93c0e7..ea644a827e 100644 --- a/site/content/how-to/traffic-management/client-settings.md +++ b/site/content/how-to/traffic-management/client-settings.md @@ -45,19 +45,19 @@ For all the possible configuration options for `ClientSettingsPolicy`, see the [ - Create the coffee and tea example applications: ```yaml - kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/client-settings-policy/app.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/client-settings-policy/app.yaml ``` - Create a Gateway: ```yaml - kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/client-settings-policy/gateway.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/client-settings-policy/gateway.yaml ``` - Create HTTPRoutes for the coffee and tea applications: ```yaml - kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/client-settings-policy/httproutes.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/client-settings-policy/httproutes.yaml ``` - Test the configuration: diff --git a/site/content/how-to/traffic-management/request-response-headers.md b/site/content/how-to/traffic-management/request-response-headers.md index 752047964b..f782f30967 100644 --- a/site/content/how-to/traffic-management/request-response-headers.md +++ b/site/content/how-to/traffic-management/request-response-headers.md @@ -67,7 +67,7 @@ This examples demonstrates how to configure traffic routing for a simple echo se Begin by deploying the example application `headers`. It is a simple application that returns the request headers which will be modified later. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/http-request-header-filter/headers.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/http-request-header-filter/headers.yaml ``` This will create the headers Service and a Deployment with one Pod. Run the following command to verify the resources were created: @@ -179,7 +179,7 @@ kubectl delete httproutes.gateway.networking.k8s.io headers ``` ```shell -kubectl delete -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/http-request-header-filter/headers.yaml +kubectl delete -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/http-request-header-filter/headers.yaml ``` ## ResponseHeaderModifier example @@ -191,7 +191,7 @@ Begin by configuring an application with custom headers and a simple HTTPRoute. Begin by deploying the example application `headers`. It is a simple application that adds response headers that will be modified later. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/http-response-header-filter/headers.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/http-response-header-filter/headers.yaml ``` This will create the headers Service and a Deployment with one Pod. Run the following command to verify the resources were created: diff --git a/site/content/how-to/traffic-management/snippets.md b/site/content/how-to/traffic-management/snippets.md index 8a7197b5ce..631efc6038 100644 --- a/site/content/how-to/traffic-management/snippets.md +++ b/site/content/how-to/traffic-management/snippets.md @@ -73,19 +73,19 @@ We have outlined a few best practices to keep in mind when using `SnippetsFilter - Create the coffee and tea example applications: ```yaml - kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/snippets-filter/app.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/snippets-filter/app.yaml ``` - Create a Gateway: ```yaml - kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/snippets-filter/gateway.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/snippets-filter/gateway.yaml ``` - Create HTTPRoutes for the coffee and tea applications: ```yaml - kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/examples/snippets-filter/httproutes.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/examples/snippets-filter/httproutes.yaml ``` - Test the configuration: diff --git a/site/content/how-to/traffic-management/upgrade-apps-without-downtime.md b/site/content/how-to/traffic-management/upgrade-apps-without-downtime.md index 59a821c4b7..7d802ceb3d 100644 --- a/site/content/how-to/traffic-management/upgrade-apps-without-downtime.md +++ b/site/content/how-to/traffic-management/upgrade-apps-without-downtime.md @@ -66,7 +66,7 @@ For example, an application can be exposed using a routing rule like below: port: 80 ``` -{{< note >}}See the [Cafe example](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/examples/cafe-example) for a basic example.{{< /note >}} +{{< note >}}See the [Cafe example](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.0/examples/cafe-example) for a basic example.{{< /note >}} The upgrade methods in the next sections cover: @@ -137,4 +137,4 @@ By updating the rule you can further increase the share of traffic the new versi weight: 1 ``` -See the [Traffic splitting example](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/examples/traffic-splitting) from our repository. +See the [Traffic splitting example](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.0/examples/traffic-splitting) from our repository. diff --git a/site/content/includes/installation/install-gateway-api-experimental-features.md b/site/content/includes/installation/install-gateway-api-experimental-features.md index 4341e080df..6d40ecb564 100644 --- a/site/content/includes/installation/install-gateway-api-experimental-features.md +++ b/site/content/includes/installation/install-gateway-api-experimental-features.md @@ -10,7 +10,7 @@ To use Gateway API experimental resources, the Gateway API resources from the ex To install the Gateway API resources from the experimental channel, run the following: ```shell -kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.6.0" | kubectl apply -f - ``` {{< note >}}If you plan to use the `edge` version of NGINX Gateway Fabric, you can replace the version in `ref` with `main`, for example `ref=main`. {{}} diff --git a/site/content/includes/installation/install-gateway-api-resources.md b/site/content/includes/installation/install-gateway-api-resources.md index cfaaf35cab..0673fabd68 100644 --- a/site/content/includes/installation/install-gateway-api-resources.md +++ b/site/content/includes/installation/install-gateway-api-resources.md @@ -2,12 +2,12 @@ docs: "DOCS-1438" --- -{{< note >}} The [Gateway API resources](https://github.com/kubernetes-sigs/gateway-api) from the standard channel must be installed before deploying NGINX Gateway Fabric. If they are already installed in your cluster, please ensure they are the correct version as supported by the NGINX Gateway Fabric - [see the Technical Specifications](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/README.md#technical-specifications). {{}} +{{< note >}} The [Gateway API resources](https://github.com/kubernetes-sigs/gateway-api) from the standard channel must be installed before deploying NGINX Gateway Fabric. If they are already installed in your cluster, please ensure they are the correct version as supported by the NGINX Gateway Fabric - [see the Technical Specifications](https://github.com/nginx/nginx-gateway-fabric/blob/v1.6.0/README.md#technical-specifications). {{}} To install the Gateway API resources, run the following: ```shell -kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.6.0" | kubectl apply -f - ``` {{< note >}}If you plan to use the `edge` version of NGINX Gateway Fabric, you can replace the version in `ref` with `main`, for example `ref=main`.{{}} @@ -18,7 +18,7 @@ NGINX Gateway Fabric currently supports a subset of the additional features prov To install from the experimental channel, run the following: ```shell -kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.6.0" | kubectl apply -f - ``` {{< note >}} To learn more about what Gateway API resources NGINX Gateway Fabric currently supports, visit our [Gateway API Compatibility]({{< relref "overview/gateway-api-compatibility.md" >}}) document. {{}} diff --git a/site/content/includes/installation/uninstall-gateway-api-resources.md b/site/content/includes/installation/uninstall-gateway-api-resources.md index b71549a610..180b3601fb 100644 --- a/site/content/includes/installation/uninstall-gateway-api-resources.md +++ b/site/content/includes/installation/uninstall-gateway-api-resources.md @@ -7,11 +7,11 @@ docs: "DOCS-1436" To uninstall the Gateway API resources, run the following: ```shell -kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl delete -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.6.0" | kubectl delete -f - ``` Alternatively, if you installed the Gateway APIs from the experimental channel, run the following: ```shell -kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl delete -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.6.0" | kubectl delete -f - ``` diff --git a/site/content/installation/building-the-images.md b/site/content/installation/building-the-images.md index 5170ce7736..070cb12391 100644 --- a/site/content/installation/building-the-images.md +++ b/site/content/installation/building-the-images.md @@ -26,7 +26,7 @@ If building the NGINX Plus image, you will also need a valid NGINX Plus license 1. Clone the repo and change into the `nginx-gateway-fabric` directory: ```shell - git clone https://github.com/nginx/nginx-gateway-fabric.git --branch v1.5.1 + git clone https://github.com/nginx/nginx-gateway-fabric.git --branch v1.6.0 cd nginx-gateway-fabric ``` @@ -62,20 +62,20 @@ If building the NGINX Plus image, you will also need a valid NGINX Plus license ``` Set the `PREFIX` variable to the name of the registry you'd like to push the image to. By default, the images will be - named `nginx-gateway-fabric:1.5.1` and `nginx-gateway-fabric/nginx:1.5.1` or `nginx-gateway-fabric/nginx-plus:1.5.1`. + named `nginx-gateway-fabric:1.6.0` and `nginx-gateway-fabric/nginx:1.6.0` or `nginx-gateway-fabric/nginx-plus:1.6.0`. 1. Push the images to your container registry: ```shell - docker push myregistry.example.com/nginx-gateway-fabric:1.5.1 - docker push myregistry.example.com/nginx-gateway-fabric/nginx:1.5.1 + docker push myregistry.example.com/nginx-gateway-fabric:1.6.0 + docker push myregistry.example.com/nginx-gateway-fabric/nginx:1.6.0 ``` or ```shell - docker push myregistry.example.com/nginx-gateway-fabric:1.5.1 - docker push myregistry.example.com/nginx-gateway-fabric/nginx-plus:1.5.1 + docker push myregistry.example.com/nginx-gateway-fabric:1.6.0 + docker push myregistry.example.com/nginx-gateway-fabric/nginx-plus:1.6.0 ``` Make sure to substitute `myregistry.example.com/nginx-gateway-fabric` with your registry. diff --git a/site/content/installation/installing-ngf/helm.md b/site/content/installation/installing-ngf/helm.md index 09845dbd01..a9a39f8ab2 100644 --- a/site/content/installation/installing-ngf/helm.md +++ b/site/content/installation/installing-ngf/helm.md @@ -158,7 +158,7 @@ helm install ngf oci://ghcr.io/nginx/charts/nginx-gateway-fabric --create-namesp #### Examples -You can find several examples of configuration options of the `values.yaml` file in the [helm examples](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/examples/helm) directory. +You can find several examples of configuration options of the `values.yaml` file in the [helm examples](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.0/examples/helm) directory. ### Access NGINX Gateway Fabric @@ -179,13 +179,13 @@ To upgrade your Gateway API resources, take the following steps: - To upgrade the Gateway API resources, run: ```shell - kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - + kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.6.0" | kubectl apply -f - ``` or, if you installed the from the experimental channel: ```shell - kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - + kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.6.0" | kubectl apply -f - ``` ### Upgrade NGINX Gateway Fabric CRDs @@ -199,7 +199,7 @@ To upgrade the CRDs, take the following steps: 2. Upgrade the CRDs: ```shell - kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/crds.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/crds.yaml ``` {{}}Ignore the following warning, as it is expected.{{}} @@ -318,7 +318,7 @@ Follow these steps to uninstall NGINX Gateway Fabric and Gateway API from your K ```shell kubectl delete ns nginx-gateway - kubectl delete -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/crds.yaml + kubectl delete -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/crds.yaml ``` 3. **Remove the Gateway API resources:** @@ -327,4 +327,4 @@ Follow these steps to uninstall NGINX Gateway Fabric and Gateway API from your K ## Additional configuration -For a full list of the Helm Chart configuration parameters, read [the NGINX Gateway Fabric Helm Chart](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/charts/nginx-gateway-fabric/README.md#configuration). +For a full list of the Helm Chart configuration parameters, read [the NGINX Gateway Fabric Helm Chart](https://github.com/nginx/nginx-gateway-fabric/blob/v1.6.0/charts/nginx-gateway-fabric/README.md#configuration). diff --git a/site/content/installation/installing-ngf/manifests.md b/site/content/installation/installing-ngf/manifests.md index 255125f128..f1af32f8ab 100644 --- a/site/content/installation/installing-ngf/manifests.md +++ b/site/content/installation/installing-ngf/manifests.md @@ -53,7 +53,7 @@ Deploying NGINX Gateway Fabric with Kubernetes manifests takes only a few steps. #### Stable release ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/crds.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/crds.yaml ``` #### Edge version @@ -73,7 +73,7 @@ kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/ma Deploys NGINX Gateway Fabric with NGINX OSS. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/default/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/default/deploy.yaml ``` {{% /tab %}} @@ -83,7 +83,7 @@ kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1 Deploys NGINX Gateway Fabric with NGINX OSS and an AWS Network Load Balancer service. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/aws-nlb/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/aws-nlb/deploy.yaml ``` {{% /tab %}} @@ -93,7 +93,7 @@ kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1 Deploys NGINX Gateway Fabric with NGINX OSS and `nodeSelector` to deploy on Linux nodes. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/azure/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/azure/deploy.yaml ``` {{% /tab %}} @@ -105,7 +105,7 @@ NGINX Plus Docker registry, and the `imagePullSecretName` is the name of the Sec The NGINX Plus JWT Secret used to run NGINX Plus is also specified in a volume mount and the `--usage-report-secret` parameter. These Secrets are created as part of the [Before you begin](#before-you-begin) section. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/nginx-plus/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/nginx-plus/deploy.yaml ``` {{% /tab %}} @@ -115,7 +115,7 @@ kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1 Deploys NGINX Gateway Fabric with NGINX OSS and experimental features. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/experimental/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/experimental/deploy.yaml ``` {{< note >}} Requires the Gateway APIs installed from the experimental channel. {{< /note >}} @@ -129,7 +129,7 @@ NGINX Plus Docker registry, and the `imagePullSecretName` is the name of the Sec The NGINX Plus JWT Secret used to run NGINX Plus is also specified in a volume mount and the `--usage-report-secret` parameter. These Secrets are created as part of the [Before you begin](#before-you-begin) section. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/nginx-plus-experimental/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/nginx-plus-experimental/deploy.yaml ``` {{< note >}} Requires the Gateway APIs installed from the experimental channel. {{< /note >}} @@ -141,7 +141,7 @@ kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1 Deploys NGINX Gateway Fabric with NGINX OSS using a Service type of `NodePort`. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/nodeport/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/nodeport/deploy.yaml ``` {{% /tab %}} @@ -151,7 +151,7 @@ kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1 Deploys NGINX Gateway Fabric with NGINX OSS on OpenShift. ```shell -kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/openshift/deploy.yaml +kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/openshift/deploy.yaml ``` {{% /tab %}} @@ -193,13 +193,13 @@ To upgrade NGINX Gateway Fabric and get the latest features and improvements, ta - To upgrade the Gateway API resources, run: ```shell - kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - + kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.6.0" | kubectl apply -f - ``` or, if you installed the from the experimental channel: ```shell - kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - + kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.6.0" | kubectl apply -f - ``` 1. **Upgrade NGINX Gateway Fabric CRDs:** @@ -207,7 +207,7 @@ To upgrade NGINX Gateway Fabric and get the latest features and improvements, ta - To upgrade the Custom Resource Definitions (CRDs), run: ```shell - kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/crds.yaml + kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/crds.yaml ``` 1. **Upgrade NGINX Gateway Fabric deployment:** @@ -278,7 +278,7 @@ Follow these steps to uninstall NGINX Gateway Fabric and Gateway API from your K ``` ```shell - kubectl delete -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.5.1/deploy/crds.yaml + kubectl delete -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v1.6.0/deploy/crds.yaml ``` 1. **Remove the Gateway API resources:** diff --git a/site/content/installation/nginx-plus-jwt.md b/site/content/installation/nginx-plus-jwt.md index 9dd39f4e9e..e516e7098b 100644 --- a/site/content/installation/nginx-plus-jwt.md +++ b/site/content/installation/nginx-plus-jwt.md @@ -230,7 +230,7 @@ Replace the contents of `` with the contents of the JWT token itself. You can then pull the image: ```shell -docker pull private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:1.5.1 +docker pull private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:1.6.0 ``` Once you have successfully pulled the image, you can tag it as needed, then push it to a different container registry. diff --git a/site/content/overview/gateway-architecture.md b/site/content/overview/gateway-architecture.md index 12f68fb879..2f270fe947 100644 --- a/site/content/overview/gateway-architecture.md +++ b/site/content/overview/gateway-architecture.md @@ -21,7 +21,7 @@ NGINX Gateway Fabric is an open source project that provides an implementation o For a list of supported Gateway API resources and features, see the [Gateway API Compatibility]({{< relref "/overview/gateway-api-compatibility.md" >}}) documentation. -We have more information regarding our [design principles](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/docs/developer/design-principles.md) in the project's GitHub repository. +We have more information regarding our [design principles](https://github.com/nginx/nginx-gateway-fabric/blob/v1.6.0/docs/developer/design-principles.md) in the project's GitHub repository. ## NGINX Gateway Fabric at a high level @@ -72,7 +72,7 @@ The following list describes the connections, preceeded by their types in parent 1. (HTTPS) - Read: _NGF_ reads the _Kubernetes API_ to get the latest versions of the resources in the cluster. - - Write: _NGF_ writes to the _Kubernetes API_ to update the handled resources' statuses and emit events. If there's more than one replica of _NGF_ and [leader election](https://github.com/nginx/nginx-gateway-fabric/tree/v1.5.1/charts/nginx-gateway-fabric#configuration) is enabled, only the _NGF_ pod that is leading will write statuses to the _Kubernetes API_. + - Write: _NGF_ writes to the _Kubernetes API_ to update the handled resources' statuses and emit events. If there's more than one replica of _NGF_ and [leader election](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.0/charts/nginx-gateway-fabric#configuration) is enabled, only the _NGF_ pod that is leading will write statuses to the _Kubernetes API_. 1. (HTTP, HTTPS) _Prometheus_ fetches the `controller-runtime` and NGINX metrics via an HTTP endpoint that _NGF_ exposes (`:9113/metrics` by default). Prometheus is **not** required by NGINX Gateway Fabric, and its endpoint can be turned off. 1. (File I/O) - Write: _NGF_ generates NGINX _configuration_ based on the cluster resources and writes them as `.conf` files to the mounted `nginx-conf` volume, located at `/etc/nginx/conf.d`. It also writes _TLS certificates_ and _keys_ from [TLS secrets](https://kubernetes.io/docs/concepts/configuration/secret/#tls-secrets) referenced in the accepted Gateway resource to the `nginx-secrets` volume at the path `/etc/nginx/secrets`. @@ -86,7 +86,7 @@ The following list describes the connections, preceeded by their types in parent 1. (File I/O) - Write: The _NGINX master_ writes to the auxiliary Unix sockets folder, which is located in the `/var/run/nginx` directory. - - Read: The _NGINX master_ reads the `nginx.conf` file from the `/etc/nginx` directory. This [file](https://github.com/nginx/nginx-gateway-fabric/blob/v1.5.1/internal/mode/static/nginx/conf/nginx.conf) contains the global and http configuration settings for NGINX. In addition, _NGINX master_ reads the NJS modules referenced in the configuration when it starts or during a reload. NJS modules are stored in the `/usr/lib/nginx/modules` directory. + - Read: The _NGINX master_ reads the `nginx.conf` file from the `/etc/nginx` directory. This [file](https://github.com/nginx/nginx-gateway-fabric/blob/v1.6.0/internal/mode/static/nginx/conf/nginx.conf) contains the global and http configuration settings for NGINX. In addition, _NGINX master_ reads the NJS modules referenced in the configuration when it starts or during a reload. NJS modules are stored in the `/usr/lib/nginx/modules` directory. 1. (File I/O) The _NGINX master_ sends logs to its _stdout_ and _stderr_, which are collected by the container runtime. 1. (File I/O) An _NGINX worker_ writes logs to its _stdout_ and _stderr_, which are collected by the container runtime. 1. (Signal) The _NGINX master_ controls the [lifecycle of _NGINX workers_](https://nginx.org/en/docs/control.html#reconfiguration) it creates workers with the new configuration and shutdowns workers with the old configuration. From c5a52cf19e9f0f050741d5c74645a20442b4dd16 Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Tue, 14 Jan 2025 16:33:34 -0800 Subject: [PATCH 2/9] Update version tag in provisioner manifest --- tests/conformance/provisioner/provisioner.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conformance/provisioner/provisioner.yaml b/tests/conformance/provisioner/provisioner.yaml index 07ebae4a45..a1caf752cd 100644 --- a/tests/conformance/provisioner/provisioner.yaml +++ b/tests/conformance/provisioner/provisioner.yaml @@ -68,7 +68,7 @@ spec: spec: serviceAccountName: nginx-gateway-provisioner containers: - - image: ghcr.io/nginx/nginx-gateway-fabric:edge + - image: ghcr.io/nginx/nginx-gateway-fabric:1.6.0 imagePullPolicy: Always name: nginx-gateway-provisioner securityContext: From 4d8b53c26d2508743888549cbd38a72a8dce53ea Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Tue, 14 Jan 2025 16:34:29 -0800 Subject: [PATCH 3/9] Update version tag in getting started guide --- site/content/get-started.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/content/get-started.md b/site/content/get-started.md index de4e75f39b..13bc1de073 100644 --- a/site/content/get-started.md +++ b/site/content/get-started.md @@ -88,7 +88,7 @@ make create-kind-cluster Use `kubectl` to add the API resources for NGINX Gateway Fabric with the following command: ```shell -kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/standard?ref=v1.6.0" | kubectl apply -f - ``` ```text @@ -103,7 +103,7 @@ customresourcedefinition.apiextensions.k8s.io/referencegrants.gateway.networking To use experimental features, you'll need to install the API resources from the experimental channel instead. ```shell -kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.5.1" | kubectl apply -f - +kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gateway-api/experimental?ref=v1.6.0" | kubectl apply -f - ``` {{< /note >}} @@ -119,7 +119,7 @@ helm install ngf oci://ghcr.io/nginx/charts/nginx-gateway-fabric --create-namesp ``` ```text -Pulled: ghcr.io/nginx/charts/nginx-gateway-fabric:1.5.1 +Pulled: ghcr.io/nginx/charts/nginx-gateway-fabric:1.6.0 Digest: sha256:9bbd1a2fcbfd5407ad6be39f796f582e6263512f1f3a8969b427d39063cc6fee NAME: ngf LAST DEPLOYED: Mon Oct 21 14:45:14 2024 @@ -157,7 +157,7 @@ metadata: labels: app.kubernetes.io/name: nginx-gateway-fabric app.kubernetes.io/instance: ngf - app.kubernetes.io/version: "1.5.1" + app.kubernetes.io/version: "1.6.0" spec: type: NodePort selector: From 1dbae9c8b3073bb00ad8368ff434eaf9dec70086 Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Tue, 14 Jan 2025 16:38:25 -0800 Subject: [PATCH 4/9] Update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6170d72a81..b9e3d3f63b 100644 --- a/README.md +++ b/README.md @@ -67,6 +67,7 @@ The following table lists the software versions NGINX Gateway Fabric supports. | NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | |----------------------|-------------|------------|-----------|------------| | Edge | 1.2.1 | 1.25+ | 1.27.3 | R33 | +| 1.6.0 | 1.2.1 | 1.25+ | 1.27.3 | R33 | | 1.5.1 | 1.2.0 | 1.25+ | 1.27.2 | R33 | | 1.5.0 | 1.2.0 | 1.25+ | 1.27.2 | R33 | | 1.4.0 | 1.1.0 | 1.25+ | 1.27.1 | R32 | From 64cb959fe5446310d2c725e57029f872e754347b Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Wed, 15 Jan 2025 09:04:19 -0800 Subject: [PATCH 5/9] Update CHANGELOG --- CHANGELOG.md | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9bad8afa8..07ef473419 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,50 +6,44 @@ and includes links to all PRs that went into the release. ## Release 1.6.0 -* NGINX Plus R33 support by @sjberman in https://github.com/nginx/nginx-gateway-fabric/pull/2760 -* Update ObservabilityPolicy API to have minimum one target ref by @salonichf5 in https://github.com/nginx/nginx-gateway-fabric/pull/2753 -* Use state file for updating N+ upstreams by @sjberman in https://github.com/nginx/nginx-gateway-fabric/pull/2897 -* Add guide for UpstreamSettingsPolicy by @kate-osborn in https://github.com/nginx/nginx-gateway-fabric/pull/2987 - -%%DATE%% +_January 15, 2025_ FEATURES: -- +- Add UpstreamSetttingsPolicy. [2941](https://github.com/nginx/nginx-gateway-fabric/pull/2941) +- Add path support for RequestRedirect Filter. [2979](https://github.com/nginx/nginx-gateway-fabric/pull/2979) BUG FIXES: -- +- Fix rewrite path for ReplacePrefixMatch to parse request arguments correctly. [2951](https://github.com/nginx/nginx-gateway-fabric/pull/2951) DOCUMENTATION: -- +- Docs: Update support referencing support package tool. [2789](https://github.com/nginx/nginx-gateway-fabric/pull/2789). Thanks to [mrajagopal](https://github.com/mrajagopal). +- Add guide for UpstreamSettingsPolicy. [2987](https://github.com/nginx/nginx-gateway-fabric/pull/2987) HELM CHART: - The version of the Helm chart is now 1.6.0 -- UPGRADE: -- - -KNOWN ISSUES: - -- +- The Gateway API version has been updated to 1.2.1. [2868](https://github.com/nginx/nginx-gateway-fabric/pull/2868) +- ObservabilityPolicy API version has been increased to `v1alpha2` due to a strengthening of validation rules. [2998](https://github.com/nginx/nginx-gateway-fabric/pull/2998) COMPATIBILITY: -- Gateway API version: `` -- NGINX version: `` -- NGINX Plus version: `` -- Kubernetes version: `` +- Gateway API version: `1.2.1` +- NGINX version: `1.27.3` +- NGINX Plus version: `R33` +- Kubernetes version: `1.25+` CONTAINER IMAGES: - Control plane: `ghcr.io/nginx/nginx-gateway-fabric:1.6.0` - Data plane: `ghcr.io/nginx/nginx-gateway-fabric/nginx:1.6.0` - Data plane with NGINX Plus: `private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:1.6.0` + ## Release 1.5.1 _December 16, 2024_ From 61352adc310a47dc0dd10aa9dc674ee6df4814ba Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Wed, 15 Jan 2025 09:20:29 -0800 Subject: [PATCH 6/9] Add more to CHANGELOG --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07ef473419..2196e98d0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,17 +10,20 @@ _January 15, 2025_ FEATURES: -- Add UpstreamSetttingsPolicy. [2941](https://github.com/nginx/nginx-gateway-fabric/pull/2941) +- Add UpstreamSettingsPolicy to allow users to configure upstream settings for Services. [2941](https://github.com/nginx/nginx-gateway-fabric/pull/2941) - Add path support for RequestRedirect Filter. [2979](https://github.com/nginx/nginx-gateway-fabric/pull/2979) +- Use state files for NGINX Plus upstream servers instead of the NGINX config. [2897](https://github.com/nginx/nginx-gateway-fabric/pull/2897) BUG FIXES: - Fix rewrite path for ReplacePrefixMatch to parse request arguments correctly. [2951](https://github.com/nginx/nginx-gateway-fabric/pull/2951) +- Fix an issue where updating upstreams with the NGINX Plus API would not occur if metrics were disabled. [2897](https://github.com/nginx/nginx-gateway-fabric/pull/2897) +- Support updating stream upstreams with the NGINX Plus API instead of reloading NGINX. [2897](https://github.com/nginx/nginx-gateway-fabric/pull/2897) DOCUMENTATION: - Docs: Update support referencing support package tool. [2789](https://github.com/nginx/nginx-gateway-fabric/pull/2789). Thanks to [mrajagopal](https://github.com/mrajagopal). -- Add guide for UpstreamSettingsPolicy. [2987](https://github.com/nginx/nginx-gateway-fabric/pull/2987) +- Add how-to guide for configuring upstream settings for services using the UpstreamSettingsPolicy API. [2987](https://github.com/nginx/nginx-gateway-fabric/pull/2987) HELM CHART: From ee357ccbc7dfa9aff8106a5a85be62e3f431313d Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Wed, 15 Jan 2025 09:53:41 -0800 Subject: [PATCH 7/9] Revert "Merge branch 'release-1.6' into docs/release-1.6.0" This reverts commit 58e41565fab1d7d9f6e4f7abd6462554edfd1eda, reversing changes made to 2d202abceb7a1d48a795126ec09501f0c3237224. --- .github/workflows/dependency-review.yml | 2 +- .github/workflows/labeler.yml | 2 +- README.md | 2 +- apis/v1alpha2/policy_methods.go | 2 +- design/archive/gateway-evaluation.md | 2 +- examples/grpc-routing/helloworld.yaml | 4 ++-- go.mod | 10 +++++----- go.sum | 20 +++++++++---------- internal/mode/static/manager.go | 2 +- internal/mode/static/telemetry/collector.go | 6 +++--- .../mode/static/telemetry/collector_test.go | 2 +- .../telemetry/data_attributes_generated.go | 2 +- internal/mode/static/telemetry/data_test.go | 2 +- internal/mode/static/telemetry/exporter.go | 2 +- .../mode/static/telemetry/job_worker_test.go | 2 +- .../ngfresourcecounts_attributes_generated.go | 2 +- .../telemetry/telemetryfakes/fake_exporter.go | 2 +- renovate.json | 2 +- site/content/how-to/monitoring/prometheus.md | 2 +- site/content/overview/nginx-plus.md | 2 +- tests/conformance/conformance_test.go | 2 +- tests/go.mod | 8 ++++---- tests/go.sum | 16 +++++++-------- tests/scripts/vars.env-example | 2 +- .../clientsettings/grpc-backend.yaml | 2 +- .../snippets-filter/grpc-backend.yaml | 2 +- .../grpc-backend.yaml | 2 +- 27 files changed, 53 insertions(+), 53 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index deac9b8e49..3959740a8c 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -17,4 +17,4 @@ jobs: - name: "Dependency Review" uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 with: - config-file: "nginx/k8s-common/dependency-review-config.yml@main" + config-file: "nginxinc/k8s-common/dependency-review-config.yml@main" diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 84dfca8c9c..23a95b4492 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -17,7 +17,7 @@ jobs: sparse-checkout: | labeler.yml sparse-checkout-cone-mode: false - repository: nginx/k8s-common + repository: nginxinc/k8s-common - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 with: diff --git a/README.md b/README.md index b9e3d3f63b..d04337d2ea 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/nginx/nginx-gateway-fabric/badge)](https://scorecard.dev/viewer/?uri=github.com/nginx/nginx-gateway-fabric) -[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fnginx-gateway-fabric.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fnginx-gateway-fabric?ref=badge_shield) +[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-fabric.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-fabric?ref=badge_shield) [![Continuous Integration](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/ci.yml/badge.svg)](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/ci.yml) [![Go Report Card](https://goreportcard.com/badge/github.com/nginx/nginx-gateway-fabric)](https://goreportcard.com/report/github.com/nginx/nginx-gateway-fabric) [![codecov](https://codecov.io/gh/nginx/nginx-gateway-fabric/graph/badge.svg?token=32ULC8F13Z)](https://codecov.io/gh/nginx/nginx-gateway-fabric) diff --git a/apis/v1alpha2/policy_methods.go b/apis/v1alpha2/policy_methods.go index b5e59a0ff5..8fc6dc768d 100644 --- a/apis/v1alpha2/policy_methods.go +++ b/apis/v1alpha2/policy_methods.go @@ -4,7 +4,7 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" ) -// FIXME(kate-osborn): https://github.com/nginx/nginx-gateway-fabric/issues/1939. +// FIXME(kate-osborn): https://github.com/nginxinc/nginx-gateway-fabric/issues/1939. // Figure out a way to generate these methods for all our policies. // These methods implement the policies.Policy interface which extends client.Object to add the following methods. diff --git a/design/archive/gateway-evaluation.md b/design/archive/gateway-evaluation.md index ddacb07ee2..d3da2f1801 100644 --- a/design/archive/gateway-evaluation.md +++ b/design/archive/gateway-evaluation.md @@ -75,7 +75,7 @@ between an ingress point and the final backend Pod endpoints. Required supplemen ### Non-Goals -- Replace or supplant current [NGINX Ingress Controller](https://github.com/nginx/kubernetes-ingress) (NIC) use-cases +- Replace or supplant current [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress) (NIC) use-cases and will not work to achieve feature parity. - The Gateway evaluation will not support Ingress v1 APIs or the set of NIC CRDs (e.g. VirtualServer and VirtualServerRoute). diff --git a/examples/grpc-routing/helloworld.yaml b/examples/grpc-routing/helloworld.yaml index 1e8157900f..e2510ed52b 100644 --- a/examples/grpc-routing/helloworld.yaml +++ b/examples/grpc-routing/helloworld.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-infra-backend-v1 - image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 + image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 env: - name: POD_NAME valueFrom: @@ -68,7 +68,7 @@ spec: spec: containers: - name: grpc-infra-backend-v2 - image: ghcr.io/nginx/kic-test-grpc-server:edge + image: ghcr.io/nginxinc/kic-test-grpc-server:edge env: - name: POD_NAME valueFrom: diff --git a/go.mod b/go.mod index 4caaf4053e..dc622a593a 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,9 @@ require ( github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 - github.com/nginx/telemetry-exporter v0.1.3 github.com/nginxinc/nginx-plus-go-client v1.3.0 github.com/nginxinc/nginx-prometheus-exporter v1.3.0 + github.com/nginxinc/telemetry-exporter v0.1.2 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 github.com/prometheus/client_golang v1.20.5 @@ -71,14 +71,14 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.34.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.29.0 // indirect - golang.org/x/term v0.28.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/term v0.27.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect - golang.org/x/tools v0.29.0 // indirect + golang.org/x/tools v0.28.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect diff --git a/go.sum b/go.sum index bade937608..7da43fa839 100644 --- a/go.sum +++ b/go.sum @@ -81,12 +81,12 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nginx/telemetry-exporter v0.1.3 h1:aGuUWMRSf2nA9fOH+AQ8I+hdoq0Hz6wgttLBG/SzsvI= -github.com/nginx/telemetry-exporter v0.1.3/go.mod h1:hVH3DhumaKkGOWLiFLvZj+UWjLNoPXoXvoiNiUI0WxQ= github.com/nginxinc/nginx-plus-go-client v1.3.0 h1:q/aeT4B5k0KLwWlefoBzfLfraBBvIKLuDg+lLFWAo4I= github.com/nginxinc/nginx-plus-go-client v1.3.0/go.mod h1:n8OFLzrJulJ2fur28Cwa1Qp5DZNS2VicLV+Adt30LQ4= github.com/nginxinc/nginx-prometheus-exporter v1.3.0 h1:1JtdxsZH0Uwhu1nL/j/QyOXytP5V5j68AEo2X+DFWb0= github.com/nginxinc/nginx-prometheus-exporter v1.3.0/go.mod h1:hXoH+X6aIKSyQuO6QTIiPKH3eZyxqy/wW8GYiE3dflU= +github.com/nginxinc/telemetry-exporter v0.1.2 h1:97vUGhQYgQ2KEsXKCBmr5gqfuujJCKPHwdg5HKoANUs= +github.com/nginxinc/telemetry-exporter v0.1.2/go.mod h1:eKa/Ceh9irmyZ1xV2QxBIxduIyVC5RlmtiWwcTlHuMg= github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU= github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk= github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= @@ -156,8 +156,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -168,10 +168,10 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= -golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= @@ -182,8 +182,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= -golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= +golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= +golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/mode/static/manager.go b/internal/mode/static/manager.go index 6ab99b4516..02ecd670eb 100644 --- a/internal/mode/static/manager.go +++ b/internal/mode/static/manager.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-logr/logr" - tel "github.com/nginx/telemetry-exporter/pkg/telemetry" + tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/mode/static/telemetry/collector.go b/internal/mode/static/telemetry/collector.go index a349475a36..f781852119 100644 --- a/internal/mode/static/telemetry/collector.go +++ b/internal/mode/static/telemetry/collector.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - tel "github.com/nginx/telemetry-exporter/pkg/telemetry" + tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -39,7 +39,7 @@ type ConfigurationGetter interface { // Data is telemetry data. // -//go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=Data -scheme -scheme-protocol=NGFProductTelemetry -scheme-df-datatype=ngf-product-telemetry +//go:generate go run -tags generator github.com/nginxinc/telemetry-exporter/cmd/generator -type=Data -scheme -scheme-protocol=NGFProductTelemetry -scheme-df-datatype=ngf-product-telemetry type Data struct { // ImageSource tells whether the image was built by GitHub or locally (values are 'gha', 'local', or 'unknown') ImageSource string @@ -66,7 +66,7 @@ type Data struct { // NGFResourceCounts stores the counts of all relevant resources that NGF processes and generates configuration from. // -//go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=NGFResourceCounts +//go:generate go run -tags generator github.com/nginxinc/telemetry-exporter/cmd/generator -type=NGFResourceCounts type NGFResourceCounts struct { // GatewayCount is the number of relevant Gateways. GatewayCount int64 diff --git a/internal/mode/static/telemetry/collector_test.go b/internal/mode/static/telemetry/collector_test.go index 506bfa0c9e..7a69dbeb3a 100644 --- a/internal/mode/static/telemetry/collector_test.go +++ b/internal/mode/static/telemetry/collector_test.go @@ -6,7 +6,7 @@ import ( "reflect" "runtime" - tel "github.com/nginx/telemetry-exporter/pkg/telemetry" + tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/mode/static/telemetry/data_attributes_generated.go b/internal/mode/static/telemetry/data_attributes_generated.go index 553925b0fd..da061512a3 100644 --- a/internal/mode/static/telemetry/data_attributes_generated.go +++ b/internal/mode/static/telemetry/data_attributes_generated.go @@ -7,7 +7,7 @@ This is a generated file. DO NOT EDIT. import ( "go.opentelemetry.io/otel/attribute" - ngxTelemetry "github.com/nginx/telemetry-exporter/pkg/telemetry" + ngxTelemetry "github.com/nginxinc/telemetry-exporter/pkg/telemetry" ) func (d *Data) Attributes() []attribute.KeyValue { diff --git a/internal/mode/static/telemetry/data_test.go b/internal/mode/static/telemetry/data_test.go index d2dfe9516b..d0fe63820a 100644 --- a/internal/mode/static/telemetry/data_test.go +++ b/internal/mode/static/telemetry/data_test.go @@ -3,7 +3,7 @@ package telemetry import ( "testing" - tel "github.com/nginx/telemetry-exporter/pkg/telemetry" + tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" . "github.com/onsi/gomega" "go.opentelemetry.io/otel/attribute" ) diff --git a/internal/mode/static/telemetry/exporter.go b/internal/mode/static/telemetry/exporter.go index 21c7c99c38..1c86ac61fb 100644 --- a/internal/mode/static/telemetry/exporter.go +++ b/internal/mode/static/telemetry/exporter.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-logr/logr" - tel "github.com/nginx/telemetry-exporter/pkg/telemetry" + tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" ) // Exporter exports telemetry data to some destination. diff --git a/internal/mode/static/telemetry/job_worker_test.go b/internal/mode/static/telemetry/job_worker_test.go index 770af9892c..c331473cf8 100644 --- a/internal/mode/static/telemetry/job_worker_test.go +++ b/internal/mode/static/telemetry/job_worker_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - tel "github.com/nginx/telemetry-exporter/pkg/telemetry" + tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/log/zap" diff --git a/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go b/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go index baddcd174d..343c6fd9ed 100644 --- a/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go +++ b/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go @@ -7,7 +7,7 @@ This is a generated file. DO NOT EDIT. import ( "go.opentelemetry.io/otel/attribute" - ngxTelemetry "github.com/nginx/telemetry-exporter/pkg/telemetry" + ngxTelemetry "github.com/nginxinc/telemetry-exporter/pkg/telemetry" ) func (d *NGFResourceCounts) Attributes() []attribute.KeyValue { diff --git a/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go b/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go index f854e50fe6..74207bd300 100644 --- a/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go +++ b/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" - telemetrya "github.com/nginx/telemetry-exporter/pkg/telemetry" + telemetrya "github.com/nginxinc/telemetry-exporter/pkg/telemetry" ) type FakeExporter struct { diff --git a/renovate.json b/renovate.json index 4c3271d6ce..cf3f466afe 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>nginx/k8s-common", + "github>nginxinc/k8s-common", "schedule:daily" ], "kubernetes": { diff --git a/site/content/how-to/monitoring/prometheus.md b/site/content/how-to/monitoring/prometheus.md index 17746ba719..009a917f82 100644 --- a/site/content/how-to/monitoring/prometheus.md +++ b/site/content/how-to/monitoring/prometheus.md @@ -72,7 +72,7 @@ NGINX Gateway Fabric provides a variety of metrics for monitoring and analyzing ### NGINX/NGINX Plus metrics -NGINX metrics cover specific NGINX operations such as the total number of accepted client connections. For a complete list of available NGINX/NGINX Plus metrics, refer to the [NGINX Prometheus Exporter developer docs](https://github.com/nginx/nginx-prometheus-exporter#exported-metrics). +NGINX metrics cover specific NGINX operations such as the total number of accepted client connections. For a complete list of available NGINX/NGINX Plus metrics, refer to the [NGINX Prometheus Exporter developer docs](https://github.com/nginxinc/nginx-prometheus-exporter#exported-metrics). These metrics use the `nginx_gateway_fabric` namespace and include the `class` label, indicating the NGINX Gateway class. For example, `nginx_gateway_fabric_connections_accepted{class="nginx"}`. diff --git a/site/content/overview/nginx-plus.md b/site/content/overview/nginx-plus.md index bc67839bf0..8e50c0b0e4 100644 --- a/site/content/overview/nginx-plus.md +++ b/site/content/overview/nginx-plus.md @@ -9,7 +9,7 @@ NGINX Gateway Fabric can use NGINX Open Source or NGINX Plus as its data plane. ## Benefits of NGINX Plus -- **Robust metrics**: A plethora of [additional Prometheus metrics](https://github.com/nginx/nginx-prometheus-exporter#metrics-for-nginx-plus) are available. +- **Robust metrics**: A plethora of [additional Prometheus metrics](https://github.com/nginxinc/nginx-prometheus-exporter#metrics-for-nginx-plus) are available. - **Live activity monitoring**: The [NGINX Plus dashboard]({{< relref "/how-to/monitoring/dashboard.md" >}}) shows real-time metrics and information about your server infrastructure. - **Dynamic upstream configuration**: NGINX Plus can dynamically reconfigure upstream servers when applications in Kubernetes scale up and down, preventing the need for an NGINX reload. - **Support**: With an NGINX Plus license, you can take advantage of full [support](https://my.f5.com/manage/s/article/K000140156/) from NGINX, Inc. diff --git a/tests/conformance/conformance_test.go b/tests/conformance/conformance_test.go index 3437749c67..b06a5ca310 100644 --- a/tests/conformance/conformance_test.go +++ b/tests/conformance/conformance_test.go @@ -43,7 +43,7 @@ func TestConformance(t *testing.T) { opts := conformance.DefaultOptions(t) opts.Implementation = conf_v1.Implementation{ - Organization: "nginx", + Organization: "nginxinc", Project: "nginx-gateway-fabric", URL: "https://github.com/nginx/nginx-gateway-fabric", Version: *flags.ImplementationVersion, diff --git a/tests/go.mod b/tests/go.mod index e3a8fbeb92..7dbd160059 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -61,14 +61,14 @@ require ( github.com/x448/float16 v0.8.4 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.34.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.29.0 // indirect - golang.org/x/term v0.28.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/term v0.27.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect - golang.org/x/tools v0.29.0 // indirect + golang.org/x/tools v0.28.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/grpc v1.68.1 // indirect diff --git a/tests/go.sum b/tests/go.sum index a246b64719..4a57d32bb9 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -141,8 +141,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -153,10 +153,10 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= -golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= @@ -168,8 +168,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= -golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= +golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= +golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/tests/scripts/vars.env-example b/tests/scripts/vars.env-example index 17e571b064..b8f1276fb5 100644 --- a/tests/scripts/vars.env-example +++ b/tests/scripts/vars.env-example @@ -11,7 +11,7 @@ GKE_PROJECT= GKE_SVC_ACCOUNT= GKE_NODES_SERVICE_ACCOUNT= NETWORK_TAGS= -NGF_REPO= +NGF_REPO= NGF_BRANCH=main GINKGO_LABEL= GINKGO_FLAGS= diff --git a/tests/suite/manifests/clientsettings/grpc-backend.yaml b/tests/suite/manifests/clientsettings/grpc-backend.yaml index 0b57f4f1a1..32771fd6e6 100644 --- a/tests/suite/manifests/clientsettings/grpc-backend.yaml +++ b/tests/suite/manifests/clientsettings/grpc-backend.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-backend - image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 + image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 env: - name: POD_NAME valueFrom: diff --git a/tests/suite/manifests/snippets-filter/grpc-backend.yaml b/tests/suite/manifests/snippets-filter/grpc-backend.yaml index 0b57f4f1a1..32771fd6e6 100644 --- a/tests/suite/manifests/snippets-filter/grpc-backend.yaml +++ b/tests/suite/manifests/snippets-filter/grpc-backend.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-backend - image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 + image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 env: - name: POD_NAME valueFrom: diff --git a/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml b/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml index 0b57f4f1a1..32771fd6e6 100644 --- a/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml +++ b/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-backend - image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 + image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 env: - name: POD_NAME valueFrom: From bcdbe2537f528876fd754dee65feebb0a1560902 Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Wed, 15 Jan 2025 10:20:24 -0800 Subject: [PATCH 8/9] Add link to UpstreamSettingsPolicy guide --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2196e98d0b..7ee970650c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ BUG FIXES: DOCUMENTATION: - Docs: Update support referencing support package tool. [2789](https://github.com/nginx/nginx-gateway-fabric/pull/2789). Thanks to [mrajagopal](https://github.com/mrajagopal). -- Add how-to guide for configuring upstream settings for services using the UpstreamSettingsPolicy API. [2987](https://github.com/nginx/nginx-gateway-fabric/pull/2987) +- Add how-to guide for configuring upstream settings for services using the UpstreamSettingsPolicy API. Find it [here](https://docs.nginx.com/nginx-gateway-fabric/how-to/traffic-management/upstream-settings/). [2987](https://github.com/nginx/nginx-gateway-fabric/pull/2987) HELM CHART: From 6d1df3dca1eca49d2f60303615b5de29a9f616f9 Mon Sep 17 00:00:00 2001 From: Benjamin Jee Date: Wed, 15 Jan 2025 10:54:42 -0800 Subject: [PATCH 9/9] Revert "Revert "Merge branch 'release-1.6' into docs/release-1.6.0"" This reverts commit ee357ccbc7dfa9aff8106a5a85be62e3f431313d. --- .github/workflows/dependency-review.yml | 2 +- .github/workflows/labeler.yml | 2 +- README.md | 2 +- apis/v1alpha2/policy_methods.go | 2 +- design/archive/gateway-evaluation.md | 2 +- examples/grpc-routing/helloworld.yaml | 4 ++-- go.mod | 10 +++++----- go.sum | 20 +++++++++---------- internal/mode/static/manager.go | 2 +- internal/mode/static/telemetry/collector.go | 6 +++--- .../mode/static/telemetry/collector_test.go | 2 +- .../telemetry/data_attributes_generated.go | 2 +- internal/mode/static/telemetry/data_test.go | 2 +- internal/mode/static/telemetry/exporter.go | 2 +- .../mode/static/telemetry/job_worker_test.go | 2 +- .../ngfresourcecounts_attributes_generated.go | 2 +- .../telemetry/telemetryfakes/fake_exporter.go | 2 +- renovate.json | 2 +- site/content/how-to/monitoring/prometheus.md | 2 +- site/content/overview/nginx-plus.md | 2 +- tests/conformance/conformance_test.go | 2 +- tests/go.mod | 8 ++++---- tests/go.sum | 16 +++++++-------- tests/scripts/vars.env-example | 2 +- .../clientsettings/grpc-backend.yaml | 2 +- .../snippets-filter/grpc-backend.yaml | 2 +- .../grpc-backend.yaml | 2 +- 27 files changed, 53 insertions(+), 53 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 3959740a8c..deac9b8e49 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -17,4 +17,4 @@ jobs: - name: "Dependency Review" uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 with: - config-file: "nginxinc/k8s-common/dependency-review-config.yml@main" + config-file: "nginx/k8s-common/dependency-review-config.yml@main" diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 23a95b4492..84dfca8c9c 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -17,7 +17,7 @@ jobs: sparse-checkout: | labeler.yml sparse-checkout-cone-mode: false - repository: nginxinc/k8s-common + repository: nginx/k8s-common - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 with: diff --git a/README.md b/README.md index d04337d2ea..b9e3d3f63b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/nginx/nginx-gateway-fabric/badge)](https://scorecard.dev/viewer/?uri=github.com/nginx/nginx-gateway-fabric) -[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-fabric.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-fabric?ref=badge_shield) +[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fnginx-gateway-fabric.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fnginx-gateway-fabric?ref=badge_shield) [![Continuous Integration](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/ci.yml/badge.svg)](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/ci.yml) [![Go Report Card](https://goreportcard.com/badge/github.com/nginx/nginx-gateway-fabric)](https://goreportcard.com/report/github.com/nginx/nginx-gateway-fabric) [![codecov](https://codecov.io/gh/nginx/nginx-gateway-fabric/graph/badge.svg?token=32ULC8F13Z)](https://codecov.io/gh/nginx/nginx-gateway-fabric) diff --git a/apis/v1alpha2/policy_methods.go b/apis/v1alpha2/policy_methods.go index 8fc6dc768d..b5e59a0ff5 100644 --- a/apis/v1alpha2/policy_methods.go +++ b/apis/v1alpha2/policy_methods.go @@ -4,7 +4,7 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" ) -// FIXME(kate-osborn): https://github.com/nginxinc/nginx-gateway-fabric/issues/1939. +// FIXME(kate-osborn): https://github.com/nginx/nginx-gateway-fabric/issues/1939. // Figure out a way to generate these methods for all our policies. // These methods implement the policies.Policy interface which extends client.Object to add the following methods. diff --git a/design/archive/gateway-evaluation.md b/design/archive/gateway-evaluation.md index d3da2f1801..ddacb07ee2 100644 --- a/design/archive/gateway-evaluation.md +++ b/design/archive/gateway-evaluation.md @@ -75,7 +75,7 @@ between an ingress point and the final backend Pod endpoints. Required supplemen ### Non-Goals -- Replace or supplant current [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress) (NIC) use-cases +- Replace or supplant current [NGINX Ingress Controller](https://github.com/nginx/kubernetes-ingress) (NIC) use-cases and will not work to achieve feature parity. - The Gateway evaluation will not support Ingress v1 APIs or the set of NIC CRDs (e.g. VirtualServer and VirtualServerRoute). diff --git a/examples/grpc-routing/helloworld.yaml b/examples/grpc-routing/helloworld.yaml index e2510ed52b..1e8157900f 100644 --- a/examples/grpc-routing/helloworld.yaml +++ b/examples/grpc-routing/helloworld.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-infra-backend-v1 - image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 + image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 env: - name: POD_NAME valueFrom: @@ -68,7 +68,7 @@ spec: spec: containers: - name: grpc-infra-backend-v2 - image: ghcr.io/nginxinc/kic-test-grpc-server:edge + image: ghcr.io/nginx/kic-test-grpc-server:edge env: - name: POD_NAME valueFrom: diff --git a/go.mod b/go.mod index dc622a593a..4caaf4053e 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,9 @@ require ( github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 + github.com/nginx/telemetry-exporter v0.1.3 github.com/nginxinc/nginx-plus-go-client v1.3.0 github.com/nginxinc/nginx-prometheus-exporter v1.3.0 - github.com/nginxinc/telemetry-exporter v0.1.2 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 github.com/prometheus/client_golang v1.20.5 @@ -71,14 +71,14 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.33.0 // indirect + golang.org/x/net v0.34.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/term v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect - golang.org/x/tools v0.28.0 // indirect + golang.org/x/tools v0.29.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect diff --git a/go.sum b/go.sum index 7da43fa839..bade937608 100644 --- a/go.sum +++ b/go.sum @@ -81,12 +81,12 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/nginx/telemetry-exporter v0.1.3 h1:aGuUWMRSf2nA9fOH+AQ8I+hdoq0Hz6wgttLBG/SzsvI= +github.com/nginx/telemetry-exporter v0.1.3/go.mod h1:hVH3DhumaKkGOWLiFLvZj+UWjLNoPXoXvoiNiUI0WxQ= github.com/nginxinc/nginx-plus-go-client v1.3.0 h1:q/aeT4B5k0KLwWlefoBzfLfraBBvIKLuDg+lLFWAo4I= github.com/nginxinc/nginx-plus-go-client v1.3.0/go.mod h1:n8OFLzrJulJ2fur28Cwa1Qp5DZNS2VicLV+Adt30LQ4= github.com/nginxinc/nginx-prometheus-exporter v1.3.0 h1:1JtdxsZH0Uwhu1nL/j/QyOXytP5V5j68AEo2X+DFWb0= github.com/nginxinc/nginx-prometheus-exporter v1.3.0/go.mod h1:hXoH+X6aIKSyQuO6QTIiPKH3eZyxqy/wW8GYiE3dflU= -github.com/nginxinc/telemetry-exporter v0.1.2 h1:97vUGhQYgQ2KEsXKCBmr5gqfuujJCKPHwdg5HKoANUs= -github.com/nginxinc/telemetry-exporter v0.1.2/go.mod h1:eKa/Ceh9irmyZ1xV2QxBIxduIyVC5RlmtiWwcTlHuMg= github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU= github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk= github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= @@ -156,8 +156,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -168,10 +168,10 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= @@ -182,8 +182,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= -golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/mode/static/manager.go b/internal/mode/static/manager.go index 02ecd670eb..6ab99b4516 100644 --- a/internal/mode/static/manager.go +++ b/internal/mode/static/manager.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-logr/logr" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/mode/static/telemetry/collector.go b/internal/mode/static/telemetry/collector.go index f781852119..a349475a36 100644 --- a/internal/mode/static/telemetry/collector.go +++ b/internal/mode/static/telemetry/collector.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -39,7 +39,7 @@ type ConfigurationGetter interface { // Data is telemetry data. // -//go:generate go run -tags generator github.com/nginxinc/telemetry-exporter/cmd/generator -type=Data -scheme -scheme-protocol=NGFProductTelemetry -scheme-df-datatype=ngf-product-telemetry +//go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=Data -scheme -scheme-protocol=NGFProductTelemetry -scheme-df-datatype=ngf-product-telemetry type Data struct { // ImageSource tells whether the image was built by GitHub or locally (values are 'gha', 'local', or 'unknown') ImageSource string @@ -66,7 +66,7 @@ type Data struct { // NGFResourceCounts stores the counts of all relevant resources that NGF processes and generates configuration from. // -//go:generate go run -tags generator github.com/nginxinc/telemetry-exporter/cmd/generator -type=NGFResourceCounts +//go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=NGFResourceCounts type NGFResourceCounts struct { // GatewayCount is the number of relevant Gateways. GatewayCount int64 diff --git a/internal/mode/static/telemetry/collector_test.go b/internal/mode/static/telemetry/collector_test.go index 7a69dbeb3a..506bfa0c9e 100644 --- a/internal/mode/static/telemetry/collector_test.go +++ b/internal/mode/static/telemetry/collector_test.go @@ -6,7 +6,7 @@ import ( "reflect" "runtime" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/mode/static/telemetry/data_attributes_generated.go b/internal/mode/static/telemetry/data_attributes_generated.go index da061512a3..553925b0fd 100644 --- a/internal/mode/static/telemetry/data_attributes_generated.go +++ b/internal/mode/static/telemetry/data_attributes_generated.go @@ -7,7 +7,7 @@ This is a generated file. DO NOT EDIT. import ( "go.opentelemetry.io/otel/attribute" - ngxTelemetry "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + ngxTelemetry "github.com/nginx/telemetry-exporter/pkg/telemetry" ) func (d *Data) Attributes() []attribute.KeyValue { diff --git a/internal/mode/static/telemetry/data_test.go b/internal/mode/static/telemetry/data_test.go index d0fe63820a..d2dfe9516b 100644 --- a/internal/mode/static/telemetry/data_test.go +++ b/internal/mode/static/telemetry/data_test.go @@ -3,7 +3,7 @@ package telemetry import ( "testing" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" . "github.com/onsi/gomega" "go.opentelemetry.io/otel/attribute" ) diff --git a/internal/mode/static/telemetry/exporter.go b/internal/mode/static/telemetry/exporter.go index 1c86ac61fb..21c7c99c38 100644 --- a/internal/mode/static/telemetry/exporter.go +++ b/internal/mode/static/telemetry/exporter.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-logr/logr" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" ) // Exporter exports telemetry data to some destination. diff --git a/internal/mode/static/telemetry/job_worker_test.go b/internal/mode/static/telemetry/job_worker_test.go index c331473cf8..770af9892c 100644 --- a/internal/mode/static/telemetry/job_worker_test.go +++ b/internal/mode/static/telemetry/job_worker_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/log/zap" diff --git a/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go b/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go index 343c6fd9ed..baddcd174d 100644 --- a/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go +++ b/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go @@ -7,7 +7,7 @@ This is a generated file. DO NOT EDIT. import ( "go.opentelemetry.io/otel/attribute" - ngxTelemetry "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + ngxTelemetry "github.com/nginx/telemetry-exporter/pkg/telemetry" ) func (d *NGFResourceCounts) Attributes() []attribute.KeyValue { diff --git a/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go b/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go index 74207bd300..f854e50fe6 100644 --- a/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go +++ b/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" - telemetrya "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + telemetrya "github.com/nginx/telemetry-exporter/pkg/telemetry" ) type FakeExporter struct { diff --git a/renovate.json b/renovate.json index cf3f466afe..4c3271d6ce 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>nginxinc/k8s-common", + "github>nginx/k8s-common", "schedule:daily" ], "kubernetes": { diff --git a/site/content/how-to/monitoring/prometheus.md b/site/content/how-to/monitoring/prometheus.md index 009a917f82..17746ba719 100644 --- a/site/content/how-to/monitoring/prometheus.md +++ b/site/content/how-to/monitoring/prometheus.md @@ -72,7 +72,7 @@ NGINX Gateway Fabric provides a variety of metrics for monitoring and analyzing ### NGINX/NGINX Plus metrics -NGINX metrics cover specific NGINX operations such as the total number of accepted client connections. For a complete list of available NGINX/NGINX Plus metrics, refer to the [NGINX Prometheus Exporter developer docs](https://github.com/nginxinc/nginx-prometheus-exporter#exported-metrics). +NGINX metrics cover specific NGINX operations such as the total number of accepted client connections. For a complete list of available NGINX/NGINX Plus metrics, refer to the [NGINX Prometheus Exporter developer docs](https://github.com/nginx/nginx-prometheus-exporter#exported-metrics). These metrics use the `nginx_gateway_fabric` namespace and include the `class` label, indicating the NGINX Gateway class. For example, `nginx_gateway_fabric_connections_accepted{class="nginx"}`. diff --git a/site/content/overview/nginx-plus.md b/site/content/overview/nginx-plus.md index 8e50c0b0e4..bc67839bf0 100644 --- a/site/content/overview/nginx-plus.md +++ b/site/content/overview/nginx-plus.md @@ -9,7 +9,7 @@ NGINX Gateway Fabric can use NGINX Open Source or NGINX Plus as its data plane. ## Benefits of NGINX Plus -- **Robust metrics**: A plethora of [additional Prometheus metrics](https://github.com/nginxinc/nginx-prometheus-exporter#metrics-for-nginx-plus) are available. +- **Robust metrics**: A plethora of [additional Prometheus metrics](https://github.com/nginx/nginx-prometheus-exporter#metrics-for-nginx-plus) are available. - **Live activity monitoring**: The [NGINX Plus dashboard]({{< relref "/how-to/monitoring/dashboard.md" >}}) shows real-time metrics and information about your server infrastructure. - **Dynamic upstream configuration**: NGINX Plus can dynamically reconfigure upstream servers when applications in Kubernetes scale up and down, preventing the need for an NGINX reload. - **Support**: With an NGINX Plus license, you can take advantage of full [support](https://my.f5.com/manage/s/article/K000140156/) from NGINX, Inc. diff --git a/tests/conformance/conformance_test.go b/tests/conformance/conformance_test.go index b06a5ca310..3437749c67 100644 --- a/tests/conformance/conformance_test.go +++ b/tests/conformance/conformance_test.go @@ -43,7 +43,7 @@ func TestConformance(t *testing.T) { opts := conformance.DefaultOptions(t) opts.Implementation = conf_v1.Implementation{ - Organization: "nginxinc", + Organization: "nginx", Project: "nginx-gateway-fabric", URL: "https://github.com/nginx/nginx-gateway-fabric", Version: *flags.ImplementationVersion, diff --git a/tests/go.mod b/tests/go.mod index 7dbd160059..e3a8fbeb92 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -61,14 +61,14 @@ require ( github.com/x448/float16 v0.8.4 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.33.0 // indirect + golang.org/x/net v0.34.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/term v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect - golang.org/x/tools v0.28.0 // indirect + golang.org/x/tools v0.29.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/grpc v1.68.1 // indirect diff --git a/tests/go.sum b/tests/go.sum index 4a57d32bb9..a246b64719 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -141,8 +141,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -153,10 +153,10 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= @@ -168,8 +168,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= -golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/tests/scripts/vars.env-example b/tests/scripts/vars.env-example index b8f1276fb5..17e571b064 100644 --- a/tests/scripts/vars.env-example +++ b/tests/scripts/vars.env-example @@ -11,7 +11,7 @@ GKE_PROJECT= GKE_SVC_ACCOUNT= GKE_NODES_SERVICE_ACCOUNT= NETWORK_TAGS= -NGF_REPO= +NGF_REPO= NGF_BRANCH=main GINKGO_LABEL= GINKGO_FLAGS= diff --git a/tests/suite/manifests/clientsettings/grpc-backend.yaml b/tests/suite/manifests/clientsettings/grpc-backend.yaml index 32771fd6e6..0b57f4f1a1 100644 --- a/tests/suite/manifests/clientsettings/grpc-backend.yaml +++ b/tests/suite/manifests/clientsettings/grpc-backend.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-backend - image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 + image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 env: - name: POD_NAME valueFrom: diff --git a/tests/suite/manifests/snippets-filter/grpc-backend.yaml b/tests/suite/manifests/snippets-filter/grpc-backend.yaml index 32771fd6e6..0b57f4f1a1 100644 --- a/tests/suite/manifests/snippets-filter/grpc-backend.yaml +++ b/tests/suite/manifests/snippets-filter/grpc-backend.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-backend - image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 + image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 env: - name: POD_NAME valueFrom: diff --git a/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml b/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml index 32771fd6e6..0b57f4f1a1 100644 --- a/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml +++ b/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-backend - image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 + image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 env: - name: POD_NAME valueFrom: