Skip to content

Commit 7af0a66

Browse files
Merge pull request #30444 from alex-hunt-materialize/orchestratord_internal_tls_toggle
orchestratord TLS for balancerd and environmentd
2 parents 4c964e8 + e606831 commit 7af0a66

File tree

15 files changed

+4773
-33
lines changed

15 files changed

+4773
-33
lines changed

misc/helm-charts/operator/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ The following table lists the configurable parameters of the Materialize operato
269269
| `storage.storageClass.provisioner` | | ``""`` |
270270
| `storage.storageClass.reclaimPolicy` | | ``"Delete"`` |
271271
| `storage.storageClass.volumeBindingMode` | | ``"WaitForFirstConsumer"`` |
272+
| `tls.defaultCertificateSpecs` | | ``{}`` |
272273

273274
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example:
274275

misc/helm-charts/operator/templates/clusterrole.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,16 @@ rules:
109109
verbs:
110110
- get
111111
- list
112+
- apiGroups: ["cert-manager.io"]
113+
resources:
114+
- certificates
115+
verbs:
116+
- create
117+
- update
118+
- patch
119+
- delete
120+
- get
121+
- list
122+
- watch
112123

113124
{{- end }}

misc/helm-charts/operator/templates/deployment.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ spec:
123123
{{- end }}
124124
{{- end }}
125125
{{- end }}
126-
126+
{{- if .Values.tls.defaultCertificateSpecs }}
127+
- '--default-certificate-specs={{ toJson .Values.tls.defaultCertificateSpecs }}'
128+
{{- end }}
127129
{{/* Observability */}}
128130
{{- if .Values.observability.enabled }}
129131
{{- if .Values.observability.podMetrics.enabled }}

misc/helm-charts/operator/values.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,25 @@ networkPolicies:
255255
cidrs:
256256
- 0.0.0.0/0
257257

258+
tls:
259+
defaultCertificateSpecs: {}
260+
#balancerdExternal:
261+
# dnsNames:
262+
# - balancerd
263+
# issuerRef:
264+
# name: dns01
265+
# kind: ClusterIssuer
266+
#consoleExternal:
267+
# dnsNames:
268+
# - console
269+
# issuerRef:
270+
# name: dns01
271+
# kind: ClusterIssuer
272+
#internal:
273+
# issuerRef:
274+
# name: dns01
275+
# kind: ClusterIssuer
276+
258277
# Namespace configuration
259278
namespace:
260279
# Whether to create a new namespace for the deployment

misc/helm-charts/testing/environmentd.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,19 @@ metadata:
3030
spec:
3131
environmentdImageRef: materialize/environmentd:v0.127.0-dev.0
3232
backendSecretName: materialize-backend
33+
#balancerdExternalCertificateSpec:
34+
# dnsNames:
35+
# - balancerd
36+
# issuerRef:
37+
# name: dns01
38+
# kind: ClusterIssuer
39+
#consoleExternalCertificateSpec:
40+
# dnsNames:
41+
# - console
42+
# issuerRef:
43+
# name: dns01
44+
# kind: ClusterIssuer
45+
#internalCertificateSpec:
46+
# issuerRef:
47+
# name: intermediate-ca
48+
# kind: Issuer

src/cloud-resources/src/crd.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use tracing::{info, warn};
2323

2424
use mz_ore::retry::Retry;
2525

26+
pub mod gen;
2627
pub mod materialize;
2728
pub mod vpc_endpoint;
2829

src/cloud-resources/src/crd/gen.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright Materialize, Inc. and contributors. All rights reserved.
2+
//
3+
// Use of this software is governed by the Business Source License
4+
// included in the LICENSE file.
5+
//
6+
// As of the Change Date specified in that file, in accordance with
7+
// the Business Source License, use of this software will be governed
8+
// by the Apache License, Version 2.0.
9+
10+
pub mod cert_manager;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// Copyright Materialize, Inc. and contributors. All rights reserved.
2+
//
3+
// Use of this software is governed by the Business Source License
4+
// included in the LICENSE file.
5+
//
6+
// As of the Change Date specified in that file, in accordance with
7+
// the Business Source License, use of this software will be governed
8+
// by the Apache License, Version 2.0.
9+
10+
pub mod certificates;
11+
pub mod issuers;

0 commit comments

Comments
 (0)