-
Notifications
You must be signed in to change notification settings - Fork 1
Refactor kubedeployer to use gridclient wrapper #970
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
SalmaElsoly
wants to merge
2
commits into
master
Choose a base branch
from
master_grid_wrapper
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 1 commit
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,40 @@ | ||
| package kubedeployer | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "kubecloud/internal/infrastructure/gridclient" | ||
|
|
||
| "github.com/threefoldtech/tfgrid-sdk-go/grid-client/deployer" | ||
| "go.opentelemetry.io/otel/trace" | ||
| sdktrace "go.opentelemetry.io/otel/sdk/trace" | ||
| ) | ||
|
|
||
| type Client struct { | ||
| GridClient deployer.TFPluginClient | ||
| mnemonic string | ||
| GridClient gridclient.GridClient | ||
| } | ||
|
|
||
| func NewClient(mnemonic, gridNet string, debug bool, tp trace.TracerProvider) (*Client, error) { | ||
| pluginOpts := []deployer.PluginOpt{ | ||
| deployer.WithNetwork(gridNet), | ||
| deployer.WithDisableSentry(), | ||
| // NewClient creates a new Client instance | ||
| func NewClient(mnemonic, gridNet string, debug bool, tp *sdktrace.TracerProvider) (*Client, error) { | ||
| var opts []gridclient.ClientOpts | ||
| if gridNet != "" { | ||
| opts = append(opts, gridclient.WithNetwork(gridNet)) | ||
| } | ||
| if debug { | ||
| pluginOpts = append(pluginOpts, deployer.WithLogs()) | ||
| opts = append(opts, gridclient.WithDebug()) | ||
| } | ||
|
|
||
| if tp != nil { | ||
| pluginOpts = append(pluginOpts, deployer.WithTraceProvider(tp)) | ||
| opts = append(opts, gridclient.WithTracerProvider(tp)) | ||
| } | ||
| opts = append(opts, gridclient.WithDisableSentry()) | ||
|
|
||
| tfplugin, err := deployer.NewTFPluginClient( | ||
| mnemonic, | ||
| pluginOpts..., | ||
| ) | ||
| gridCl, err := gridclient.NewGridClient(mnemonic, opts...) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create TFPluginClient: %v", err) | ||
| return nil, err | ||
| } | ||
|
|
||
| return &Client{ | ||
| GridClient: tfplugin, | ||
| mnemonic: mnemonic, | ||
| GridClient: gridCl, | ||
| }, nil | ||
| } | ||
|
|
||
| // Close closes the underlying GridClient | ||
| func (c *Client) Close() { | ||
| c.GridClient.Close() | ||
| } | ||
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
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
78 changes: 17 additions & 61 deletions
78
backend/internal/deployment/statemanager/gridclient_state.go
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 |
|---|---|---|
| @@ -1,86 +1,42 @@ | ||
| package statemanager | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
|
|
||
| "kubecloud/internal/deployment/kubedeployer" | ||
|
|
||
| "kubecloud/internal/infrastructure/logger" | ||
|
|
||
| "github.com/threefoldtech/tfgrid-sdk-go/grid-client/state" | ||
| "github.com/xmonader/ewf" | ||
| ) | ||
|
|
||
| // GridClientState represents the critical state that needs to be preserved | ||
| type GridClientState struct { | ||
| CurrentNodeDeployments map[uint32][]uint64 `json:"current_node_deployments"` | ||
| NetworkSubnets map[string]map[uint32]string `json:"network_subnets"` | ||
| } | ||
| const gridClientStateKey = "gridclient_state" | ||
|
|
||
| // SaveGridClientState saves the critical GridClient state to workflow state | ||
| // SaveGridClientState saves the GridClient state to the workflow state | ||
| func SaveGridClientState(workflowState ewf.State, kubeClient *kubedeployer.Client) { | ||
|
SalmaElsoly marked this conversation as resolved.
Outdated
|
||
| log := logger.ForOperation("statemanager", "save_gridclient_state") | ||
| if kubeClient == nil || kubeClient.GridClient.State == nil { | ||
| if kubeClient == nil || kubeClient.GridClient == nil { | ||
| return | ||
| } | ||
|
|
||
| gridState := GridClientState{ | ||
| CurrentNodeDeployments: make(map[uint32][]uint64), | ||
| NetworkSubnets: make(map[string]map[uint32]string), | ||
| } | ||
|
|
||
| // Save CurrentNodeDeployments | ||
| for nodeID, contractIDs := range kubeClient.GridClient.State.CurrentNodeDeployments { | ||
| gridState.CurrentNodeDeployments[nodeID] = []uint64(contractIDs) | ||
| } | ||
|
|
||
| // Save network subnet information | ||
| for networkName, network := range kubeClient.GridClient.State.Networks.State { | ||
| gridState.NetworkSubnets[networkName] = network.Subnets | ||
| stateData, err := kubeClient.GridClient.GetState() | ||
| if err != nil { | ||
| return | ||
| } | ||
|
|
||
| // Store as JSON string in workflow state | ||
| if stateBytes, err := json.Marshal(gridState); err == nil { | ||
| workflowState["gridclient_state"] = string(stateBytes) | ||
| log.Debug().Msg("Saved GridClient state to workflow state") | ||
| } else { | ||
| log.Warn().Err(err).Msg("Failed to marshal GridClient state") | ||
| } | ||
| workflowState[gridClientStateKey] = stateData | ||
| } | ||
|
|
||
| // RestoreGridClientState restores the critical GridClient state from workflow state | ||
| // RestoreGridClientState restores the GridClient state from the workflow state | ||
| func RestoreGridClientState(workflowState ewf.State, kubeClient *kubedeployer.Client) error { | ||
| log := logger.ForOperation("statemanager", "restore_gridclient_state") | ||
| if kubeClient == nil || kubeClient.GridClient.State == nil { | ||
| return fmt.Errorf("invalid kubeclient or gridclient state") | ||
| } | ||
|
|
||
| stateStr, ok := workflowState["gridclient_state"].(string) | ||
| if !ok || stateStr == "" { | ||
| log.Debug().Msg("No GridClient state found in workflow state") | ||
| return nil // Not an error, just no state to restore | ||
| } | ||
|
|
||
| var savedState GridClientState | ||
| if err := json.Unmarshal([]byte(stateStr), &savedState); err != nil { | ||
| return fmt.Errorf("failed to unmarshal GridClient state: %w", err) | ||
| if kubeClient == nil || kubeClient.GridClient == nil { | ||
| return nil | ||
| } | ||
|
|
||
| // Restore CurrentNodeDeployments | ||
| kubeClient.GridClient.State.CurrentNodeDeployments = make(map[uint32]state.ContractIDs) | ||
| for nodeID, contractIDs := range savedState.CurrentNodeDeployments { | ||
| kubeClient.GridClient.State.CurrentNodeDeployments[nodeID] = state.ContractIDs(contractIDs) | ||
| stateData, ok := workflowState[gridClientStateKey] | ||
| if !ok { | ||
| return nil | ||
| } | ||
|
|
||
| // Restore network subnet information | ||
| kubeClient.GridClient.State.Networks.State = make(map[string]state.Network) | ||
| for networkName, subnets := range savedState.NetworkSubnets { | ||
| kubeClient.GridClient.State.Networks.State[networkName] = state.Network{ | ||
| Subnets: subnets, | ||
| } | ||
| stateBytes, ok := stateData.([]byte) | ||
| if !ok { | ||
| return nil | ||
| } | ||
|
|
||
| log.Debug().Msg("Restored GridClient state from workflow state") | ||
| return nil | ||
| return kubeClient.GridClient.RestoreState(stateBytes) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.