From b81378b16b369e89d626eba8b7b86cb153009545 Mon Sep 17 00:00:00 2001 From: Haywood Shannon <5781935+haywoodsh@users.noreply.github.com> Date: Mon, 10 Nov 2025 10:27:59 +0000 Subject: [PATCH 1/2] update docs for upstream service in foreign namespace --- .../virtualserver-and-virtualserverroute-resources.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/nic/configuration/virtualserver-and-virtualserverroute-resources.md b/content/nic/configuration/virtualserver-and-virtualserverroute-resources.md index 4899b0fdb..64f53b27c 100644 --- a/content/nic/configuration/virtualserver-and-virtualserverroute-resources.md +++ b/content/nic/configuration/virtualserver-and-virtualserverroute-resources.md @@ -333,7 +333,7 @@ tls: |Field | Description | Type | Required | | ---| ---| ---| --- | |``name`` | The name of the upstream. Must be a valid DNS label as defined in RFC 1035. For example, ``hello`` and ``upstream-123`` are valid. The name must be unique among all upstreams of the resource. | ``string`` | Yes | -|``service`` | The name of a [service](https://kubernetes.io/docs/concepts/services-networking/service/). The service must belong to the same namespace as the resource. If the service doesn't exist, NGINX will assume the service has zero endpoints and return a ``502`` response for requests for this upstream. For NGINX Plus only, services of type [ExternalName](https://kubernetes.io/docs/concepts/services-networking/service/#externalname) are also supported (check the [prerequisites](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services#prerequisites) ). | ``string`` | Yes | +|``service`` | The name of a [service](https://kubernetes.io/docs/concepts/services-networking/service/). If the Service belongs to a different namespace than the VirtualServer or VirtualServerRoute, you need to include the namespace. For example, ``tea-namespace/tea``. If the service doesn't exist, NGINX will assume the service has zero endpoints and return a ``502`` response for requests for this upstream. For NGINX Plus only, services of type [ExternalName](https://kubernetes.io/docs/concepts/services-networking/service/#externalname) are also supported in the same namespace (check the [prerequisites](https://github.com/nginx/kubernetes-ingress/tree/v{{< nic-version >}}/examples/ingress-resources/externalname-services#prerequisites) ). | ``string`` | Yes | |``subselector`` | Selects the pods within the service using label keys and values. By default, all pods of the service are selected. Note: the specified labels are expected to be present in the pods when they are created. If the pod labels are updated, NGINX Ingress Controller will not see that change until the number of the pods is changed. | ``map[string]string`` | No | |``use-cluster-ip`` | Enables using the Cluster IP and port of the service instead of the default behavior of using the IP and port of the pods. When this field is enabled, the fields that configure NGINX behavior related to multiple upstream servers (like ``lb-method`` and ``next-upstream``) will have no effect, as NGINX Ingress Controller will configure NGINX with only one upstream server that will match the service Cluster IP. | ``boolean`` | No | |``port`` | The port of the service. If the service doesn't define that port, NGINX will assume the service has zero endpoints and return a ``502`` response for requests for this upstream. The port must fall into the range ``1..65535``. | ``uint16`` | Yes | From 0bc4f8f37bf075b5355058ef92aa3e558a8ddf7e Mon Sep 17 00:00:00 2001 From: Lam <150060045+lamatnginx@users.noreply.github.com> Date: Mon, 10 Nov 2025 19:55:50 +0000 Subject: [PATCH 2/2] chore: Update go mod to theme v2 (#1424) (cherry picked from commit a9d8548b653da79021e54b629fbcac123980a641) --- .github/workflows/build-push.yml | 2 +- Makefile | 4 ++-- config/_default/config.toml | 2 +- go.mod | 2 +- go.sum | 4 ++-- hugo-entrypoint.sh | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 348104851..378beafff 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -58,7 +58,7 @@ jobs: call-docs-build-push: needs: prod-check-branch - uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@04ed2db338ee08cc560a327f412684d0c8260de2 # v1.0.11 + uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@7bae601be08ca09aabd0850731e20847a456c227 # v1.0.12 with: production_url_path: "" preview_url_path: "${{ vars.PREVIEW_URL_PATH }}" diff --git a/Makefile b/Makefile index 9830d9e1e..5006d6288 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ HUGO?=hugo HUGO_VERSION?=$(shell hugo version 2>/dev/null | awk '{print $$2}' | cut -d '.' -f 2) HUGO_IMG?=hugomods/hugo:std-go-git-0.147.8 -THEME_MODULE = github.com/nginxinc/nginx-hugo-theme +THEME_MODULE = github.com/nginxinc/nginx-hugo-theme/v2 ifeq ($(shell [ $(HUGO_VERSION) -gt 146 2>/dev/null ] && echo true || echo false), true) $(info Hugo is available and has a version greater than 146. Proceeding with build.) @@ -50,7 +50,7 @@ clean: [ -d "public" ] && rm -rf "public" hugo-get: - hugo mod get -u github.com/nginxinc/nginx-hugo-theme + hugo mod get -u github.com/nginxinc/nginx-hugo-theme/v2 hugo-tidy: hugo mod tidy diff --git a/config/_default/config.toml b/config/_default/config.toml index c80e3958a..bbfbe83d8 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -28,7 +28,7 @@ enableGitInfo = true [module] [[module.imports]] - path="github.com/nginxinc/nginx-hugo-theme" + path="github.com/nginxinc/nginx-hugo-theme/v2" [markup] [markup.goldmark] diff --git a/go.mod b/go.mod index 8e5052f41..43b73ce64 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module github.com/nginxinc/docs go 1.19 -require github.com/nginxinc/nginx-hugo-theme v1.0.8 // indirect +require github.com/nginxinc/nginx-hugo-theme/v2 v2.0.0 // indirect diff --git a/go.sum b/go.sum index e81b144b1..92ba848bc 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,2 @@ -github.com/nginxinc/nginx-hugo-theme v1.0.8 h1:+ytApSF1FjZFajFO47sQ+ZNu4mgNlb2O4423Mmdcjwc= -github.com/nginxinc/nginx-hugo-theme v1.0.8/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M= +github.com/nginxinc/nginx-hugo-theme/v2 v2.0.0 h1:Kgh/zeBP7vgPyXowPL2v9MTlRs0CDe31G+bvp7WbH34= +github.com/nginxinc/nginx-hugo-theme/v2 v2.0.0/go.mod h1:TAmEMc0T/RKTQ0pI4LROWoUmyLXstrRmM2jE2ErdxWY= diff --git a/hugo-entrypoint.sh b/hugo-entrypoint.sh index dc7212352..05daaf964 100755 --- a/hugo-entrypoint.sh +++ b/hugo-entrypoint.sh @@ -1,4 +1,4 @@ #!/bin/sh -hugo mod get -u github.com/nginxinc/nginx-hugo-theme +hugo mod get -u github.com/nginxinc/nginx-hugo-theme/v2 hugo $*