Fix usertask images (pick)

Image location not readable in DS builds. Moved under kubernetes
Build cannot read image geometry metadata, causing :scale: option to fail. Removed.

Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: I526e798bc22efc7efb03b81392825bb3ea9504f0
This commit is contained in:
Ron Stone 2021-11-01 07:54:58 -04:00
parent c8f3cc1b05
commit 749a8b7535
7 changed files with 12 additions and 21 deletions

View File

@ -60,7 +60,8 @@ CLIs and Clients for an admin user with cluster-admin clusterrole.
.. _security-configure-container-backed-remote-clis-and-clients-d70e93: .. _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 You must configure a Kubernetes service account on the target system
and generate a configuration file based on that service account. 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}') ~(keystone_admin)]$ OAM_IP=$(system oam-show |grep oam_floating_ip| awk '{print $4}')
#. AIO-SX uses <oam\_ip> instead of <oam\_floating\_ip>. The #. |AIO-SX| uses <oam\_ip> instead of <oam\_floating\_ip>. The
following shell code ensures that <OAM\_IP> is assigned the correct following shell code ensures that <OAM\_IP> is assigned the correct
IP address. IP address.
@ -242,12 +243,9 @@ CLIs and Clients for an admin user with cluster-admin clusterrole.
#. Run the :command:`configure\_client.sh` script. #. Run the :command:`configure\_client.sh` script.
.. code-block:: none .. parsed-literal::
$ ./configure_client.sh -t platform -r admin_openrc.sh -k $ ./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
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
If you specify repositories that require authentication, as shown If you specify repositories that require authentication, as shown
above, you must first perform a :command:`docker login` to that 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: For example, to use the container images from the WRS AWS ECR:
.. 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-platformclients: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, you must first If you specify repositories that require authentication, you must first
perform a :command:`docker login` to that repository before using perform a :command:`docker login` to that repository before using

View File

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

View File

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

View File

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 107 KiB

View File

@ -38,8 +38,7 @@ options for the cert-manager ISSUERs they use:
See below: See below:
.. figure:: /usertasks/figures/figure_3_issuers_dist_cloud.png .. figure:: /usertasks/kubernetes/figures/figure_3_issuers_dist_cloud.png
:scale: 100%
The RootCA Certificate and Intermediate |CA| Certificates are The RootCA Certificate and Intermediate |CA| Certificates are
created/renewed automatically by |prod|. created/renewed automatically by |prod|.

View File

@ -44,8 +44,7 @@ supports the following general modes of operation:
CERTIFICATE specs), in order to renew the CERTIFICATE and update the CERTIFICATE specs), in order to renew the CERTIFICATE and update the
Kubernetes SECRET holding the certificate. Kubernetes SECRET holding the certificate.
.. figure:: /usertasks/figures/figure_1_cert_manager.png .. figure:: /usertasks/kubernetes/figures/figure_1_cert_manager.png
:scale: 100%
- Providing an Internal Certificate Authority - 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 CERTIFICATE specs), in order to renew the CERTIFICATE and update the
Kubernetes SECRET holding the certificate. Kubernetes SECRET holding the certificate.
.. figure:: /usertasks/figures/figure_2_cert_manager.png .. figure:: /usertasks/kubernetes/figures/figure_2_cert_manager.png
:scale: 100%
- Combination of the above two modes - Combination of the above two modes

View File

@ -185,9 +185,9 @@ and clients for a non-admin user.
For example, to use the container images from the WRS AWS ECR: 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 If you specify repositories that require authentication, you must
perform a :command:`docker login` to that repository before using perform a :command:`docker login` to that repository before using