From d51ed3003803173bbc34b636eb842c91028d7354 Mon Sep 17 00:00:00 2001 From: Elaine Fonaro Date: Thu, 25 May 2023 10:39:12 -0300 Subject: [PATCH] "Rook-ceph-apps" should not be shown in "system application-list" (r8, dsr8, r7, dsr7) - Created the include files for apps versions. - Removed "rook-ceph-apps" from the result of command "system application-list" and command "system application-list -nowrap". Signed-off-by: Elaine Fonaro Change-Id: I8d944b45e584756c4d956e881ba398d6bf4af4ac --- ...plication-commands-and-helm-overrides.rest | 5 ++ ...pplication-commands-and-helm-overrides.rst | 58 ++++++++++++------- 2 files changed, 41 insertions(+), 22 deletions(-) create mode 100644 doc/source/_includes/application-commands-and-helm-overrides.rest diff --git a/doc/source/_includes/application-commands-and-helm-overrides.rest b/doc/source/_includes/application-commands-and-helm-overrides.rest new file mode 100644 index 000000000..5b0bbaf90 --- /dev/null +++ b/doc/source/_includes/application-commands-and-helm-overrides.rest @@ -0,0 +1,5 @@ +.. app-version-begin +.. app-version-end + +.. application-version-begin +.. application-version-end \ No newline at end of file diff --git a/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst b/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst index 5b8f09f83..194926e2e 100644 --- a/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst +++ b/doc/source/system_configuration/kubernetes/application-commands-and-helm-overrides.rst @@ -29,19 +29,26 @@ commands to manage containerized applications provided as part of |prod|. For example: - .. parsed-literal:: + .. only:: partner - ~(keystone_admin)]$ system application-list --nowrap + .. include:: /_includes/application-commands-and-helm-overrides.rest + :start-after: app-version-begin + :end-before: app-version-end - +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ - | application | version | manifest name | manifest file | status | progress | - +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ - | cert-manager | 1.0-34 | cert-manager-fluxcd-manifests | fluxcd-manifests | applied | completed | - | nginx-ingress-controller | 1.1-35 | nginx-ingress-controller-fluxcd-manifests | fluxcd-manifests | applied | completed | - | oidc-auth-apps | 1.0-68 | oidc-auth-apps-fluxcd-manifests | fluxcd-manifests | uploaded | completed | - | platform-integ-apps | 1.0-52 | platform-integ-apps-fluxcd-manifests | fluxcd-manifests | applied | completed | - | rook-ceph-apps | 1.0-17 | rook-ceph-manifest | manifest.yaml | uploaded | completed | - +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ + .. only:: starlingx + + .. parsed-literal:: + + ~(keystone_admin)]$ system application-list --nowrap + + +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ + | application | version | manifest name | manifest file | status | progress | + +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ + | cert-manager | 1.0-34 | cert-manager-fluxcd-manifests | fluxcd-manifests | applied | completed | + | nginx-ingress-controller | 1.1-35 | nginx-ingress-controller-fluxcd-manifests | fluxcd-manifests | applied | completed | + | oidc-auth-apps | 1.0-68 | oidc-auth-apps-fluxcd-manifests | fluxcd-manifests | uploaded | completed | + | platform-integ-apps | 1.0-52 | platform-integ-apps-fluxcd-manifests | fluxcd-manifests | applied | completed | + +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ ``application-show`` Use the following command to show details for |prod|. @@ -405,18 +412,25 @@ commands to manage containerized applications provided as part of |prod|. You can look up the name of an application using the :command:`application-list` command: - .. code-block:: none + .. only:: partner - ~(keystone_admin)]$ system application-list - +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ - | application | version | manifest name | manifest file | status | progress | - +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ - | cert-manager | 1.0-34 | cert-manager-fluxcd-manifests | fluxcd-manifests | applied | completed | - | nginx-ingress-controller | 1.1-35 | nginx-ingress-controller-fluxcd-manifests | fluxcd-manifests | applied | completed | - | oidc-auth-apps | 1.0-68 | oidc-auth-apps-fluxcd-manifests | fluxcd-manifests | uploaded | completed | - | platform-integ-apps | 1.0-52 | platform-integ-apps-fluxcd-manifests | fluxcd-manifests | applied | completed | - | rook-ceph-apps | 1.0-17 | rook-ceph-manifest | manifest.yaml | uploaded | completed | - +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ + .. include:: /_includes/application-commands-and-helm-overrides.rest + :start-after: application-version-begin + :end-before: application-version-end + + .. only:: starlingx + + .. code-block:: none + + ~(keystone_admin)]$ system application-list + +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ + | application | version | manifest name | manifest file | status | progress | + +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ + | cert-manager | 1.0-34 | cert-manager-fluxcd-manifests | fluxcd-manifests | applied | completed | + | nginx-ingress-controller | 1.1-35 | nginx-ingress-controller-fluxcd-manifests | fluxcd-manifests | applied | completed | + | oidc-auth-apps | 1.0-68 | oidc-auth-apps-fluxcd-manifests | fluxcd-manifests | uploaded | completed | + | platform-integ-apps | 1.0-52 | platform-integ-apps-fluxcd-manifests | fluxcd-manifests | applied | completed | + +--------------------------+---------+-------------------------------------------+------------------+----------+-----------+ The output indicates that the currently installed version of **cert-manager** is 1.0-34.