feat(chart): Add Gateway API support and merge HTTP + GRPC traffic #2643
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| {{- if .Values.dex.httpRoute.enabled }} | ||
| {{- /* | ||
| Copyright Chainloop, Inc. All Rights Reserved. | ||
| SPDX-License-Identifier: APACHE-2.0 | ||
| */}} | ||
| {{- $fullName := include "chainloop.dex.fullname" . -}} | ||
| apiVersion: gateway.networking.k8s.io/v1 | ||
| kind: HTTPRoute | ||
| metadata: | ||
| name: {{ $fullName }} | ||
| namespace: {{ include "common.names.namespace" . | quote }} | ||
| labels: {{- include "chainloop.dex.labels" . | nindent 4 }} | ||
| {{- if .Values.dex.httpRoute.labels }} | ||
| {{- include "common.tplvalues.render" (dict "value" .Values.dex.httpRoute.labels "context" $) | nindent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.dex.httpRoute.annotations }} | ||
| annotations: | ||
| {{- include "common.tplvalues.render" ( dict "value" .Values.dex.httpRoute.annotations "context" $) | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| parentRefs: | ||
| {{- if .Values.dex.httpRoute.parentRefs }} | ||
| {{- include "common.tplvalues.render" (dict "value" .Values.dex.httpRoute.parentRefs "context" .) | nindent 4 }} | ||
| {{- else }} | ||
| - name: gateway | ||
| namespace: {{ include "common.names.namespace" . | quote }} | ||
| {{- end }} | ||
| hostnames: {{- include "common.tplvalues.render" (dict "value" .Values.dex.httpRoute.hostnames "context" .) | nindent 4 }} | ||
| rules: | ||
| {{- $port := coalesce .Values.dex.service.port .Values.dex.service.ports.http }} | ||
| - backendRefs: | ||
| - name: {{ include "chainloop.dex.fullname" . }} | ||
| port: {{ $port }} | ||
| {{- if .Values.dex.httpRoute.matches }} | ||
| matches: {{- include "common.tplvalues.render" (dict "value" .Values.dex.httpRoute.matches "context" .) | nindent 8 }} | ||
| {{- end }} | ||
| {{- if .Values.dex.httpRoute.filters }} | ||
| filters: {{- include "common.tplvalues.render" (dict "value" .Values.dex.httpRoute.filters "context" .) | nindent 8 }} | ||
| {{- end }} | ||
| {{- if .Values.dex.httpRoute.extraRules }} | ||
| {{- include "common.tplvalues.render" (dict "value" .Values.dex.httpRoute.extraRules "context" .) | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -316,18 +316,39 @@ NOTE: Load balancer service type is not supported | |
| {{- define "chainloop.controlplane.external_url" -}} | ||
| {{- $service := .Values.controlplane.service }} | ||
| {{- $ingress := .Values.controlplane.ingress }} | ||
| {{- $httpRoute := .Values.controlplane.httpRoute }} | ||
|
|
||
| {{- if .Values.controlplane.auth.oidc.externalURL }} | ||
| {{- .Values.controlplane.auth.oidc.externalURL }} | ||
| {{- else if (and $ingress $ingress.enabled $ingress.hostname) }} | ||
| {{- printf "%s://%s" (ternary "https" "http" $ingress.tls ) $ingress.hostname }} | ||
| {{- else if (and $httpRoute $httpRoute.enabled $httpRoute.hostnames ) }} | ||
| {{- printf "%s://%s" (ternary "https" "http" $httpRoute.tls ) ( index $httpRoute.hostnames 0) }} | ||
| {{- else if (and (eq $service.type "NodePort") $service.nodePorts (not (empty $service.nodePorts.http))) }} | ||
| {{- printf "http://localhost:%s" $service.nodePorts.http }} | ||
| {{- else -}} | ||
| null | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{- define "chainloop.controlplane.external_hostname" -}} | ||
| {{- $service := .Values.controlplane.service }} | ||
| {{- $ingress := .Values.controlplane.ingress }} | ||
| {{- $httpRoute := .Values.controlplane.httpRoute }} | ||
|
|
||
| {{- if .Values.controlplane.auth.oidc.externalURL }} | ||
| {{- .Values.controlplane.auth.oidc.externalURL }} | ||
|
Comment on lines
+339
to
+340
There was a problem hiding this comment. 🟡 The Prompt for agents
Was this helpful? React with 👍 or 👎 to provide feedback. |
||
| {{- else if (and $ingress $ingress.enabled $ingress.hostname) }} | ||
| {{- printf "%s" $ingress.hostname }} | ||
| {{- else if (and $httpRoute $httpRoute.enabled $httpRoute.hostnames ) }} | ||
| {{- printf "%s" ( index $httpRoute.hostnames 0) }} | ||
| {{- else if (and (eq $service.type "NodePort") $service.nodePorts (not (empty $service.nodePorts.http))) }} | ||
| {{- printf "localhost:%s" $service.nodePorts.http }} | ||
|
Comment on lines
+345
to
+346
There was a problem hiding this comment. 🟡 NodePort case in In Prompt for agentsWas this helpful? React with 👍 or 👎 to provide feedback. |
||
| {{- else -}} | ||
| null | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{- define "chainloop.sentry" -}} | ||
| observability: | ||
| sentry: | ||
|
|
@@ -407,16 +428,35 @@ NOTE: Load balancer service type is not supported | |
| {{- define "chainloop.cas.external_url" -}} | ||
| {{- $service := .Values.cas.service }} | ||
| {{- $ingress := .Values.cas.ingress }} | ||
| {{- $httpRoute := .Values.cas.httpRoute }} | ||
|
|
||
| {{- if .Values.cas.externalURL }} | ||
| {{- .Values.cas.externalURL }} | ||
| {{- else if (and $ingress $ingress.enabled $ingress.hostname) }} | ||
| {{- printf "%s://%s" (ternary "https" "http" $ingress.tls ) $ingress.hostname }} | ||
| {{- else if (and $httpRoute $httpRoute.enabled $httpRoute.hostnames) }} | ||
| {{- printf "%s://%s" (ternary "https" "http" $httpRoute.tls ) (index $httpRoute.hostnames 0) }} | ||
| {{- else if (and (eq $service.type "NodePort") $service.nodePorts (not (empty $service.nodePorts.http))) }} | ||
| {{- printf "http://localhost:%s" $service.nodePorts.http }} | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{- define "chainloop.cas.external_hostname" -}} | ||
| {{- $service := .Values.cas.service }} | ||
| {{- $ingress := .Values.cas.ingress }} | ||
| {{- $httpRoute := .Values.cas.httpRoute }} | ||
|
|
||
| {{- if .Values.cas.externalURL }} | ||
| {{- .Values.cas.externalURL }} | ||
|
Comment on lines
+449
to
+450
There was a problem hiding this comment. 🟡 Same issue as with the controlplane:
Was this helpful? React with 👍 or 👎 to provide feedback. |
||
| {{- else if (and $ingress $ingress.enabled $ingress.hostname) }} | ||
| {{- printf "%s" $ingress.hostname }} | ||
| {{- else if (and $httpRoute $httpRoute.enabled $httpRoute.hostnames) }} | ||
| {{- printf "%s" (index $httpRoute.hostnames 0) }} | ||
| {{- else if (and (eq $service.type "NodePort") $service.nodePorts (not (empty $service.nodePorts.http))) }} | ||
| {{- printf "localhost:%s" $service.nodePorts.http }} | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Check for Development mode | ||
| */}} | ||
|
|
@@ -435,6 +475,23 @@ Compile all warning messages into a single one | |
| {{- $messages := without $messages "" -}} | ||
| {{- $message := join "\n" $messages -}} | ||
|
|
||
| {{- if and (or (.Values.controlplane.ingress.enabled | default false) (.Values.controlplane.ingressAPI.enabled | default false)) (.Values.controlplane.httpRoute.enabled | default false) -}} | ||
| {{- fail "Invalid values: controlplane.ingress.enabled or controlplane.ingressAPI.enabled and controlplane.httpRoute.enabled cannot both be true." -}} | ||
| {{- end -}} | ||
|
|
||
| {{- if and (or (.Values.cas.ingress.enabled | default false) (.Values.cas.ingressAPI.enabled | default false)) (.Values.cas.httpRoute.enabled | default false) -}} | ||
| {{- fail "Invalid values: cas.ingress.enabled or cas.ingressAPI.enabled and cas.httpRoute.enabled cannot both be true." -}} | ||
| {{- end -}} | ||
|
|
||
|
|
||
| {{- if and (.Values.cas.httpRoute.enabled | default false) ( gt (len .Values.cas.httpRoute.hostnames) 1 ) -}} | ||
| {{- fail "Invalid values: .Values.cas.httpRoute.hostnames can only have one hostname" -}} | ||
| {{- end -}} | ||
|
|
||
| {{- if and (.Values.controlplane.httpRoute.enabled | default false) ( gt (len .Values.controlplane.httpRoute.hostnames) 1 ) -}} | ||
| {{- fail "Invalid values: .Values.controlplane.httpRoute.hostnames can only have one hostname" -}} | ||
| {{- end -}} | ||
|
|
||
| {{- if $message -}} | ||
| {{- printf "\n\nVALUES VALIDATION:\n%s" $message -}} | ||
| {{- end -}} | ||
|
|
@@ -448,5 +505,4 @@ Return the Nats connection string | |
| {{- $host := required "nats server hostname not set" .Values.controlplane.nats.host }} | ||
| {{- $port := required "nats server port not set" .Values.controlplane.nats.port }} | ||
| {{- printf "nats://%s:%d" $host ($port | int) }} | ||
| {{- end -}} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| {{- if .Values.cas.httpRoute.enabled }} | ||
| {{- /* | ||
| Copyright Chainloop, Inc. All Rights Reserved. | ||
| SPDX-License-Identifier: APACHE-2.0 | ||
| */}} | ||
| {{- $fullName := include "chainloop.cas.fullname" . -}} | ||
| apiVersion: gateway.networking.k8s.io/v1 | ||
| kind: HTTPRoute | ||
| metadata: | ||
| name: {{ $fullName }} | ||
| namespace: {{ include "common.names.namespace" . | quote }} | ||
| labels: {{- include "chainloop.cas.labels" . | nindent 4 }} | ||
| {{- if .Values.cas.httpRoute.labels }} | ||
| {{- include "common.tplvalues.render" (dict "value" .Values.cas.httpRoute.labels "context" $) | nindent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.cas.httpRoute.annotations }} | ||
| annotations: | ||
| {{- include "common.tplvalues.render" ( dict "value" .Values.cas.httpRoute.annotations "context" $) | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| parentRefs: | ||
| {{- if .Values.cas.httpRoute.parentRefs }} | ||
| {{- include "common.tplvalues.render" (dict "value" .Values.cas.httpRoute.parentRefs "context" .) | nindent 4 }} | ||
| {{- else }} | ||
| - name: gateway | ||
| namespace: {{ include "common.names.namespace" . | quote }} | ||
| {{- end }} | ||
| hostnames: {{- include "common.tplvalues.render" (dict "value" .Values.cas.httpRoute.hostnames "context" .) | nindent 4 }} | ||
| rules: | ||
| {{- $port := coalesce .Values.cas.service.port .Values.cas.service.ports.http }} | ||
| - backendRefs: | ||
| - name: {{ include "chainloop.cas.fullname" . }} | ||
| port: {{ $port }} | ||
| {{- if .Values.cas.httpRoute.matches }} | ||
| matches: {{- include "common.tplvalues.render" (dict "value" .Values.cas.httpRoute.matches "context" .) | nindent 8 }} | ||
| {{- end }} | ||
| {{- if .Values.cas.httpRoute.filters }} | ||
| filters: {{- include "common.tplvalues.render" (dict "value" .Values.cas.httpRoute.filters "context" .) | nindent 8 }} | ||
| {{- end }} | ||
| - matches: | ||
| - headers: | ||
| - name: content-type | ||
| value: "^application/grpc" | ||
| type: RegularExpression | ||
| {{- $portAPI := coalesce .Values.cas.serviceAPI.port .Values.cas.serviceAPI.ports.http }} | ||
| backendRefs: | ||
| - name: {{ include "chainloop.cas.fullname" . }}-api | ||
| kind: Service | ||
| namespace: {{ include "common.names.namespace" . | quote }} | ||
| port: {{ $portAPI }} | ||
| {{- if .Values.cas.httpRoute.extraRules }} | ||
| {{- include "common.tplvalues.render" (dict "value" .Values.cas.httpRoute.extraRules "context" .) | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,6 +40,7 @@ spec: | |
| {{- if not (eq $port .Values.cas.containerPorts.grpc) }} | ||
| targetPort: {{ .Values.cas.containerPorts.grpc }} | ||
| {{- end }} | ||
| appProtocol: kubernetes.io/h2c | ||
| protocol: TCP | ||
| {{- if and (or (eq .Values.cas.serviceAPI.type "NodePort") (eq .Values.cas.serviceAPI.type "LoadBalancer")) (not (empty .Values.cas.serviceAPI.nodePorts.http)) }} | ||
| nodePort: {{ .Values.cas.serviceAPI.nodePorts.http }} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| {{- if .Values.controlplane.httpRoute.enabled }} | ||
| {{- /* | ||
| Copyright Chainloop, Inc. All Rights Reserved. | ||
| SPDX-License-Identifier: APACHE-2.0 | ||
| */}} | ||
| {{- $fullName := include "chainloop.controlplane.fullname" . -}} | ||
| apiVersion: gateway.networking.k8s.io/v1 | ||
| kind: HTTPRoute | ||
| metadata: | ||
| name: {{ $fullName }} | ||
| namespace: {{ include "common.names.namespace" . | quote }} | ||
| labels: {{- include "chainloop.controlplane.labels" . | nindent 4 }} | ||
| {{- if .Values.controlplane.httpRoute.labels }} | ||
| {{- include "common.tplvalues.render" (dict "value" .Values.controlplane.httpRoute.labels "context" $) | nindent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.controlplane.httpRoute.annotations }} | ||
| annotations: | ||
| {{- include "common.tplvalues.render" ( dict "value" .Values.controlplane.httpRoute.annotations "context" $) | nindent 4 }} | ||
| {{- end }} | ||
| spec: | ||
| parentRefs: | ||
| {{- if .Values.controlplane.httpRoute.parentRefs }} | ||
| {{- include "common.tplvalues.render" (dict "value" .Values.controlplane.httpRoute.parentRefs "context" .) | nindent 4 }} | ||
| {{- else }} | ||
| - name: gateway | ||
| namespace: {{ include "common.names.namespace" . | quote }} | ||
| {{- end }} | ||
| hostnames: {{- include "common.tplvalues.render" (dict "value" .Values.controlplane.httpRoute.hostnames "context" .) | nindent 4 }} | ||
| rules: | ||
| {{- $port := coalesce .Values.controlplane.service.port .Values.controlplane.service.ports.http }} | ||
| - backendRefs: | ||
| - name: {{ include "chainloop.controlplane.fullname" . }} | ||
| port: {{ $port }} | ||
| {{- if .Values.controlplane.httpRoute.matches }} | ||
| matches: {{- include "common.tplvalues.render" (dict "value" .Values.controlplane.httpRoute.matches "context" .) | nindent 8 }} | ||
| {{- end }} | ||
| {{- if .Values.controlplane.httpRoute.filters }} | ||
| filters: {{- include "common.tplvalues.render" (dict "value" .Values.controlplane.httpRoute.filters "context" .) | nindent 8 }} | ||
| {{- end }} | ||
| - matches: | ||
| - headers: | ||
| - name: content-type | ||
| value: "^application/grpc" | ||
| type: RegularExpression | ||
| {{- $portAPI := coalesce .Values.controlplane.serviceAPI.port .Values.controlplane.serviceAPI.ports.http }} | ||
| backendRefs: | ||
| - name: {{ include "chainloop.controlplane.fullname" . }}-api | ||
| kind: Service | ||
| namespace: {{ include "common.names.namespace" . | quote }} | ||
| port: {{ $portAPI }} | ||
| {{- if .Values.controlplane.httpRoute.extraRules }} | ||
| {{- include "common.tplvalues.render" (dict "value" .Values.controlplane.httpRoute.extraRules "context" .) | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,6 +41,7 @@ spec: | |
| targetPort: {{ .Values.controlplane.containerPorts.grpc }} | ||
| {{- end }} | ||
| protocol: TCP | ||
| appProtocol: kubernetes.io/h2c | ||
| {{- if and (or (eq .Values.controlplane.serviceAPI.type "NodePort") (eq .Values.controlplane.serviceAPI.type "LoadBalancer")) (not (empty .Values.controlplane.serviceAPI.nodePorts.http)) }} | ||
| nodePort: {{ .Values.controlplane.serviceAPI.nodePorts.http }} | ||
| {{- else if eq .Values.controlplane.serviceAPI.type "ClusterIP" }} | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🟡 NOTES.txt TLS detection misses
controlplane.ingress.tls— only checksingressAPI.tlsIn
deployment/chainloop/templates/NOTES.txt:27-29, TLS is determined byor .Values.controlplane.ingressAPI.tls .Values.controlplane.httpRoute.tls. However,chainloop.controlplane.external_hostname(deployment/chainloop/templates/_helpers.tpl:341-342) can return a hostname fromcontrolplane.ingress(non-API), which has its owntlssetting at.Values.controlplane.ingress.tls. When a user enablescontrolplane.ingresswith TLS (but notingressAPI), the NOTES will show--insecureand port80, which is incorrect. The same issue applies to CAS: NOTES.txt line 29 doesn't checkcas.ingress.tls.Was this helpful? React with 👍 or 👎 to provide feedback.