Skip to content

Commit

Permalink
Revert merge conflict (flyteorg#354)
Browse files Browse the repository at this point in the history
* revert

Signed-off-by: Katrina Rogan <[email protected]>

* lint

Signed-off-by: Katrina Rogan <[email protected]>
  • Loading branch information
katrogan authored Feb 18, 2022
1 parent 207a13c commit 7614bf5
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions flyteadmin/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ type SslOptions struct {
}

var defaultServerConfig = &ServerConfig{
HTTPPort: 8088,
KubeConfig: "$HOME/.kube/config",
HTTPPort: 8088,
Security: ServerSecurityOptions{
AllowCors: true,
AllowedHeaders: []string{"Content-Type", "flyte-authorization"},
Expand Down

0 comments on commit 7614bf5

Please sign in to comment.