Merge remote-tracking branch 'origin' into agent-release-3.0

Author: JTorreG

.github/workflows/build-push.yml

@@ -33,7 +33,7 @@ on:
         type: string
   pull_request:
     branches:
-      - "*"
+      - "**"
   push:
     branches:
       - "main"

_banners/eos-cltr.md

@@ -0,0 +1,8 @@
+{{< banner "warning" "End of Sale Notice:" >}}
+  <br>
+  F5 NGINX is announcing the <strong>End of Sale (EoS)</strong> for NGINX Controller Application Delivery Module, <strong>effective January 1, 2024</strong>.
+  <br><br>
+  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. <strong>License renewals are not available after September 30, 2024.</strong>
+  <br><br>
+  See our <a href="https://my.f5.com/manage/s/article/K000137993">End of Sale announcement</a> for more details
+{{</ banner >}}

_banners/eos-mesh.md

@@ -0,0 +1,8 @@
+{{< banner "warning" "End of Sale Notice:" >}}
+  <br>
+  F5 NGINX is announcing the <strong>End of Sale (EoS)</strong> for NGINX Management Suite API Connectivity Manager Module, <strong>effective January 1, 2024</strong>.
+  <br><br>
+  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. <strong>License renewals are not available after September 30, 2024.</strong>
+  <br><br>
+  See our <a href="https://my.f5.com/manage/s/article/K000137989">End of Sale announcement</a> for more details.
+{{</ banner >}}

_banners/upgrade-r33.md

@@ -0,0 +1,5 @@
+{{< banner "caution" "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. 
+  <br><br>
+  For more details about usage reporting and enforcement, see [About solution licenses]({{< ref "/solutions/about-subscription-licenses.md" >}})
+{{</ banner >}}

config/_default/config.toml

@@ -47,7 +47,8 @@ enableGitInfo = true
     "taxonomyTerm"
   ]
   taxonomiesExcludedFromSitemap = ["tags", "categories", "doctypes"]
-
+  unitversion= "1.34.1"
+  unitversionv= "v1.34.1"
   #logo = ""
 
   # Version lists; used by the versions shortcode

content/controller/_index.md

@@ -5,8 +5,11 @@ title: F5 NGINX Controller
 weight: 2100
 cascade:
   logo: "NGINX-Controller-product-icon-RGB.svg"
-  type: "ctlr-eos"
   noindex: true
+  banner:
+    enabled: true
+    type: deprecation
+    md: _banners/eos-cltr.md
 url: /nginx-controller/
 ---
 

content/includes/nginx-one/add-file/existing-ssl-bundle.md

@@ -2,7 +2,7 @@
 docs:
 ---
 
-With this option, You can incorporate [Managed certificates]({{< ref "/nginx-one/certificates/manage-certificates.md#managed-and-unmanaged-certificates" >}}).
+With this option, you can incorporate [Managed certificates]({{< ref "/nginx-one/nginx-configs/certificates/manage-certificates.md#managed-and-unmanaged-certificates" >}}).
 In the **Choose Certificate** drop-down, select the managed certificate of your choice, and select **Add**. You can then:
 
 1. Review details of the certificate. The next steps depend on whether the certificate is a CA bundle or a certificate / key pair.

content/includes/nginx-one/how-to/add-instance.md

@@ -1,5 +1,8 @@
 ---
 docs:
+files:
+  - content/nginx-one/connect-instances/add-instance.md
+  - content/nginx-one/getting-started.md
 ---
 
 You can add an instance to NGINX One Console in the following ways:

content/includes/nginx-one/staged-config-overview.md

@@ -13,6 +13,6 @@ With Staged Configurations, you can use these features of NGINX One Console:
 - Automatic syntax checking
 - Contextual documentation
 - Dynamic analysis of your work in progress
-- Suggestions from our AI assistant
+- Suggestions from our F5 AI assistant
 
 Once you've finished your work and have pushed the changes to an Instance or a Config Sync Group, you can next delete that Staged Configuration.

content/includes/nginxaas-azure/ssl-tls-prerequisites.md

@@ -2,9 +2,11 @@
 docs: "DOCS-000"
 ---
 
+NGINXaaS natively integrates with [Azure Key Vault (AKV)](https://azure.microsoft.com/en-us/products/key-vault), so you can bring your own certificates and manage them in a centralized location. You will need:
+
 - AKV to store certificates that you want to add to the deployment.
 
-- A user or system assigned identity associated with your NGINXaaS deployment. Ensure that your managed identity (MI) has read access to secrets stored in AKV:
+- A user or system assigned identity associated with your NGINXaaS deployment. Ensure that your Managed Identity (MI) has read access to secrets stored in AKV:
 
   - If using Azure RBAC for AKV, ensure that your MI has [Key Vault Secrets User](https://learn.microsoft.com/en-us/azure/role-based-access-control/built-in-roles#key-vault-secrets-user) or higher permissions.