From 384ecb97e40eb54d5e01b8d813bb6a954d0e1c99 Mon Sep 17 00:00:00 2001
From: Ron Stone <ronald.stone@windriver.com>
Date: Tue, 12 Oct 2021 09:53:23 -0400
Subject: [PATCH] Remove instructions to delete secret resource
Instructions removed for Vault and Portieris
Added command to remove Vault
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: Idbf6625751a739181c4a0ec5d9161dcfc881d0f8
---
.../security/kubernetes/remove-portieris.rst | 1 -
doc/source/security/kubernetes/remove-vault.rst | 17 +++++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/doc/source/security/kubernetes/remove-portieris.rst b/doc/source/security/kubernetes/remove-portieris.rst
index 6d8ed0dce..70aa8242c 100644
--- a/doc/source/security/kubernetes/remove-portieris.rst
+++ b/doc/source/security/kubernetes/remove-portieris.rst
@@ -25,7 +25,6 @@ system.
~(keystone_admin)]$ kubectl delete clusterroles.rbac.authorization.k8s.io portieris
~(keystone_admin)]$ kubectl delete clusterrolebindings.rbac.authorization.k8s.io admission-portieris-webhook
- ~(keystone_admin)]$ kubectl delete -n portieris secret/portieris-certs
~(keystone_admin)]$ kubectl delete -n portieris cm/image-policy-crds
~(keystone_admin)]$ kubectl delete -n portieris serviceaccounts/portieris
diff --git a/doc/source/security/kubernetes/remove-vault.rst b/doc/source/security/kubernetes/remove-vault.rst
index 83491ed3e..93b8469dc 100644
--- a/doc/source/security/kubernetes/remove-vault.rst
+++ b/doc/source/security/kubernetes/remove-vault.rst
@@ -23,23 +23,20 @@ resources created by the Armada installation. For more information, see
$ system application-remove vault
-#. \(Optional\) If you want to reinstall Vault, and only retain Vault data
- stored in PVCs, use the following command:
+
+#. Reinstall Vault, if required using the following command:
.. code-block:: none
- $ kubectl delete secrets -n vault vault-server-tls
+ $ system application-apply vault
-
- #. Reinstall Vault, if required using the following command:
+ .. note::
+ It is recommended to do a complete remove of all resources if you want
+ to reinstall Vault.
.. code-block:: none
- $ system application-apply vault
-
- .. note::
- It is recommended to do a complete remove of all resources if you
- want to reinstall Vault.
+ $ kubectl delete ns vault
#. To completely remove Vault, including PVCs \(PVCs are intended to