Skip to content

Commit 6de79ce

Browse files
authored
Update to certmanager v1 (canada-ca#1223)
This commit bumps us to v1 and updates our Certificate and Issuer manifests to the new v1 format.
1 parent 5234e6f commit 6de79ce

File tree

7 files changed

+25827
-6716
lines changed

7 files changed

+25827
-6716
lines changed

app/bases/certificate.yaml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
apiVersion: cert-manager.io/v1alpha2
1+
apiVersion: cert-manager.io/v1
22
kind: Certificate
33
metadata:
4+
creationTimestamp: null
45
name: ingress-cert
56
namespace: istio-system
67
spec:
7-
keySize: 4096
8-
keyAlgorithm: rsa
9-
keyEncoding: pkcs8
10-
secretName: tracker-credential
8+
commonName: tracker.alpha.canada.ca
9+
dnsNames:
10+
- tracker.alpha.canada.ca
11+
- suivi.alpha.canada.ca
1112
issuerRef:
12-
name: selfsigned
1313
kind: Issuer
14-
commonName: pulse.alpha.canada.ca
15-
dnsNames:
16-
- pulse.alpha.canada.ca
17-
- pouls.alpha.canada.ca
14+
name: selfsigned
15+
privateKey:
16+
algorithm: RSA
17+
encoding: PKCS8
18+
size: 4096
19+
secretName: tracker-credential
20+
status: {}

app/gke/certificate.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
apiVersion: cert-manager.io/v1alpha2
1+
apiVersion: cert-manager.io/v1
22
kind: Certificate
33
metadata:
4+
creationTimestamp: null
45
name: ingress-cert
56
namespace: istio-system
67
spec:
7-
keySize: 4096
8-
keyAlgorithm: rsa
9-
keyEncoding: pkcs8
10-
secretName: tracker-credential
11-
issuerRef:
12-
name: letsencrypt
13-
kind: Issuer
148
commonName: tracker.alpha.canada.ca
159
dnsNames:
1610
- tracker.alpha.canada.ca
1711
- suivi.alpha.canada.ca
12+
issuerRef:
13+
kind: Issuer
14+
name: letsencrypt
15+
privateKey:
16+
algorithm: RSA
17+
encoding: PKCS8
18+
size: 4096
19+
secretName: tracker-credential
20+
status: {}

app/gke/letsencrypt-issuer.yaml

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,42 @@
1-
apiVersion: cert-manager.io/v1alpha2
2-
kind: Issuer
3-
metadata:
4-
name: letsencrypt
5-
namespace: istio-system
6-
spec:
7-
acme:
8-
server: https://acme-v02.api.letsencrypt.org/directory
9-
email: mike@korora.ca
10-
privateKeySecretRef:
11-
name: letsencrypt-prod
12-
solvers:
13-
- selector: {}
14-
http01:
15-
ingress:
16-
class: istio
17-
---
18-
apiVersion: cert-manager.io/v1alpha2
19-
kind: Issuer
20-
metadata:
21-
name: letsencrypt-staging
22-
namespace: istio-system
23-
spec:
24-
acme:
25-
server: https://acme-staging-v02.api.letsencrypt.org/directory
26-
email: mike@korora.ca
27-
privateKeySecretRef:
28-
name: letsencrypt-staging
29-
solvers:
30-
- selector: {}
31-
http01:
32-
ingress:
33-
class: istio
1+
apiVersion: v1
2+
items:
3+
- apiVersion: cert-manager.io/v1
4+
kind: Issuer
5+
metadata:
6+
creationTimestamp: null
7+
name: letsencrypt
8+
namespace: istio-system
9+
spec:
10+
acme:
11+
email: mike@korora.ca
12+
preferredChain: ""
13+
privateKeySecretRef:
14+
name: letsencrypt-prod
15+
server: https://acme-v02.api.letsencrypt.org/directory
16+
solvers:
17+
- http01:
18+
ingress:
19+
class: istio
20+
selector: {}
21+
status: {}
22+
- apiVersion: cert-manager.io/v1
23+
kind: Issuer
24+
metadata:
25+
creationTimestamp: null
26+
name: letsencrypt-staging
27+
namespace: istio-system
28+
spec:
29+
acme:
30+
email: mike@korora.ca
31+
preferredChain: ""
32+
privateKeySecretRef:
33+
name: letsencrypt-staging
34+
server: https://acme-staging-v02.api.letsencrypt.org/directory
35+
solvers:
36+
- http01:
37+
ingress:
38+
class: istio
39+
selector: {}
40+
status: {}
41+
kind: List
42+
metadata: {}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
apiVersion: cert-manager.io/v1alpha2
1+
apiVersion: cert-manager.io/v1
22
kind: Issuer
33
metadata:
44
name: selfsigned
55
namespace: istio-system
66
spec:
77
selfSigned: {}
8+
status: {}

app/test/selfsigned-issuer.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
apiVersion: cert-manager.io/v1alpha2
1+
apiVersion: cert-manager.io/v1
22
kind: Issuer
33
metadata:
4+
creationTimestamp: null
45
name: selfsigned
56
namespace: istio-system
67
spec:
78
selfSigned: {}
9+
status: {}

platform/README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,26 @@ This folder contains the Custom Resource Definitions that the Tracker app relies
55
As an example, the Tracker app uses a `Certificate` object to acquire a TLS certificate.
66

77
```
8-
apiVersion: cert-manager.io/v1alpha2
8+
apiVersion: cert-manager.io/v1
99
kind: Certificate
1010
metadata:
11+
creationTimestamp: null
1112
name: ingress-cert
1213
namespace: istio-system
1314
spec:
14-
keySize: 4096
15-
keyAlgorithm: rsa
16-
keyEncoding: pkcs8
17-
secretName: tracker-credential
15+
commonName: tracker.alpha.canada.ca
16+
dnsNames:
17+
- tracker.alpha.canada.ca
18+
- suivi.alpha.canada.ca
1819
issuerRef:
19-
name: selfsigned
2020
kind: Issuer
21-
commonName: pulse.alpha.canada.ca
22-
dnsNames:
23-
- pulse.alpha.canada.ca
24-
- pouls.alpha.canada.ca
21+
name: selfsigned
22+
privateKey:
23+
algorithm: RSA
24+
encoding: PKCS8
25+
size: 4096
26+
secretName: tracker-credential
27+
status: {}
2528
```
2629

2730
`Certificate` is not a native Kubernetes object and is just assumed to exist in the environment. The manifests in this folder are all about defining generic objects like `Certificate` that the app can rely on without knowing how it got there.

0 commit comments

Comments
 (0)