From 5f7086fce63827436876c97eb4e304ceae29831b Mon Sep 17 00:00:00 2001 From: Lam Nguyen Date: Wed, 21 May 2025 11:00:18 -0700 Subject: [PATCH 1/4] feat: Removed unneeded R33 layouts and migrate to theme --- content/nim/deploy/_index.md | 7 ++- layouts/nim-r33/list.html | 10 ---- layouts/nim-r33/single.html | 55 ------------------ .../banner/deprecation-product-r33.html | 12 ++++ .../list-main.html | 57 ------------------- .../partials/r33-pre-release/list-main.html | 55 ------------------ layouts/r33-pre-release/list.html | 10 ---- 7 files changed, 18 insertions(+), 188 deletions(-) delete mode 100644 layouts/nim-r33/list.html delete mode 100644 layouts/nim-r33/single.html create mode 100644 layouts/partials/banner/deprecation-product-r33.html delete mode 100644 layouts/partials/nim-r33-version-requirement/list-main.html delete mode 100644 layouts/partials/r33-pre-release/list-main.html delete mode 100644 layouts/r33-pre-release/list.html diff --git a/content/nim/deploy/_index.md b/content/nim/deploy/_index.md index 6b3a1c0b8..2756f6bb8 100644 --- a/content/nim/deploy/_index.md +++ b/content/nim/deploy/_index.md @@ -4,5 +4,10 @@ description: weight: 20 url: /nginx-instance-manager/deploy/ cascade: - type: "nim-r33" + banner: + enabled: true + type: deprecation + start-date: 2024-01-01 + end-date: 2024-02-01 + md: /partials/banner/deprecation-product-r33.html --- \ No newline at end of file diff --git a/layouts/nim-r33/list.html b/layouts/nim-r33/list.html deleted file mode 100644 index c09239887..000000000 --- a/layouts/nim-r33/list.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "main" }} -
- -
- {{ partial "nim-r33-version-requirement/list-main" . }} -
-
-{{ end }} diff --git a/layouts/nim-r33/single.html b/layouts/nim-r33/single.html deleted file mode 100644 index 9c3540ef8..000000000 --- a/layouts/nim-r33/single.html +++ /dev/null @@ -1,55 +0,0 @@ -{{ define "main" }} -
- - - {{if (.Params.catalog) }} -
- {{ else if and (gt .WordCount 200 ) (.Params.toc) }} -
- {{ else }} -
- {{ end }} - -
-
- Important: NGINX Plus R33 requires NGINX Instance Manager 2.18 or later -
- To ensure uninterrupted traffic processing, upgrade to NGINX Instance Manager 2.18 or later if your NGINX data plane instances are running NGINX Plus R33. This upgrade is necessary to support usage reporting. -

- NGINX Plus R33 instances must send usage data to the F5 licensing endpoint or NGINX Instance Manager. If they don’t, they will stop processing traffic. -

- For more information about usage reporting and enforcement, see - About solution licenses. -
-
- -

{{ .Title }}

- - {{ if eq .Page.Draft true }}{{ partial "draft-badge.html" . }}{{ end }} - {{ if .Description }}

{{ .Description | markdownify }}

