This repository was archived by the owner on May 31, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 79
Add ENV VAR FLTYE_ADMIN_ENDPOINT (#4948) #466
Open
zychen5186
wants to merge
5
commits into
flyteorg:master
Choose a base branch
from
zychen5186:issue#4948
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
2a5c4b0
Add ENV VAR FLTYE_ADMIN_ENDPOINT (#4948)
zychen5186 61acec1
fmt.Errorf error message
zychen5186 78b795d
functionized reading env var to config, add test
zychen5186 514e52f
modify code stucture, fix lint
zychen5186 15debc2
Modify var names
zychen5186 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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,46 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/url" | ||
| "os" | ||
|
|
||
| "github.com/flyteorg/flyte/flyteidl/clients/go/admin" | ||
| "github.com/flyteorg/flyte/flytestdlib/config" | ||
| ) | ||
|
|
||
| const flyteAdminEndpoint = "FLYTE_ADMIN_ENDPOINT" | ||
|
|
||
| type UpdateFunc func(context.Context) error | ||
|
|
||
zychen5186 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| var envToUpdateFunc = map[string]UpdateFunc{flyteAdminEndpoint: updateAdminEndpoint} | ||
|
|
||
| func UpdateConfigWithEnvVar() error { | ||
| ctx := context.Background() | ||
|
|
||
| for envVar, updateFunc := range envToUpdateFunc { | ||
| if os.Getenv(envVar) != "" { | ||
| if err := updateFunc(ctx); err != nil { | ||
| return fmt.Errorf("error update config with env var: %v", err) | ||
| } | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func updateAdminEndpoint(ctx context.Context) error { | ||
| cfg := admin.GetConfig(ctx) | ||
|
|
||
| if len(os.Getenv(flyteAdminEndpoint)) > 0 { | ||
| envEndpoint, err := url.Parse(os.Getenv(flyteAdminEndpoint)) | ||
| if err != nil { | ||
| return fmt.Errorf("error parsing env var %v: %v", flyteAdminEndpoint, err) | ||
| } | ||
| cfg.Endpoint = config.URL{URL: *envEndpoint} | ||
| if err := admin.SetConfig(cfg); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -134,6 +134,10 @@ | |
| return err | ||
| } | ||
|
|
||
| if err := config.UpdateConfigWithEnvVar(); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.