diff --git a/doc/source/security/kubernetes/security-configure-container-backed-remote-clis-and-clients.rst b/doc/source/security/kubernetes/security-configure-container-backed-remote-clis-and-clients.rst index 6ee6db094..1489e7c6b 100644 --- a/doc/source/security/kubernetes/security-configure-container-backed-remote-clis-and-clients.rst +++ b/doc/source/security/kubernetes/security-configure-container-backed-remote-clis-and-clients.rst @@ -60,7 +60,8 @@ CLIs and Clients for an admin user with cluster-admin clusterrole. .. _security-configure-container-backed-remote-clis-and-clients-d70e93: -#. On the Controller, configure a Kubernetes service account for user on the remote client. +#. On the Controller, configure a Kubernetes service account for users on the + remote client. You must configure a Kubernetes service account on the target system and generate a configuration file based on that service account. @@ -132,7 +133,7 @@ CLIs and Clients for an admin user with cluster-admin clusterrole. ~(keystone_admin)]$ OAM_IP=$(system oam-show |grep oam_floating_ip| awk '{print $4}') - #. AIO-SX uses instead of . The + #. |AIO-SX| uses instead of . The following shell code ensures that is assigned the correct IP address. @@ -242,12 +243,9 @@ CLIs and Clients for an admin user with cluster-admin clusterrole. #. Run the :command:`configure\_client.sh` script. - .. code-block:: none + .. parsed-literal:: - $ ./configure_client.sh -t platform -r admin_openrc.sh -k - admin-kubeconfig -w HOME/remote_cli_wd -p - 625619392498.dkr.ecr.us-west-2.amazonaws.com/docker.io/starlingx/stx-platfo - rmclients:stx.5.0-v1.4.3 + $ ./configure_client.sh -t platform -r admin_openrc.sh -k admin-kubeconfig -w HOME/remote_cli_wd -p |registry-url|/starlingx/stx-platformclients:stx.5.0-v1.4.3 If you specify repositories that require authentication, as shown above, you must first perform a :command:`docker login` to that @@ -300,13 +298,9 @@ CLIs and Clients for an admin user with cluster-admin clusterrole. For example, to use the container images from the WRS AWS ECR: - .. code-block:: none - - $ ./configure_client.sh -t platform -r admin-openrc.sh -k - admin-kubeconfig -w $HOME/remote_cli_wd -p - 625619392498.dkr.ecr.us-west-2.amazonaws.com/docker.io/starlingx/stx-platformclients:stx.5.0-v1.4.3 - + .. parsed-literal:: + $ ./configure_client.sh -t platform -r admin-openrc.sh -k admin-kubeconfig -w $HOME/remote_cli_wd -p |registry-url|/starlingx/stx-platformclients:stx.5.0-v1.4.3 If you specify repositories that require authentication, you must first perform a :command:`docker login` to that repository before using diff --git a/doc/source/usertasks/figures/figure_1_cert_manager.png b/doc/source/usertasks/kubernetes/figures/figure_1_cert_manager.png similarity index 100% rename from doc/source/usertasks/figures/figure_1_cert_manager.png rename to doc/source/usertasks/kubernetes/figures/figure_1_cert_manager.png diff --git a/doc/source/usertasks/figures/figure_2_cert_manager.png b/doc/source/usertasks/kubernetes/figures/figure_2_cert_manager.png similarity index 100% rename from doc/source/usertasks/figures/figure_2_cert_manager.png rename to doc/source/usertasks/kubernetes/figures/figure_2_cert_manager.png diff --git a/doc/source/usertasks/figures/figure_3_issuers_dist_cloud.png b/doc/source/usertasks/kubernetes/figures/figure_3_issuers_dist_cloud.png similarity index 100% rename from doc/source/usertasks/figures/figure_3_issuers_dist_cloud.png rename to doc/source/usertasks/kubernetes/figures/figure_3_issuers_dist_cloud.png diff --git a/doc/source/usertasks/kubernetes/issuers-in-distributed-cloud-fbc035675c0f.rst b/doc/source/usertasks/kubernetes/issuers-in-distributed-cloud-fbc035675c0f.rst index 8031085da..41f0901a3 100644 --- a/doc/source/usertasks/kubernetes/issuers-in-distributed-cloud-fbc035675c0f.rst +++ b/doc/source/usertasks/kubernetes/issuers-in-distributed-cloud-fbc035675c0f.rst @@ -38,8 +38,7 @@ options for the cert-manager ISSUERs they use: See below: - .. figure:: /usertasks/figures/figure_3_issuers_dist_cloud.png - :scale: 100% + .. figure:: /usertasks/kubernetes/figures/figure_3_issuers_dist_cloud.png The RootCA Certificate and Intermediate |CA| Certificates are created/renewed automatically by |prod|. diff --git a/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-cert-manager.rst b/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-cert-manager.rst index 06cf8f700..070b9a22e 100644 --- a/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-cert-manager.rst +++ b/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-cert-manager.rst @@ -44,8 +44,7 @@ supports the following general modes of operation: CERTIFICATE specs), in order to renew the CERTIFICATE and update the Kubernetes SECRET holding the certificate. - .. figure:: /usertasks/figures/figure_1_cert_manager.png - :scale: 100% + .. figure:: /usertasks/kubernetes/figures/figure_1_cert_manager.png - Providing an Internal Certificate Authority @@ -76,8 +75,7 @@ supports the following general modes of operation: CERTIFICATE specs), in order to renew the CERTIFICATE and update the Kubernetes SECRET holding the certificate. - .. figure:: /usertasks/figures/figure_2_cert_manager.png - :scale: 100% + .. figure:: /usertasks/kubernetes/figures/figure_2_cert_manager.png - Combination of the above two modes diff --git a/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-configuring-container-backed-remote-clis-and-clients.rst b/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-configuring-container-backed-remote-clis-and-clients.rst index 15f18f732..da9279d2c 100644 --- a/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-configuring-container-backed-remote-clis-and-clients.rst +++ b/doc/source/usertasks/kubernetes/kubernetes-user-tutorials-configuring-container-backed-remote-clis-and-clients.rst @@ -185,9 +185,9 @@ and clients for a non-admin user. For example, to use the container images from the WRS AWS ECR: - .. code-block:: none + .. parsed-literal:: - $ ./configure_client.sh -t platform -r my-openrc.sh -k user-kubeconfig -w $HOME/remote_cli_wd -p 625619392498.dkr.ecr.us-west-2.amazonaws.com/docker.io/starlingx/stx-platformclients:stx.5.0-v1.4.3 + $ ./configure_client.sh -t platform -r my-openrc.sh -k user-kubeconfig -w $HOME/remote_cli_wd -p |registry-url|/starlingx/stx-platformclients:stx.5.0-v1.4.3 If you specify repositories that require authentication, you must perform a :command:`docker login` to that repository before using