diff --git a/doc/source/_includes/application-reference-8916dfe370cd.rest b/doc/source/_includes/application-reference-8916dfe370cd.rest index 23e361960..244a86a59 100644 --- a/doc/source/_includes/application-reference-8916dfe370cd.rest +++ b/doc/source/_includes/application-reference-8916dfe370cd.rest @@ -16,7 +16,6 @@ .. deployment-manager-image-begin .. deployment-manager-image-end - .. deployment-manager-chart2-begin .. deployment-manager-chart2-end @@ -31,3 +30,6 @@ .. deployment-manager-image2-begin .. deployment-manager-image2-end + +.. nginx-version-begin +.. nginx-version-end diff --git a/doc/source/application-ref/application-reference-8916dfe370cd.rst b/doc/source/application-ref/application-reference-8916dfe370cd.rst index d5b0daf85..7aa3c6450 100644 --- a/doc/source/application-ref/application-reference-8916dfe370cd.rst +++ b/doc/source/application-ref/application-reference-8916dfe370cd.rst @@ -229,15 +229,34 @@ the table to navigate to the applications based on your requirement. - :ref:`node-interface-metrics-exporter-application-d98b2707c7e9` - registry.k8s.io/starlingx/metrics-exporter-api:v1.0.2 * - nginx-ingress-controller - - ingress-nginx-4.11.1 + + - .. only:: partner + + .. include:: /_includes/application-reference-8916dfe370cd.rest + :start-after: nginx-version-begin + :end-before: nginx-version-end + + .. only:: starlingx + + ingress-nginx-4.12.1 secret-observer-0.1.1 - - Optional - - v1.11.1 + + - Mandatory + + - .. only:: partner + + .. include:: /_includes/application-reference-8916dfe370cd.rest + :start-after: nginx-version-begin + :end-before: nginx-version-end + + .. only:: starlingx + + v1.12.1 - :ref:`the-cert-manager-bootstrap-process` - registry.k8s.io/defaultbackend-amd64:1.5 - registry.k8s.io/ingress-nginx/controller:v1.11.1 + registry.k8s.io/ingress-nginx/controller:v1.12.1 registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.1 @@ -334,7 +353,7 @@ the table to navigate to the applications based on your requirement. quay.io/silicom/tsyncd:2.1.3.6 * - cert-manager - cert-manager-v1.15.3 - - Optional + - Mandatory - v1.15.3 - :ref:`the-cert-manager-bootstrap-process` - quay.io/jetstack/cert-manager-controller v1.15.3 @@ -540,3 +559,5 @@ the table to navigate to the applications based on your requirement. .. include:: /_includes/application-reference-8916dfe370cd.rest :start-after: deployment-manager-image2-begin :end-before: deployment-manager-image2-end + + diff --git a/doc/source/releasenotes/index.rst b/doc/source/releasenotes/index.rst index e31b03589..f9134d45f 100644 --- a/doc/source/releasenotes/index.rst +++ b/doc/source/releasenotes/index.rst @@ -80,7 +80,7 @@ The following platform component versions have been updated in |prod| 10.0. - nginx-ingress-controller - - ingress-nginx 4.11.1 + - ingress-nginx 4.12.1 - secret-observer 0.1.1 diff --git a/doc/source/security/kubernetes/the-cert-manager-bootstrap-process.rst b/doc/source/security/kubernetes/the-cert-manager-bootstrap-process.rst index 829890c7e..bd1897be5 100644 --- a/doc/source/security/kubernetes/the-cert-manager-bootstrap-process.rst +++ b/doc/source/security/kubernetes/the-cert-manager-bootstrap-process.rst @@ -74,11 +74,23 @@ web pages: .. _the-cert-manager-bootstrap-process-ul-d4j-khv-nlb: -- ``nginx-ingress-controller`` +.. only:: partner - `https://github.com/kubernetes/ingress-nginx/blob/helm-chart-4.11.1/charts/ingress-nginx/values.yaml `__ + - ``nginx-ingress-controller`` -- ``cert-manager`` + `https://github.com/kubernetes/ingress-nginx/blob/helm-chart-4.11.5/charts/ingress-nginx/values.yaml `__ - `https://github.com/cert-manager/cert-manager/blob/v1.15.3/deploy/charts/cert-manager/values.yaml `__ + - ``cert-manager`` + + `https://github.com/cert-manager/cert-manager/blob/v1.15.3/deploy/charts/cert-manager/values.yaml `__ + +.. only:: starlingx + + - ``nginx-ingress-controller`` + + `https://github.com/kubernetes/ingress-nginx/blob/helm-chart-4.12.1/charts/ingress-nginx/values.yaml `__ + + - ``cert-manager`` + + `https://github.com/cert-manager/cert-manager/blob/v1.15.3/deploy/charts/cert-manager/values.yaml `__