Skip to content

Commit b86451d

Browse files
authored
Merge pull request #1424 from SpectralHiss/hef/fix-istio-csr-installation-docs
Update istio-csr installation for Istio >= 1.16
2 parents 9aca139 + 0bfd27c commit b86451d

File tree

2 files changed

+3
-38
lines changed

2 files changed

+3
-38
lines changed

content/docs/tutorials/istio-csr/example/istio-config-getting-started.yaml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,3 @@ spec:
1919
# Disable istiod CA Sever functionality
2020
- name: ENABLE_CA_SERVER
2121
value: "false"
22-
overlays:
23-
- apiVersion: apps/v1
24-
kind: Deployment
25-
name: istiod
26-
patches:
27-
28-
# Mount istiod serving and webhook certificate from Secret mount
29-
- path: spec.template.spec.containers.[name:discovery].args[-1]
30-
value: "--tlsCertFile=/etc/cert-manager/tls/tls.crt"
31-
- path: spec.template.spec.containers.[name:discovery].args[-1]
32-
value: "--tlsKeyFile=/etc/cert-manager/tls/tls.key"
33-
- path: spec.template.spec.containers.[name:discovery].args[-1]
34-
value: "--caCertFile=/etc/cert-manager/ca/root-cert.pem"
35-
36-
- path: spec.template.spec.containers.[name:discovery].volumeMounts[-1]
37-
value:
38-
name: cert-manager
39-
mountPath: "/etc/cert-manager/tls"
40-
readOnly: true
41-
- path: spec.template.spec.containers.[name:discovery].volumeMounts[-1]
42-
value:
43-
name: ca-root-cert
44-
mountPath: "/etc/cert-manager/ca"
45-
readOnly: true
46-
47-
- path: spec.template.spec.volumes[-1]
48-
value:
49-
name: cert-manager
50-
secret:
51-
secretName: istiod-tls
52-
- path: spec.template.spec.volumes[-1]
53-
value:
54-
name: ca-root-cert
55-
configMap:
56-
defaultMode: 420
57-
name: istio-ca-root-cert

content/docs/tutorials/istio-csr/istio-csr.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,16 @@ We use the `istioctl` CLI to install Istio, configured using a custom IstioOpera
110110
The custom manifest does the following:
111111

112112
- Disables the CA server in istiod,
113-
- Ensures that Istio workloads request certificates from istio-csr,
114-
- Ensures that the istiod certificates and keys are mounted from the Certificate created when installing istio-csr.
113+
- Ensures that Istio workloads request certificates from istio-csr
115114

116115
First we download our demo manifest and then we apply it.
117116

118117
```console
119118
curl -sSL https://raw.githubusercontent.com/cert-manager/website/master/content/docs/tutorials/istio-csr/example/istio-config-getting-started.yaml > istio-install-config.yaml
120119
```
121120

121+
> Note: for versions before Istio 1.16 you need to mount a few extra volumes by using an alternate Istio installation manifest as [shown here](https://github.com/cert-manager/website/blob/98579eb092b2f2c41049b7347c1e34bcf3c6396a/content/docs/tutorials/istio-csr/istio-csr.md#installing-istio-csr)
122+
122123
You may wish to inspect and tweak `istio-install-config.yaml` if you know what you're doing,
123124
but this manifest should work for example purposes as-is.
124125

0 commit comments

Comments
 (0)