Skip to content

Commit 4b48595

Browse files
committed
Fix Envoy CORS preflight responses and accidental config whitespace
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 3d2c6ef commit 4b48595

6 files changed

Lines changed: 13 additions & 30 deletions

File tree

k8s/cloud/base/proxy_envoy.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ data:
4242
allow_origin_string_match:
4343
- prefix: "*"
4444
allow_methods: GET, PUT, DELETE, POST, OPTIONS
45-
allow_headers: >
46-
keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,
47-
x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,
48-
x-grpc-web,authorization,grpc-timeout,grpc-status,grpc-message
45+
allow_headers: "content-type,x-grpc-web,x-user-agent"
4946
max_age: "1728000"
5047
expose_headers: grpc-status,grpc-message,grpc-timeout
5148
allow_credentials: true

k8s/cloud/dev/proxy_envoy.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ data:
2121
- filters:
2222
- name: envoy.http_connection_manager
2323
typed_config:
24-
"@type": >
24+
"@type": >-
2525
type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
2626
access_log:
2727
- name: envoy.file_access_log
@@ -49,10 +49,7 @@ data:
4949
allow_origin_string_match:
5050
- suffix: "dev.withpixie.dev"
5151
allow_methods: GET, PUT, DELETE, POST, OPTIONS
52-
allow_headers: >
53-
keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,
54-
x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,
55-
x-grpc-web,authorization,grpc-timeout,grpc-status,grpc-message
52+
allow_headers: "content-type,x-grpc-web,x-user-agent"
5653
max_age: "1728000"
5754
expose_headers: grpc-status,grpc-message,grpc-timeout
5855
allow_credentials: true

k8s/cloud/prod/proxy_envoy.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ data:
1616
- filters:
1717
- name: envoy.http_connection_manager
1818
typed_config:
19-
"@type": >
19+
"@type": >-
2020
type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
2121
access_log:
2222
- name: envoy.file_access_log
@@ -44,10 +44,7 @@ data:
4444
allow_origin_string_match:
4545
- suffix: "withpixie.ai"
4646
allow_methods: GET, PUT, DELETE, POST, OPTIONS
47-
allow_headers: >
48-
keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,
49-
x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,
50-
x-grpc-web,authorization,grpc-timeout,grpc-status,grpc-message
47+
allow_headers: "content-type,x-grpc-web,x-user-agent"
5148
max_age: "1728000"
5249
expose_headers: grpc-status,grpc-message,grpc-timeout
5350
allow_credentials: true

k8s/cloud/public/base/proxy_envoy.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ data:
2121
- filters:
2222
- name: envoy.http_connection_manager
2323
typed_config:
24-
"@type": >
24+
"@type": >-
2525
type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
2626
access_log:
2727
- name: envoy.file_access_log
@@ -48,11 +48,9 @@ data:
4848
cors:
4949
allow_origin_string_match:
5050
- suffix: "dev.withpixie.dev"
51+
# - suffix: "work.dev.withpixie.dev"
5152
allow_methods: GET, PUT, DELETE, POST, OPTIONS
52-
allow_headers: >
53-
keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,
54-
x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,
55-
x-grpc-web,authorization,grpc-timeout,grpc-status,grpc-message
53+
allow_headers: "content-type,x-grpc-web,x-user-agent"
5654
max_age: "1728000"
5755
expose_headers: grpc-status,grpc-message,grpc-timeout
5856
allow_credentials: true

k8s/cloud/staging/proxy_envoy.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ data:
1616
- filters:
1717
- name: envoy.http_connection_manager
1818
typed_config:
19-
"@type": >
19+
"@type": >-
2020
type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
2121
access_log:
2222
- name: envoy.file_access_log
@@ -44,10 +44,7 @@ data:
4444
allow_origin_string_match:
4545
- suffix: "staging.withpixie.dev"
4646
allow_methods: GET, PUT, DELETE, POST, OPTIONS
47-
allow_headers: >
48-
keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,
49-
x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,
50-
x-grpc-web,authorization,grpc-timeout,grpc-status,grpc-message
47+
allow_headers: "content-type,x-grpc-web,x-user-agent"
5148
max_age: "1728000"
5249
expose_headers: grpc-status,grpc-message,grpc-timeout
5350
allow_credentials: true

k8s/cloud/testing/proxy_envoy.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ data:
1616
- filters:
1717
- name: envoy.http_connection_manager
1818
typed_config:
19-
"@type": >
19+
"@type": >-
2020
type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
2121
access_log:
2222
- name: envoy.file_access_log
@@ -42,12 +42,9 @@ data:
4242
cluster: api_service
4343
cors:
4444
allow_origin_string_match:
45-
- suffix: "testing.withpixie.dev"
45+
- suffix: "testing.withpixie.dev"
4646
allow_methods: GET, PUT, DELETE, POST, OPTIONS
47-
allow_headers: >
48-
keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,
49-
x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,
50-
x-grpc-web,authorization,grpc-timeout,grpc-status,grpc-message
47+
allow_headers: "content-type,x-grpc-web,x-user-agent"
5148
max_age: "1728000"
5249
expose_headers: grpc-status,grpc-message,grpc-timeout
5350
allow_credentials: true

0 commit comments

Comments
 (0)