starlingx/docs
Code Issues Proposed changes

Merge "Protocols update and renaming" into r/stx.5.0

Browse Source
This commit is contained in:
Zuul
2021-06-23 21:03:23 +00:00
committed by Gerrit Code Review
parent aad8699b18 b26aa819fa
commit 64082ee418
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.vscode/settings.json vendored
View File

@@ -1,11 +0,0 @@
{
<<<<<<< HEAD (833046 Merge "Add publish date to HTML output" into r/stx.5.0)
"restructuredtext.languageServer.disabled": true,
"restructuredtext.preview.sphinx.disabled": true,
"restructuredtext.linter.disabled": true
=======
"restructuredtext.linter.disabled": true,
"restructuredtext.preview.sphinx.disabled": true,
"restructuredtext.languageServer.disabled": true
>>>>>>> CHANGE (569fd3 New content for Metrics Server tutorials (user and admin))
}

10
doc/source/security/kubernetes/security-install-kubectl-and-helm-clients-directly-on-a-host.rst
View File

@@ -86,9 +86,9 @@ configuration is required in order to use :command:`helm`.
.. note:: .. note::
In order for your remote host to trust the certificate used by In order for your remote host to trust the certificate used by
the |prod-long| K8S API, you must ensure that the the |prod-long| K8S API, you must ensure that the
**k8s\_root\_ca\_cert** specified at install time is a trusted ``k8s\_root\_ca\_cert`` specified at install time is a trusted
CA certificate by your host. Follow the instructions for adding |CA| certificate by your host. Follow the instructions for adding
a trusted CA certificate for the operating system distribution a trusted |CA| certificate for the operating system distribution
of your particular host. of your particular host.
If you did not specify a **k8s\_root\_ca\_cert** at install If you did not specify a **k8s\_root\_ca\_cert** at install
@@ -109,7 +109,9 @@ configuration is required in order to use :command:`helm`.
--user admin-user@mycluster --namespace=default --user admin-user@mycluster --namespace=default
% kubectl config use-context admin-user@mycluster % kubectl config use-context admin-user@mycluster
<$TOKEN\_DATA> is the token retrieved in step 1.
``$TOKEN_DATA`` is the token retrieved in step 1.
#. Test remote :command:`kubectl` access. #. Test remote :command:`kubectl` access.