Update stdlib default config (flyteorg#190)

* Update Flytestdlib to fix default map merge Signed-off-by: Haytham Abuelfutuh <[email protected]> * Update flytestdlib to released version Signed-off-by: Haytham Abuelfutuh <[email protected]>
eapolinario · May 4, 2021 · 5d8261a · 5d8261a
1 parent ffe5606
commit 5d8261a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/flyteadmin/flyteadmin_config.yaml b/flyteadmin/flyteadmin_config.yaml
@@ -9,7 +9,7 @@ server:
   kube-config: /Users/haythamabuelfutuh/kubeconfig/k3s/k3s.yaml
   security:
     secure: false
-    useAuth: true
+    useAuth: false
     allowCors: true
     allowedOrigins:
       # Accepting all domains for Sandbox installation
@@ -19,7 +19,7 @@ server:
 # Okta OIdC only
 auth:
   authorizedUris:
-    - https://efdf60eb2525.ngrok.io
+    - https://localhost:8088
     - http://flyteadmin:80
   userAuth:
     openId:
@@ -34,6 +34,9 @@ auth:
 
 # Okta OIdC and OAuth2
 #auth:
+#  authorizedUris:
+#    - https://localhost:8088
+#    - http://flyteadmin:80
 #  appAuth:
 #    authServerType: External
 #  userAuth:

diff --git a/flyteadmin/go.mod b/flyteadmin/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/flyteorg/flyteidl v0.18.40
 	github.com/flyteorg/flyteplugins v0.5.38
 	github.com/flyteorg/flytepropeller v0.7.8
-	github.com/flyteorg/flytestdlib v0.3.18
+	github.com/flyteorg/flytestdlib v0.3.20
 	github.com/gofrs/uuid v4.0.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b

diff --git a/flyteadmin/go.sum b/flyteadmin/go.sum
@@ -313,8 +313,8 @@ github.com/flyteorg/flyteplugins v0.5.38/go.mod h1:CxerBGWWEmNYmPxSMHnwQEr9cc1Fb
 github.com/flyteorg/flytepropeller v0.7.8 h1:O441kDHJUayS/2rebTj7VG4e1LowrweazQhzTaZ97m4=
 github.com/flyteorg/flytepropeller v0.7.8/go.mod h1:2SPJtYS0oM5lN4OCqBDbSRozRWvobFTXXlAC2ygbbWk=
 github.com/flyteorg/flytestdlib v0.3.13/go.mod h1:Tz8JCECAbX6VWGwFT6cmEQ+RJpZ/6L9pswu3fzWs220=
-github.com/flyteorg/flytestdlib v0.3.18 h1:G6OUvhN8r3OCP90uvEvEqRilYpITtmGGWIlR/GO1Gfk=
-github.com/flyteorg/flytestdlib v0.3.18/go.mod h1:VlbQuHTE+z2N5qusfwi+6WEkeJoqr8Q0E4NtBAsdwkU=
+github.com/flyteorg/flytestdlib v0.3.20 h1:1BTg02U1dyVZduxuViebHkTrw+4Owc5TI/lPbHiimzE=
+github.com/flyteorg/flytestdlib v0.3.20/go.mod h1:VlbQuHTE+z2N5qusfwi+6WEkeJoqr8Q0E4NtBAsdwkU=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=