Skip to content

Commit af3ae84

Browse files
committed
OCPBUGS-57841 updated several modules
1 parent ef95538 commit af3ae84

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

modules/cert-manager-istio-creating-issuer.adoc

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ Other supported issuers can be used, except for the ACME issuer, which is not su
1515

1616
.Procedure
1717

18-
. Create a new project for installing Istio-CSR by running the following command. If you have an existing project for installing Istio-CSR, skip this step.
19-
+
20-
[source,terminal]
21-
----
22-
$ oc new-project <istio_csr_project_name>
23-
----
24-
2518
. Create a YAML file that defines the `Issuer` and `Certificate` objects:
2619
+
2720
.Example `issuer.yaml` file
@@ -31,15 +24,15 @@ apiVersion: cert-manager.io/v1
3124
kind: Issuer <1>
3225
metadata:
3326
name: selfsigned
34-
namespace: <istio_csr_project_name> <2>
27+
namespace: <istio_project_name> <2>
3528
spec:
3629
selfSigned: {}
3730
---
3831
apiVersion: cert-manager.io/v1
3932
kind: Certificate
4033
metadata:
4134
name: istio-ca
42-
namespace: <istio_csr_project_name>
35+
namespace: <istio_project_name>
4336
spec:
4437
isCA: true
4538
duration: 87600h # 10 years
@@ -61,7 +54,7 @@ apiVersion: cert-manager.io/v1
6154
kind: Issuer <1>
6255
metadata:
6356
name: istio-ca
64-
namespace: <istio_csr_project_name> <2>
57+
namespace: <istio_project_name> <2>
6558
spec:
6659
ca:
6760
secretName: istio-ca
@@ -75,7 +68,7 @@ spec:
7568
+
7669
[source,terminal]
7770
----
78-
$ oc get issuer istio-ca -n <istio_csr_project_name>
71+
$ oc get issuer istio-ca -n <istio_project_name>
7972
----
8073
+
8174
.Example output

modules/cert-manager-istio-csr-installing.adoc

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,33 @@ Use this procedure to install the Istio-CSR agent through {cert-manager-operator
1616
+
1717
[NOTE]
1818
====
19-
If you are using `Issuer` resource, create the `Issuer` and `Certificate` resources in the {SMProductName} or `Istiod` namespace. Certificate requests are generated in the same namespace, and role-based access control (RBAC) is configured accordingly.
20-
====
19+
If you are using `Issuer` resource, create the `Issuer` and `Certificate` resources in the {SMProductName} or `Istiod` namespace. Certificate requests are generated in the same namespace, and role-based access control (RBAC) is configured accordingly.
20+
====
2121
2222
.Procedure
2323

24+
. Create a new project for installing Istio-CSR by running the following command. If you have an existing project for installing Istio-CSR, skip this step.
25+
+
26+
[source,terminal]
27+
----
28+
$ oc new-project <istio_csr_project_name>
29+
----
30+
2431
. Create the `IstioCSR` custom resource to enable Istio-CSR agent managed by the {cert-manager-operator} for processing Istio workload and control plane certificate signing requests.
2532
+
26-
[NOTE]
27-
====
28-
Only one `IstioCSR` custom resource (CR) is supported at a time. If multiple `IstioCSR` CRs are created, only one will be active. Use the `status` sub-resource of `IstioCSR` to check if a resource is unprocessed.
33+
[NOTE]
34+
====
35+
Only one `IstioCSR` custom resource (CR) is supported at a time. If multiple `IstioCSR` CRs are created, only one will be active. Use the `status` sub-resource of `IstioCSR` to check if a resource is unprocessed.
2936

30-
* If multiple `IstioCSR` CRs are created simultaneously, none will be processed.
31-
* If multiple `IstioCSR` CRs are created sequentially, only the first one will be processed.
37+
* If multiple `IstioCSR` CRs are created simultaneously, none will be processed.
38+
* If multiple `IstioCSR` CRs are created sequentially, only the first one will be processed.
3239
* To prevent new requests from being rejected, delete any unprocessed `IstioCSR` CRs.
33-
* The Operator does not automatically remove objects created for `IstioCSR`. If an active `IstioCSR` resource is deleted and a new one is created in a different namespace without removing the previous deployments, multiple `istio-csr` deployments may remain active. This behavior is not recommended and is not supported.
34-
====
40+
* The Operator does not automatically remove objects created for `IstioCSR`. If an active `IstioCSR` resource is deleted and a new one is created in a different namespace without removing the previous deployments, multiple `istio-csr` deployments may remain active. This behavior is not recommended and is not supported.
41+
====
3542
3643
.. Create a YAML file that defines the `IstioCSR` object:
3744
+
38-
.Example `IstioCSR` CR
45+
.Example `IstioCSR` CR
3946
[source,yaml]
4047
----
4148
apiVersion: operator.openshift.io/v1alpha1
@@ -53,7 +60,7 @@ spec:
5360
istiodTLSConfig:
5461
trustDomain: cluster.local
5562
istio:
56-
namespace: istio-system
63+
namespace: <istio_project_name>
5764
----
5865
<1> Specify the `Issuer` or `ClusterIssuer` name. It should be the same name as the CA issuer defined in the `issuer.yaml` file.
5966
<2> Specify the `Issuer` or `ClusterIssuer` kind. It should be the same kind as the CA issuer defined in the `issuer.yaml` file.

modules/cert-manager-istio-csr-uninstalling.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Use this procedure to uninstall the Istio-CSR agent managed by {cert-manager-ope
2020
+
2121
[source,terminal]
2222
----
23-
$ oc -n <istio-csr_project_name> delete istiocsrs.operator.openshift.io default
23+
$ oc -n <istio_csr_project_name> delete istiocsrs.operator.openshift.io default
2424
----
2525

2626
. Remove related resources:

0 commit comments

Comments
 (0)