{{ end}} - - {{ if in .Params.doctypes "beta" }}{{ partial "beta-badge" . }}{{ end }} - - {{ .Content }} - {{ partial "version-list" . }} -
- {{ partial "previous-next-links-in-section-with-title.html" . }} - -
- {{ if and (gt .WordCount 200 ) (.Params.toc) }} - {{ if (add (len (findRE " - {{ partial "toc.html" . }} -
- {{ end }} - {{ end }} - - -{{if .Params.script}} - {{ $script := (delimit (slice "scripts" .Params.script) "/")}} - {{ partial (string $script) .}} -{{end }} - -{{ end }} diff --git a/layouts/partials/banner/deprecation-product-r33.html b/layouts/partials/banner/deprecation-product-r33.html new file mode 100644 index 000000000..11996342c --- /dev/null +++ b/layouts/partials/banner/deprecation-product-r33.html @@ -0,0 +1,12 @@ +
+
+ Important: NGINX Plus R33 requires NGINX Instance Manager 2.18 or later +
+ To ensure uninterrupted traffic processing, upgrade to NGINX Instance Manager 2.18 or later if your NGINX data plane instances are running NGINX Plus R33. This upgrade is necessary to support usage reporting. +

+ NGINX Plus R33 instances must send usage data to the F5 licensing endpoint or NGINX Instance Manager. If they don’t, they will stop processing traffic. +

+ For more information about usage reporting and enforcement, see + About solution licenses. +
+
\ No newline at end of file diff --git a/layouts/partials/nim-r33-version-requirement/list-main.html b/layouts/partials/nim-r33-version-requirement/list-main.html deleted file mode 100644 index fa76a0685..000000000 --- a/layouts/partials/nim-r33-version-requirement/list-main.html +++ /dev/null @@ -1,57 +0,0 @@ -
-
-
-

- {{ .Title }} -

- {{ if .Description }} -

- {{ .Description | markdownify }} -

- {{ end}} -
-
- NGINX Plus R33 requires NGINX Instance Manager 2.18 or later -
- If your NGINX data plane instances are running NGINX Plus R33 or later, you must upgrade to NGINX Instance Manager 2.18 or later to support usage reporting. NGINX Plus R33 instances must report usage data to the F5 licensing endpoint or NGINX Instance Manager. Otherwise, they will stop processing traffic. -
-
- For more details about usage reporting and enforcement, see About solution licenses. -
-
- {{ if .Content }} -

- {{ .Content | markdownify }} -

- {{ end }} -
-
- -
-
-
- {{ range .Pages.GroupBy "Section" }} - - {{ range .Pages.ByWeight }} -
-
-

- - {{ .Title }} -

- {{/*}}

- {{ if .Description }}{{ .Description | markdownify }}{{ end }} -

{{*/}} - -
-
- - {{ end }} -
-
- {{ end }} - - -
- -
\ No newline at end of file diff --git a/layouts/partials/r33-pre-release/list-main.html b/layouts/partials/r33-pre-release/list-main.html deleted file mode 100644 index e7d71876d..000000000 --- a/layouts/partials/r33-pre-release/list-main.html +++ /dev/null @@ -1,55 +0,0 @@ -
-
-
-

- {{ .Title }} -

- {{ if .Description }} -

- {{ .Description | markdownify }} -

- {{ end}} -
-
NGINX R33: Immediate action required for automatic upgrades -
- NGINX Plus R33 requires a valid JSON Web Token (JWT) to start and accept new connections. -
- If automatic upgrades are enabled, apply the JWT and configure your network now to avoid downtime when R33 is released. -
-
- {{ if .Content }} -

- {{ .Content | markdownify }} -

- {{ end }} -
-
- -
-
-
- {{ range .Pages.GroupBy "Section" }} - - {{ range .Pages.ByWeight }} -
-
-

- - {{ .Title }} -

- {{/*}}

- {{ if .Description }}{{ .Description | markdownify }}{{ end }} -

{{*/}} - -
-
- - {{ end }} -
-
- {{ end }} - - -
- -
\ No newline at end of file diff --git a/layouts/r33-pre-release/list.html b/layouts/r33-pre-release/list.html deleted file mode 100644 index fda20e8fe..000000000 --- a/layouts/r33-pre-release/list.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "main" }} -
- -
- {{ partial "r33-pre-release/list-main" . }} -
-
-{{ end }} From dc2695abfc3e8c9311926d679615a9b2550cf41c Mon Sep 17 00:00:00 2001 From: Lam Nguyen Date: Wed, 21 May 2025 11:37:31 -0700 Subject: [PATCH 2/4] Refactored controller + mesh --- content/controller/_index.md | 7 ++- content/mesh/_index.md | 9 ++- content/nim/deploy/_index.md | 2 +- layouts/acm-eos/list.html | 10 ---- layouts/acm-eos/single.html | 48 ---------------- layouts/ctlr-eos/list.html | 10 ---- layouts/ctlr-eos/single.html | 49 ---------------- layouts/mesh-eos/list.html | 10 ---- layouts/mesh-eos/single.html | 48 ---------------- ...-product-r33.html => deprecation-r33.html} | 0 layouts/partials/banner/eos-cltr.html | 5 ++ layouts/partials/banner/eos-mesh.html | 5 ++ layouts/partials/ctlr-eos/list-main.html | 57 ------------------- layouts/partials/list-main.html | 8 +++ layouts/partials/mesh-eos/list-main.html | 52 ----------------- 15 files changed, 32 insertions(+), 288 deletions(-) delete mode 100644 layouts/acm-eos/list.html delete mode 100644 layouts/acm-eos/single.html delete mode 100644 layouts/ctlr-eos/list.html delete mode 100644 layouts/ctlr-eos/single.html delete mode 100644 layouts/mesh-eos/list.html delete mode 100644 layouts/mesh-eos/single.html rename layouts/partials/banner/{deprecation-product-r33.html => deprecation-r33.html} (100%) create mode 100644 layouts/partials/banner/eos-cltr.html create mode 100644 layouts/partials/banner/eos-mesh.html delete mode 100644 layouts/partials/ctlr-eos/list-main.html delete mode 100644 layouts/partials/mesh-eos/list-main.html diff --git a/content/controller/_index.md b/content/controller/_index.md index aa1b6c3da..671a52f57 100644 --- a/content/controller/_index.md +++ b/content/controller/_index.md @@ -5,8 +5,13 @@ title: F5 NGINX Controller weight: 2100 cascade: logo: "NGINX-Controller-product-icon-RGB.svg" - type: "ctlr-eos" noindex: true + banner: + enabled: true + type: deprecation + start-date: 2024-01-01 + end-date: 2024-02-01 + md: banner/eos-cltr url: /nginx-controller/ --- diff --git a/content/mesh/_index.md b/content/mesh/_index.md index c30b9c2f1..6345c2705 100644 --- a/content/mesh/_index.md +++ b/content/mesh/_index.md @@ -5,9 +5,14 @@ description: 'NGINX Service Mesh is a fully integrated lightweight service mesh environments. ' +url: /nginx-service-mesh/ cascade: - type: mesh-eos noindex: true -url: /nginx-service-mesh/ + banner: + enabled: true + type: deprecation + start-date: 2024-01-01 + end-date: 2024-02-01 + md: banner/eos-mesh --- diff --git a/content/nim/deploy/_index.md b/content/nim/deploy/_index.md index 2756f6bb8..878ffe9f8 100644 --- a/content/nim/deploy/_index.md +++ b/content/nim/deploy/_index.md @@ -9,5 +9,5 @@ cascade: type: deprecation start-date: 2024-01-01 end-date: 2024-02-01 - md: /partials/banner/deprecation-product-r33.html + md: banner/deprecation-r33 --- \ No newline at end of file diff --git a/layouts/acm-eos/list.html b/layouts/acm-eos/list.html deleted file mode 100644 index 5bad9d4cc..000000000 --- a/layouts/acm-eos/list.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "main" }} -
- -
- {{ partial "acm-eos/list-main" . }} -
-
-{{ end }} diff --git a/layouts/acm-eos/single.html b/layouts/acm-eos/single.html deleted file mode 100644 index 1e2abd112..000000000 --- a/layouts/acm-eos/single.html +++ /dev/null @@ -1,48 +0,0 @@ -{{ define "main" }} -
- - - {{if (.Params.catalog) }} -
- {{ else if and (gt .WordCount 200 ) (.Params.toc) }} -
- {{ else }} -
- {{ end }} - -
-
- End of Sale Notice:

