Skip to content

Commit 78e15d0

Browse files
authored
Temporarily vendor ngrok intermediate CA for bindings (#487)
<!-- Thank you for contributing! Please make sure that your code changes are covered with tests. In case of new features or big changes remember to adjust the documentation. In case of an existing issue, reference it using one of the following: closes: #ISSUE related: #ISSUE How to write a good git commit message: http://chris.beams.io/posts/git-commit/ --> ## What *Describe what the change is solving* Vendor the ngrok intermediate CA for `prod` into the Helm chart for bindings pod forwarders. ## How *Describe the solution* ## Breaking Changes *Are there any breaking changes in this PR?* No.
2 parents 0dcdc02 + 1ef0841 commit 78e15d0

File tree

6 files changed

+110
-13
lines changed

6 files changed

+110
-13
lines changed

helm/ngrok-operator/README.md

Lines changed: 37 additions & 13 deletions
Large diffs are not rendered by default.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{- if .Values.bindings.enabled }}
2+
---
3+
kind: ConfigMap
4+
apiVersion: v1
5+
metadata:
6+
labels:
7+
{{- include "ngrok-operator.labels" . | nindent 4 }}
8+
name: ngrok-intermediate-ca
9+
namespace: {{ .Release.Namespace }}
10+
data:
11+
root.crt: |
12+
{{- .Values.bindings.ngrokCA | nindent 4 }}
13+
{{- end }}

helm/ngrok-operator/templates/bindings-forwarder/deployment.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,23 @@ spec:
8686
fieldPath: metadata.namespace
8787
- name: HELM_RELEASE_NAME
8888
value: {{ .Release.Name | quote }}
89+
- name: SSL_CERT_DIR
90+
value: /etc/ssl/certs/ngrok
8991
{{- range $key, $value := .Values.extraEnv }}
9092
- name: {{ $key }}
9193
value: {{- toYaml $value | nindent 12 }}
9294
{{- end }}
9395
{{- if .Values.extraVolumeMounts }}
9496
volumeMounts:
9597
{{ toYaml .Values.extraVolumeMounts | nindent 10 }}
98+
- name: ngrok-ca
99+
mountPath: /etc/ssl/certs/ngrok
100+
readOnly: true
101+
{{- else }}
102+
volumeMounts:
103+
- name: ngrok-ca
104+
mountPath: /etc/ssl/certs/ngrok
105+
readOnly: true
96106
{{- end }}
97107
{{- if .Values.lifecycle }}
98108
lifecycle:
@@ -115,5 +125,13 @@ spec:
115125
{{- if .Values.extraVolumes }}
116126
volumes:
117127
{{ toYaml .Values.extraVolumes | nindent 6 }}
128+
- name: ngrok-ca
129+
configMap:
130+
name: ngrok-intermediate-ca
131+
{{- else }}
132+
volumes:
133+
- name: ngrok-ca
134+
configMap:
135+
name: ngrok-intermediate-ca
118136
{{- end }}
119137
{{- end }}

helm/ngrok-operator/tests/bindings-forwarder/__snapshot__/deployment_test.yaml.snap

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

helm/ngrok-operator/values.schema.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

helm/ngrok-operator/values.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,3 +300,30 @@ bindings:
300300
create: true
301301
name: ""
302302
annotations: {}
303+
304+
## @param bindings.ngrokCA The ngrok intermediate CA certificate to use for verifyng self-signed TLS certs from ngrok
305+
## Note: This is temporarily vendored and will be removed in a future release.
306+
ngrokCA: | # ngrok intermediate CA
307+
-----BEGIN CERTIFICATE-----
308+
MIIDwjCCAqqgAwIBAgIUZqF2AkB17pISojTndgc2U5BDt7wwDQYJKoZIhvcNAQEL
309+
BQAwbzEQMA4GA1UEAwwHUm9vdCBDQTENMAsGA1UECwwEcHJvZDESMBAGA1UECgwJ
310+
bmdyb2sgSW5jMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMRMwEQYDVQQIDApDYWxp
311+
Zm9ybmlhMQswCQYDVQQGEwJVUzAeFw0yMjA4MzExNDU5NDhaFw0zMjA4MjgxNDU5
312+
NDhaMF8xCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRIwEAYDVQQK
313+
DAluZ3JvayBJbmMxDTALBgNVBAsMBHByb2QxGDAWBgNVBAMMD0ludGVybWVkaWF0
314+
ZSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+t8q9Ost9BxCWX
315+
fyGG0mVQOpIiyrzzZWyqT6CZpMY2fpOadLuZeBP7ti2Iw4FgCpfLntL0RldvMMNY
316+
4qq61dVrCwhL/v2ldsaHUdzjtFj1i+ZNGUtV4E9korHxm2YdsD91w6WIjF/J0lvo
317+
X2koLwFlGc/CkhT8z2VWebY8a6mYNyz5S7yPTQh2/mQ14lx/QPJgZSFEE/EEkMDC
318+
bs4BoMuqKMhCpqEP8m4+CxPQ5/V6POSqUIxT4A7eWWj2MRpnmirmVbXOc24Aznqk
319+
bdQUP4qagiR/i7qPsRx+f4mFfDninPsXp/djjByo0xzdh+i1HFyOR/7nyNDKlJ+e
320+
rymRgnUCAwEAAaNmMGQwHQYDVR0OBBYEFJ47nRzHaOT+vY44N3TCMYtGlBjIMB8G
321+
A1UdIwQYMBaAFNxeUxPIM8G7cX0DhFc81pLD4W+HMBIGA1UdEwEB/wQIMAYBAf8C
322+
AQAwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4IBAQBRmnMoOtQbYL7P
323+
Co1B5Chslb86HP2WI1jGRXhbfwAF2ySDFnX2ZbRPVtoQ+IuqXWxyXAeicYjXR6kz
324+
xX8hLWfD14kWUIz6ZgT3uZrDSIzmQ+tz8ztbT6mTI1ECWdjLV/i58f6vKzgLD8Vp
325+
3VdVns8NA9ee6a65QNjZEnwBVeccysoWkOwM/KzuazhSGcGu44y/S4ny9pAg7Pol
326+
2kV4NicDKD6tSAdXmPmjFalYUfnMmyhurZIPrS2dgYgpOrGVMwronTOZ3BUf4DL4
327+
zkkmcLXss1KztQnLd23nuNiIscwMcGM58a3O5zUp7aorfrm7cdRgkFmcYVNO/6uG
328+
Q5iJ+Ppk
329+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)