Merge pull request #47705 from rh-tokeefe/OSSMDOC-627

OSSMDOC-627: Remove duplicate ID

Author: JStickler

modules/ossm-security-cert-manage-1x.adoc

@@ -3,7 +3,7 @@
 // * service_mesh/v1x/ossm-security.adoc
 
 
-[id="ossm-cert-manage_{context}"]
+[id="ossm-cert-manage-1x_{context}"]
 = Adding an external certificate authority key and certificate
 
 By default, {SMProductName} generates self-signed root certificate and key, and uses them to sign the workload certificates. You can also use the user-defined certificate and key to sign workload certificates, with user-defined root certificate. This task demonstrates an example to plug certificates and key into {SMProductShortName}.
@@ -14,7 +14,7 @@ By default, {SMProductName} generates self-signed root certificate and key, and
 * This example uses the certificates from the link:https://github.com/maistra/istio/tree/maistra-2.0/samples/certs[Maistra repository]. For production, use your own certificates from your certificate authority.
 * You must deploy the Bookinfo sample application to verify the results with these instructions.
 
-[id="ossm-cert-manage-add-cert-key_{context}"]
+[id="ossm-cert-manage-add-cert-key-1x_{context}"]
 == Adding an existing certificate and key
 
 To use an existing signing (CA) certificate and key, you must create a chain of trust file that includes the CA certificate, key, and root certificate. You must use the following exact file names for each of the corresponding certificates. The CA certificate is called `ca-cert.pem`, the key is `ca-key.pem`, and the root certificate, which signs `ca-cert.pem`, is called `root-cert.pem`. If your workload uses intermediate certificates, you must specify them in a `cert-chain.pem` file.
@@ -52,7 +52,7 @@ spec:
 $ oc delete secret istio.default
 ----
 
-[id="ossm-cert-manage-verify-cert_{context}"]
+[id="ossm-cert-manage-verify-cert-1x_{context}"]
 == Verifying your certificates
 
 Use the Bookinfo sample application to verify your certificates are mounted correctly. First, retrieve the mounted certificates. Then, verify the certificates mounted on the pod.
@@ -141,7 +141,7 @@ $ openssl verify -CAfile <(cat <path>/ca-cert.pem <path>/root-cert.pem) /tmp/pod
 /tmp/pod-cert-chain-workload.pem: OK
 ----
 
-[id="ossm-cert-cleanup_{context}"]
+[id="ossm-cert-cleanup-1x_{context}"]
 == Removing the certificates
 
 To remove the certificates you added, follow these steps.

modules/ossm-security-cert-manage.adoc

@@ -52,7 +52,7 @@ spec:
 +
 [source,terminal]
 ----
-$ $ oc -n istio-system delete pods -l 'app in (istiod,istio-ingressgateway, istio-egressgateway)'
+$ oc -n istio-system delete pods -l 'app in (istiod,istio-ingressgateway, istio-egressgateway)'
 ----
 +
 The Operator will automatically recreate the pods after they have been deleted.

modules/ossm-security-mtls-1x.adoc

@@ -70,14 +70,11 @@ If your environment has specific requirements for encrypted traffic in your serv
 
 [source,yaml]
 ----
-apiVersion: maistra.io/v2
+apiVersion: maistra.io/v1
 kind: ServiceMeshControlPlane
-metadata:
-  name: basic-install
-  namespace: istio-system
 spec:
-  security:
-    controlPlane:
+  istio:
+    global:
       tls:
         minProtocolVersion: TLSv1_2
         maxProtocolVersion: TLSv1_3

service_mesh/v1x/ossm-security.adoc

@@ -14,4 +14,4 @@ include::modules/ossm-security-mtls-1x.adoc[leveloffset=+1]
 
 include::modules/ossm-security-cipher-1x.adoc[leveloffset=+1]
 
-include::modules/ossm-security-cert-manage.adoc[leveloffset=+1]
+include::modules/ossm-security-cert-manage-1x.adoc[leveloffset=+1]