F5 NGINX is announcing the End of Sale (EoS) for NGINX Management Suite API Connectivity Manager Module, effective January 1, 2024.

F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing API Connectivity Manager Module customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024.

See our End of Sale announcement for more details. -
-
- -

{{ .Title }}

- - {{ if eq .Page.Draft true }}{{ partial "draft-badge.html" . }}{{ end }} - {{ if .Description }}

{{ .Description | markdownify }}

{{ end}} - - {{ if in .Params.doctypes "beta" }}{{ partial "beta-badge" . }}{{ end }} - - {{ .Content }} - {{ partial "version-list" . }} -
- {{ partial "previous-next-links-in-section-with-title.html" . }} - -
- {{ if and (gt .WordCount 200 ) (.Params.toc) }} - {{ if (add (len (findRE " - {{ partial "toc.html" . }} -
- {{ end }} - {{ end }} - - -{{if .Params.script}} - {{ $script := (delimit (slice "scripts" .Params.script) "/")}} - {{ partial (string $script) .}} -{{end }} - -{{ end }} diff --git a/layouts/ctlr-eos/list.html b/layouts/ctlr-eos/list.html deleted file mode 100644 index ba5487fb2..000000000 --- a/layouts/ctlr-eos/list.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "main" }} -
- -
- {{ partial "ctlr-eos/list-main" . }} -
-
-{{ end }} diff --git a/layouts/ctlr-eos/single.html b/layouts/ctlr-eos/single.html deleted file mode 100644 index 9b2b667f5..000000000 --- a/layouts/ctlr-eos/single.html +++ /dev/null @@ -1,49 +0,0 @@ -{{ define "main" }} -
- - - {{if (.Params.catalog) }} - c
- {{ else if and (gt .WordCount 200 ) (.Params.toc) }} -
- {{ else }} -
- {{ end }} - -
-
End of Sale Notice:

F5 NGINX is announcing the End of Sale (EoS) for NGINX Controller API Management Module, effective January 1, 2024.

F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing NGINX Controller API- Management customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024.

See our End of Sale announcement for more details. -
-
-
End of Sale Notice:

F5 NGINX is announcing the End of Sale (EoS) for NGINX Controller Application Delivery Module, effective January 1, 2024.

F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing NGINX Controller Application Delivery customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024.

See our End of Sale announcement for more details.
-
- -

{{ .Title }}

- - {{ if eq .Page.Draft true }}{{ partial "draft-badge.html" . }}{{ end }} - {{ if .Description }}

{{ .Description | markdownify }}

{{ end}} - - {{ if in .Params.doctypes "beta" }}{{ partial "beta-badge" . }}{{ end }} - - {{ .Content }} - {{ partial "version-list" . }} -
- {{ partial "previous-next-links-in-section-with-title.html" . }} - -
- {{ if and (gt .WordCount 200 ) (.Params.toc) }} - {{ if (add (len (findRE " - {{ partial "toc.html" . }} -
- {{ end }} - {{ end }} - - -{{if .Params.script}} - {{ $script := (delimit (slice "scripts" .Params.script) "/")}} - {{ partial (string $script) .}} -{{end }} - -{{ end }} diff --git a/layouts/mesh-eos/list.html b/layouts/mesh-eos/list.html deleted file mode 100644 index e0ab6dc84..000000000 --- a/layouts/mesh-eos/list.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "main" }} -
- -
- {{ partial "mesh-eos/list-main" . }} -
-
-{{ end }} diff --git a/layouts/mesh-eos/single.html b/layouts/mesh-eos/single.html deleted file mode 100644 index 17226155e..000000000 --- a/layouts/mesh-eos/single.html +++ /dev/null @@ -1,48 +0,0 @@ -{{ define "main" }} -
- - - {{if (.Params.catalog) }} - c
- {{ else if and (gt .WordCount 200 ) (.Params.toc) }} -
- {{ else }} -
- {{ end }} - -
-
End of Sale Notice:

Commercial support for NGINX Service Mesh is available to customers who currently have active NGINX Microservices Bundle subscriptions. - F5 NGINX announced the End of Sale (EoS) for the NGINX Microservices Bundles as of July 1, 2023.

- See our End of Sale announcement for more details. -
- -

{{ .Title }}

- - {{ if eq .Page.Draft true }}{{ partial "draft-badge.html" . }}{{ end }} - {{ if .Description }}

{{ .Description | markdownify }}

{{ end}} - - {{ if in .Params.doctypes "beta" }}{{ partial "beta-badge" . }}{{ end }} - - {{ .Content }} - {{ partial "version-list" . }} -
- {{ partial "previous-next-links-in-section-with-title.html" . }} - -
- {{ if and (gt .WordCount 200 ) (.Params.toc) }} - {{ if (add (len (findRE " - {{ partial "toc.html" . }} -
- {{ end }} - {{ end }} - - -{{if .Params.script}} - {{ $script := (delimit (slice "scripts" .Params.script) "/")}} - {{ partial (string $script) .}} -{{end }} - -{{ end }} diff --git a/layouts/partials/banner/deprecation-product-r33.html b/layouts/partials/banner/deprecation-r33.html similarity index 100% rename from layouts/partials/banner/deprecation-product-r33.html rename to layouts/partials/banner/deprecation-r33.html diff --git a/layouts/partials/banner/eos-cltr.html b/layouts/partials/banner/eos-cltr.html new file mode 100644 index 000000000..e793ef511 --- /dev/null +++ b/layouts/partials/banner/eos-cltr.html @@ -0,0 +1,5 @@ +
+
+ End of Sale Notice:

F5 NGINX is announcing the End of Sale (EoS) for NGINX Controller Application Delivery Module, effective January 1, 2024.

F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing NGINX Controller Application Delivery customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024.

See our End of Sale announcement for more details. +
+
\ No newline at end of file diff --git a/layouts/partials/banner/eos-mesh.html b/layouts/partials/banner/eos-mesh.html new file mode 100644 index 000000000..b38f34c90 --- /dev/null +++ b/layouts/partials/banner/eos-mesh.html @@ -0,0 +1,5 @@ +
+
+ End of Sale Notice:

F5 NGINX is announcing the End of Sale (EoS) for NGINX Management Suite API Connectivity Manager Module, effective January 1, 2024.

F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing API Connectivity Manager Module customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024.

See our End of Sale announcement for more details. +
+
\ No newline at end of file diff --git a/layouts/partials/ctlr-eos/list-main.html b/layouts/partials/ctlr-eos/list-main.html deleted file mode 100644 index 5393d4787..000000000 --- a/layouts/partials/ctlr-eos/list-main.html +++ /dev/null @@ -1,57 +0,0 @@ -
-
-
-

- {{ .Title }} -

- {{ if .Description }} -

- {{ .Description | markdownify }} -

- {{ end }} -
-
- End of Sale Notice:

F5 NGINX is announcing the End of Sale (EoS) for NGINX Controller API Management Module, effective January 1, 2024.

F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing NGINX Controller API- Management customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024.

See our End of Sale announcement for more details. -
-
-
-
- End of Sale Notice:

F5 NGINX is announcing the End of Sale (EoS) for NGINX Controller Application Delivery Module, effective January 1, 2024.

F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing NGINX Controller Application Delivery customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024.

See our End of Sale announcement for more details. -
-
- {{ if .Content }} -

- {{ .Content | markdownify }} -

- {{ end }} -
-
- -
-
-
- {{ range .Pages.GroupBy "Section" }} - - {{ range .Pages.ByWeight }} -
-
-

- - {{ .Title }} -

- {{/*}}

- {{ if .Description }}{{ .Description | markdownify }}{{ end }} -

{{*/}} - -
-
- - {{ end }} -
-
- {{ end }} - - -
- -
\ No newline at end of file diff --git a/layouts/partials/list-main.html b/layouts/partials/list-main.html index d9e123c6f..74c3a3f60 100644 --- a/layouts/partials/list-main.html +++ b/layouts/partials/list-main.html @@ -19,6 +19,14 @@

+ {{- with .Params.banner -}} + {{- if .enabled -}} + + {{- end -}} + {{- end -}} + {{ if or (lt .WordCount 1) (eq $PageTitle "F5 NGINX One Console") (eq $PageTitle "F5 NGINX App Protect DoS") (eq $PageTitle "F5 NGINX Plus") }}
diff --git a/layouts/partials/mesh-eos/list-main.html b/layouts/partials/mesh-eos/list-main.html deleted file mode 100644 index 5fc136e7f..000000000 --- a/layouts/partials/mesh-eos/list-main.html +++ /dev/null @@ -1,52 +0,0 @@ -
-
-
-
-
End of Sale Notice:

Commercial support for NGINX Service Mesh is available to customers who currently have active NGINX Microservices Bundle subscriptions. - F5 NGINX announced the End of Sale (EoS) for the NGINX Microservices Bundles as of July 1, 2023.

- See our End of Sale announcement for more details. -
-

- {{ .Title }} -

- {{ if .Description }} -

- {{ .Description | markdownify }} -

- {{ end }} - {{ if .Content }} -

- {{ .Content | markdownify }} -

- {{ end }} -
-
- -
-
-
- {{ range .Pages.GroupBy "Section" }} - - {{ range .Pages.ByWeight }} -
-
-

- - {{ .Title }} -

- {{/*}}

- {{ if .Description }}{{ .Description | markdownify }}{{ end }} -

{{*/}} - -
-
- - {{ end }} -
-
- {{ end }} - - -
- -
\ No newline at end of file From f3eb15a4d49cf4ca5510120e7fd8dcdfd8c908d9 Mon Sep 17 00:00:00 2001 From: Lam Nguyen Date: Wed, 21 May 2025 11:40:13 -0700 Subject: [PATCH 3/4] Removed list-main + moved to theme instead --- layouts/partials/list-main.html | 107 -------------------------------- 1 file changed, 107 deletions(-) delete mode 100644 layouts/partials/list-main.html diff --git a/layouts/partials/list-main.html b/layouts/partials/list-main.html deleted file mode 100644 index 74c3a3f60..000000000 --- a/layouts/partials/list-main.html +++ /dev/null @@ -1,107 +0,0 @@ -{{/* TODO: Delete this page, and use the one from nginx-hugo-them */}} -
- {{ $PageTitle := .Title }} -
-
-

- {{ .Title }} -

- {{ if .Description }} -

- {{ .Description | markdownify }} -

- {{ end}} - {{ if .Content }} -

- {{ .Content | markdownify }} -

- {{ end }} -
-
- - {{- with .Params.banner -}} - {{- if .enabled -}} - - {{- end -}} - {{- end -}} - - {{ if or (lt .WordCount 1) (eq $PageTitle "F5 NGINX One Console") (eq $PageTitle "F5 NGINX App Protect DoS") (eq $PageTitle "F5 NGINX Plus") }} -
-
-
- {{ range .Pages.GroupBy "Section" }} - {{ range .Pages.ByWeight }} -
-
-

- - {{ .Title }} -

- {{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "How-to guides") }} -
    - {{ range .Pages }} - {{ if eq .Kind "section" }} - {{ range .Pages }} -
  • {{ .Title }}
    • - {{ end }} - {{ end }} - {{ end }} -
- {{ end }} - {{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "API")}} - - {{ end }} - {{ if and (eq $PageTitle "F5 NGINX One Console") (eq .Title "Changelog") }} - {{ partial "changelog-date.html" . }} - {{ end }} -
-
- {{ end }} - {{ end }} -
- {{ if eq $PageTitle "F5 NGINX One Console" }} -

Other Products

- {{ $nginxProducts := slice - (dict "title" "NGINX Instance Manager" "url" "/nginx-instance-manager" "imgSrc" "NGINX-Instance-Manager-product-icon" "type" "local-console-option" "description" "Track and control NGINX Open Source and NGINX Plus instances.") - (dict "title" "NGINX Ingress Controller" "url" "/nginx-ingress-controller" "imgSrc" "NGINX-Ingress-Controller-product-icon" "type" "kubernetes-solutions" "description" "Kubernetes traffic management with API gateway, identity, and observability features.") - (dict "title" "NGINX Gateway Fabric" "url" "/nginx-gateway-fabric" "imgSrc" "NGINX-product-icon" "type" "kubernetes-solutions" "description" "Next generation Kubernetes connectivity using the Gateway API.") - (dict "title" "NGINX App Protect WAF" "url" "/nginx-app-protect-waf" "imgSrc" "NGINX-App-Protect-WAF-product-icon" "type" "security" "description" "Lightweight, high-performance, advanced protection against Layer 7 attacks on your apps and APIs.") - (dict "title" "NGINX App Protect DoS" "url" "/nginx-app-protect-dos" "imgSrc" "NGINX-App-Protect-DoS-product-icon" "type" "security" "description" "Defend, adapt, and mitigate against Layer 7 denial-of-service attacks on your apps and APIs.") - (dict "title" "NGINX Plus" "url" "/nginx" "imgSrc" "NGINX-Plus-product-icon-RGB" "type" "modern-app-delivery" "description" "The all-in-one load balancer, reverse proxy, web server, content cache, and API gateway.") - (dict "title" "NGINX Open Source" "url" "https://nginx.org/en/docs/" "imgSrc" "NGINX-product-icon" "type" "modern-app-delivery" "description" "The open source all-in-one load balancer, content cache, and web server") - }} - {{ $groupedProducts := dict - "local-console-option" (where $nginxProducts "type" "local-console-option") - "kubernetes-solutions" (where $nginxProducts "type" "kubernetes-solutions") - "security" (where $nginxProducts "type" "security") - "modern-app-delivery" (where $nginxProducts "type" "modern-app-delivery") - }} - {{ range $type, $products := $groupedProducts }} -
-

{{ $type | humanize | title }}

- {{ range $products }} -
-
-

- - {{ .title }} -

-

- {{ if .description }}{{ .description | markdownify }}{{ end }} -

-
-
- {{ end }} -
- {{ end }} - {{ end }} -
-
- {{end}} -
\ No newline at end of file From 46c7083b58840ebe258d76067e2f8f8f65802ad8 Mon Sep 17 00:00:00 2001 From: Lam Nguyen Date: Fri, 23 May 2025 11:58:41 -0700 Subject: [PATCH 4/4] Updated to use md + removed html files --- content/_banners/eos-cltr.md | 10 ++++++++++ content/_banners/eos-mesh.md | 10 ++++++++++ content/_banners/upgrade-r33.md | 10 ++++++++++ content/controller/_index.md | 4 +--- content/mesh/_index.md | 4 +--- content/nim/deploy/_index.md | 4 +--- layouts/partials/banner/deprecation-r33.html | 12 ------------ layouts/partials/banner/eos-cltr.html | 5 ----- layouts/partials/banner/eos-mesh.html | 5 ----- 9 files changed, 33 insertions(+), 31 deletions(-) create mode 100644 content/_banners/eos-cltr.md create mode 100644 content/_banners/eos-mesh.md create mode 100644 content/_banners/upgrade-r33.md delete mode 100644 layouts/partials/banner/deprecation-r33.html delete mode 100644 layouts/partials/banner/eos-cltr.html delete mode 100644 layouts/partials/banner/eos-mesh.html diff --git a/content/_banners/eos-cltr.md b/content/_banners/eos-cltr.md new file mode 100644 index 000000000..a4ce273a9 --- /dev/null +++ b/content/_banners/eos-cltr.md @@ -0,0 +1,10 @@ +--- +title: NGINX Controller EOS Banner +--- +{{< banner "warning" "End of Sale Notice:" >}} + F5 NGINX is announcing the End of Sale (EoS) for NGINX Controller Application Delivery Module, effective January 1, 2024. +

+ F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing NGINX Controller Application Delivery customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024. +

+ See our [End of Sale announcement](https://my.f5.com/manage/s/article/K000137993) for more details +{{}} \ No newline at end of file diff --git a/content/_banners/eos-mesh.md b/content/_banners/eos-mesh.md new file mode 100644 index 000000000..34688d7df --- /dev/null +++ b/content/_banners/eos-mesh.md @@ -0,0 +1,10 @@ +--- +title: NGINX Service Mesh EOS Banner +--- +{{< banner "warning" "End of Sale Notice:" >}} + F5 NGINX is announcing the End of Sale (EoS) for NGINX Management Suite API Connectivity Manager Module, effective January 1, 2024. +

+ F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing API Connectivity Manager Module customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024. +

+ See our [End of Sale announcement](https://my.f5.com/manage/s/article/K000137989) for more details. +{{}} \ No newline at end of file diff --git a/content/_banners/upgrade-r33.md b/content/_banners/upgrade-r33.md new file mode 100644 index 000000000..3ed97bdac --- /dev/null +++ b/content/_banners/upgrade-r33.md @@ -0,0 +1,10 @@ +--- +title: R33 Upgrade Banner +--- +{{< banner "caution" "Important: NGINX Plus R33 requires NGINX Instance Manager 2.18 or later" >}} + To ensure uninterrupted traffic processing, upgrade to NGINX Instance Manager 2.18 or later if your NGINX data plane instances are running NGINX Plus R33. This upgrade is necessary to support usage reporting. +

+ NGINX Plus R33 instances must send usage data to the F5 licensing endpoint or NGINX Instance Manager. If they don’t, they will stop processing traffic. +

+ For more information about usage reporting and enforcement, see [About solution licenses](../../../../solutions/about-subscription-licenses) +{{}} \ No newline at end of file diff --git a/content/controller/_index.md b/content/controller/_index.md index 671a52f57..e14138efd 100644 --- a/content/controller/_index.md +++ b/content/controller/_index.md @@ -9,9 +9,7 @@ cascade: banner: enabled: true type: deprecation - start-date: 2024-01-01 - end-date: 2024-02-01 - md: banner/eos-cltr + md: _banners/eos-cltr.md url: /nginx-controller/ --- diff --git a/content/mesh/_index.md b/content/mesh/_index.md index 6345c2705..5cda71545 100644 --- a/content/mesh/_index.md +++ b/content/mesh/_index.md @@ -11,8 +11,6 @@ cascade: banner: enabled: true type: deprecation - start-date: 2024-01-01 - end-date: 2024-02-01 - md: banner/eos-mesh + md: _banners/eos-mesh.md --- diff --git a/content/nim/deploy/_index.md b/content/nim/deploy/_index.md index 878ffe9f8..0cd726566 100644 --- a/content/nim/deploy/_index.md +++ b/content/nim/deploy/_index.md @@ -7,7 +7,5 @@ cascade: banner: enabled: true type: deprecation - start-date: 2024-01-01 - end-date: 2024-02-01 - md: banner/deprecation-r33 + md: _banners/upgrade-r33.md --- \ No newline at end of file diff --git a/layouts/partials/banner/deprecation-r33.html b/layouts/partials/banner/deprecation-r33.html deleted file mode 100644 index 11996342c..000000000 --- a/layouts/partials/banner/deprecation-r33.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
- Important: NGINX Plus R33 requires NGINX Instance Manager 2.18 or later -
- To ensure uninterrupted traffic processing, upgrade to NGINX Instance Manager 2.18 or later if your NGINX data plane instances are running NGINX Plus R33. This upgrade is necessary to support usage reporting. -

- NGINX Plus R33 instances must send usage data to the F5 licensing endpoint or NGINX Instance Manager. If they don’t, they will stop processing traffic. -

- For more information about usage reporting and enforcement, see - About solution licenses. -
-
\ No newline at end of file diff --git a/layouts/partials/banner/eos-cltr.html b/layouts/partials/banner/eos-cltr.html deleted file mode 100644 index e793ef511..000000000 --- a/layouts/partials/banner/eos-cltr.html +++ /dev/null @@ -1,5 +0,0 @@ -
-
- End of Sale Notice:

F5 NGINX is announcing the End of Sale (EoS) for NGINX Controller Application Delivery Module, effective January 1, 2024.

F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing NGINX Controller Application Delivery customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024.

See our End of Sale announcement for more details. -
-
\ No newline at end of file diff --git a/layouts/partials/banner/eos-mesh.html b/layouts/partials/banner/eos-mesh.html deleted file mode 100644 index b38f34c90..000000000 --- a/layouts/partials/banner/eos-mesh.html +++ /dev/null @@ -1,5 +0,0 @@ -
-
- End of Sale Notice:

F5 NGINX is announcing the End of Sale (EoS) for NGINX Management Suite API Connectivity Manager Module, effective January 1, 2024.

F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing API Connectivity Manager Module customers can continue to use the product past the EoS date. License renewals are not available after September 30, 2024.

See our End of Sale announcement for more details. -
-
\ No newline at end of file