Skip to content

Commit

Permalink
Revert istio gateway change
Browse files Browse the repository at this point in the history
It wasn't needed in the end
  • Loading branch information
andytson-inviqa committed Mar 24, 2020
1 parent 9a63e8f commit 6cd2462
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
3 changes: 0 additions & 3 deletions harness/attributes/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ attributes:
base:
resourcePrefix: ~
hostname: = @('pipeline.base.namespace') ~ '.example.com'
istio:
gateways:
- "istio-system/{{ .Release.Namespace }}-gateway"
prometheus:
podMonitoring: false
services:
Expand Down
4 changes: 1 addition & 3 deletions helm/app/templates/application/app/istio-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ spec:
hosts:
- {{ .Values.docker.services.app.environment.APP_HOST }}
gateways:
{{- range $key, $value := .Values.istio.gateways }}
- {{ tpl $value $ | quote }}
{{- end }}
- istio-system/{{ .Release.Namespace }}-gateway
http:
- route:
- destination:
Expand Down
2 changes: 0 additions & 2 deletions helm/app/values.yaml.twig
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ default_port:
health_port: {{ @('app.health_port') }}
ingress:
{{ to_yaml(@('app.ingress'), 2, 2) | raw }}
istio:
{{ to_yaml(@('pipeline.base.istio'), 2, 2) | raw }}
resourcePrefix: {{ @('pipeline.base.resourcePrefix') | json_encode | raw }}

{% include blocks ~ 'additional.yml.twig' %}

0 comments on commit 6cd2462

Please sign in to comment.