Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for specifying a tls configuration block in both the http… #3930

Merged
merged 1 commit into from
Aug 8, 2023
Merged

Add support for specifying a tls configuration block in both the http… #3930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions charts/flyte-binary/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ Chart for basic single Flyte executable deployment
| ingress.httpTls | list | `[]` | |
| ingress.ingressClassName | string | `""` | |
| ingress.labels | object | `{}` | |
| ingress.tls | list | `[]` | |
| nameOverride | string | `""` | |
| rbac.annotations | object | `{}` | |
| rbac.create | bool | `true` | |
Expand Down
2 changes: 2 additions & 0 deletions charts/flyte-binary/templates/ingress/grpc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,5 +125,7 @@ spec:
{{- end }}
{{- if .Values.ingress.grpcTls }}
tls: {{- tpl ( .Values.ingress.grpcTls | toYaml ) . | nindent 6 }}
{{- else if .Values.ingress.tls }}
tls: {{- tpl ( .Values.ingress.tls | toYaml ) . | nindent 6 }}
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions charts/flyte-binary/templates/ingress/http.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,7 @@ spec:
{{- end }}
{{- if .Values.ingress.httpTls }}
tls: {{- tpl ( .Values.ingress.httpTls | toYaml ) . | nindent 6 }}
{{- else if .Values.ingress.tls }}
tls: {{- tpl ( .Values.ingress.tls | toYaml ) . | nindent 6 }}
{{- end }}
{{- end }}
6 changes: 4 additions & 2 deletions charts/flyte-binary/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,11 @@ ingress:
httpIngressClassName: ""
# grpcIngressClassName Ingress class to use with all grpc ingress resource. Overrides `ingressClassName`
grpcIngressClassName: ""
# httpTls Add TLS configuration to http ingress resource
# tls Add TLS configuration to all ingress resources
tls: []
# httpTls Add TLS configuration to http ingress resource. Overrides `tls`
httpTls: []
# grpcTls Add TLS configuration to grpc ingress resource
# grpcTls Add TLS configuration to grpc ingress resource. Overrides `tls`
grpcTls: []
# httpExtraPaths Add extra paths to http ingress rule
httpExtraPaths:
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/complete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ type: Opaque
---
apiVersion: v1
data:
haSharedSecret: UGVIYm9XaG4wSHd3Y3N3ZA==
haSharedSecret: dmhFWEFXU2l3VW4wNmdHYg==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -1345,7 +1345,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: 1906618531aec05d6b3f35209612f9cf19655bb9266c327a09e1be23ff932141
checksum/secret: 9587ba37c31a9445f033acf56e7ea54c214532b8e13c8a6ef014c6d2090d05af
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
4 changes: 2 additions & 2 deletions docker/sandbox-bundled/manifests/dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ metadata:
---
apiVersion: v1
data:
haSharedSecret: cGU1MFpxVHFEU01SR2dVQw==
haSharedSecret: RnVLTjRtMHJvaEwxTWhueg==
proxyPassword: ""
proxyUsername: ""
kind: Secret
Expand Down Expand Up @@ -933,7 +933,7 @@ spec:
metadata:
annotations:
checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
checksum/secret: dc53bb66c2eb99ad100a1aae2c1a5cc6016f129f2025b25e40991e6d1153e158
checksum/secret: a52f5b460b64e9d50cd7820278e691ae010451c1088685990544d0ee63d31227
labels:
app: docker-registry
release: flyte-sandbox
Expand Down
Loading