Skip to content

Commit de80531

Browse files
authored
feat: update certificate issuer configurations and add origin CA issuer resources (#960)
* feat: update certificate issuer configurations and add origin CA issuer resources Signed-off-by: Nikolai Emil Damm <[email protected]> * fix: update resource reference for origin CA issuer in kustomization.yaml Signed-off-by: Nikolai Emil Damm <[email protected]> * fix: add missing resource reference for origin issuers in kustomization.yaml Signed-off-by: Nikolai Emil Damm <[email protected]> --------- Signed-off-by: Nikolai Emil Damm <[email protected]>
1 parent eed0613 commit de80531

File tree

11 files changed

+65
-33
lines changed

11 files changed

+65
-33
lines changed

k8s/bases/infrastructure/certificates/traefik-certificate.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ spec:
99
- "${domain}"
1010
- "*.${domain}"
1111
issuerRef:
12-
name: ${issuer}
13-
kind: ClusterIssuer
12+
group: ${issuer_group}
13+
kind: ${issuer_kind}
14+
name: ${issuer_name}
15+

k8s/clusters/dev/variables/variables-cluster-config-map.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ metadata:
77
data:
88
domain: dev.platform.devantler.tech
99
10-
acme_server: https://acme-v02.api.letsencrypt.org/directory
1110
github_app_client_id: Iv23liZ8GHRgpx32Em2y
12-
issuer: acme-cloudflare
11+
issuer_group: cert-manager.k8s.cloudflare.com
12+
issuer_kind: ClusterOriginIssuer
13+
issuer_name: cloudflare-origin
1314
traefik_service_type: ClusterIP

k8s/clusters/local/variables/variables-cluster-config-map.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ metadata:
77
data:
88
domain: local.platform.devantler.tech
99
github_app_client_id: Iv23liZ8GHRgpx32Em2y
10-
issuer: selfsigned
10+
issuer_group: cert-manager.io
11+
issuer_kind: ClusterIssuer
12+
issuer_name: selfsigned

k8s/clusters/prod/variables/variables-cluster-config-map.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ metadata:
77
data:
88
domain: platform.devantler.tech
99
10-
acme_server: https://acme-v02.api.letsencrypt.org/directory
1110
github_app_client_id: Iv23liZ8GHRgpx32Em2y
12-
issuer: acme-cloudflare
11+
issuer_group: cert-manager.k8s.cloudflare.com
12+
issuer_kind: ClusterOriginIssuer
13+
issuer_name: cloudflare-origin
1314
traefik_service_type: ClusterIP

k8s/distributions/talos/infrastructure/cluster-issuers/acme-cloudflare-cluster-issuer.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: cert-manager.k8s.cloudflare.com/v1
2+
kind: ClusterOriginIssuer
3+
metadata:
4+
name: cloudflare-origin
5+
spec:
6+
requestType: OriginECC
7+
auth:
8+
tokenRef:
9+
name: cloudflare-api-token
10+
key: api-token
11+
---
12+
apiVersion: v1
13+
kind: Secret
14+
metadata:
15+
name: cloudflare-api-token
16+
namespace: cert-manager
17+
type: Opaque
18+
stringData:
19+
api-token: ${cloudflare_api_token}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- acme-cloudflare-cluster-issuer.yaml
4+
- cloudflare-origin-issuer.yaml

k8s/distributions/talos/infrastructure/controllers/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
resources:
55
- ../../../../bases/infrastructure/controllers/
6+
- origin-ca-issuer/
67
patches:
78
- target:
89
kind: HelmRelease
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: helm.toolkit.fluxcd.io/v2
2+
kind: HelmRelease
3+
metadata:
4+
name: origin-ca-issuer
5+
namespace: cert-manager
6+
spec:
7+
interval: 10m
8+
chart:
9+
spec:
10+
chart: origin-ca-issuer
11+
version: 0.5.10
12+
sourceRef:
13+
kind: HelmRepository
14+
name: origin-ca-issuer
15+
# https://github.com/cloudflare/origin-ca-issuer/blob/trunk/deploy/charts/origin-ca-issuer/values.yaml
16+
values: {}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: source.toolkit.fluxcd.io/v1
2+
kind: HelmRepository
3+
metadata:
4+
name: origin-ca-issuer
5+
namespace: cert-manager
6+
spec:
7+
url: oci://ghcr.io/cloudflare/origin-ca-issuer-charts
8+
type: oci

0 commit comments

Comments
 (0)