-
Notifications
You must be signed in to change notification settings - Fork 996
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move prometheus-statsd-exporter to toggleable core dependency (default false). Add ingresses for gRPC and HTTP for both core and serving. Refactor ConfigMaps to user Spring profiles rather than manipulating the base application.yaml. Add ability to define and enable arbitrary Spring profiles. Add toggle to enable prometheus scraping in core. Add parameters to change LOG_LEVEL and LOG_TYPE (#430). Add parameter to specify GOOGLE_CLOUD_PROJECT. Allow jar path to be specified (e.g. if using non-standard image). Add missing documentation for Helm parameters.
- Loading branch information
Showing
29 changed files
with
510 additions
and
160 deletions.
There are no files selected for viewing
This file contains 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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains 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
68 changes: 68 additions & 0 deletions
68
infra/charts/feast/charts/feast-core/templates/_ingress.yaml
This file contains 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,68 @@ | ||
| {{- /* | ||
| This takes an array of three values: | ||
| - the top context | ||
| - the feast component | ||
| - the service protocol | ||
| - the ingress context | ||
| */ -}} | ||
| {{- define "feast.ingress" -}} | ||
| {{- $top := (index . 0) -}} | ||
| {{- $component := (index . 1) -}} | ||
| {{- $protocol := (index . 2) -}} | ||
| {{- $ingressValues := (index . 3) -}} | ||
| apiVersion: extensions/v1beta1 | ||
| kind: Ingress | ||
| {{ include "feast.ingress.metadata" . }} | ||
| spec: | ||
| rules: | ||
| {{- range $host := $ingressValues.hosts }} | ||
| - host: {{ $host }} | ||
| http: | ||
| paths: | ||
| - path: / | ||
| backend: | ||
| serviceName: {{ include (printf "feast-%s.fullname" $component) $top }} | ||
| servicePort: {{ index $top.Values "service" $protocol "port" }} | ||
| {{- end }} | ||
| {{- if $ingressValues.https.enabled }} | ||
| tls: | ||
| {{- range $host := $ingressValues.hosts }} | ||
| - secretName: {{ index $ingressValues.https.secretNames $host | default (splitList "." $host | rest | join "-" | printf "%s-tls") }} | ||
| hosts: | ||
| - {{ $host }} | ||
| {{- end }} | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{- define "feast.ingress.metadata" -}} | ||
| {{- $commonMetadata := fromYaml (include "common.metadata" (first .)) }} | ||
| {{- $overrides := fromYaml (include "feast.ingress.metadata-overrides" .) -}} | ||
| {{- toYaml (merge $overrides $commonMetadata) -}} | ||
| {{- end -}} | ||
|
|
||
| {{- define "feast.ingress.metadata-overrides" -}} | ||
| {{- $top := (index . 0) -}} | ||
| {{- $component := (index . 1) -}} | ||
| {{- $protocol := (index . 2) -}} | ||
| {{- $ingressValues := (index . 3) -}} | ||
| {{- $commonFullname := include "common.fullname" $top }} | ||
| metadata: | ||
| name: {{ $commonFullname }}-{{ $component }}-{{ $protocol }} | ||
| annotations: | ||
| kubernetes.io/ingress.class: {{ $ingressValues.class | quote }} | ||
| {{- if (and (eq $ingressValues.class "nginx") $ingressValues.auth.enabled) }} | ||
| nginx.ingress.kubernetes.io/auth-url: {{ $ingressValues.auth.authUrl | quote }} | ||
| nginx.ingress.kubernetes.io/auth-response-headers: "x-auth-request-email, x-auth-request-user" | ||
| nginx.ingress.kubernetes.io/auth-signin: "https://{{ $ingressValues.auth.signinHost | default (splitList "." (index $ingressValues.hosts 0) | rest | join "." | printf "auth.%s")}}/oauth2/start?rd=/r/$host/$request_uri" | ||
| {{- end }} | ||
| {{- if (and (eq $ingressValues.class "nginx") $ingressValues.whitelist) }} | ||
| nginx.ingress.kubernetes.io/whitelist-source-range: {{ $ingressValues.whitelist | quote -}} | ||
| {{- end }} | ||
| {{- if (and (eq $ingressValues.class "nginx") (eq $protocol "grpc") ) }} | ||
| # TODO: Allow choice of GRPC/GRPCS | ||
| nginx.ingress.kubernetes.io/backend-protocol: "GRPC" | ||
| {{- end }} | ||
| {{- if $ingressValues.annotations -}} | ||
| {{ include "common.annote" $ingressValues.annotations | indent 4 }} | ||
| {{- end }} | ||
| {{- end -}} |
This file contains 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
Oops, something went wrong.