Skip to content

Commit

Permalink
Merge pull request #441 from threefoldtech/development_update_vms
Browse files Browse the repository at this point in the history
fix update function
  • Loading branch information
rawdaGastan committed Aug 5, 2024
2 parents 4e89e39 + e6f166e commit 2ec0897
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
3 changes: 1 addition & 2 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
version: 2
archives:
- id: archive
name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
Expand Down Expand Up @@ -27,5 +28,3 @@ builds:
checksum:
name_template: "{{ .ProjectName }}_{{ .Version }}_SHA256SUMS"
algorithm: sha256
changelog:
skip: true
17 changes: 10 additions & 7 deletions provider/deployment_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,34 +83,37 @@ func (*Deployment) Update(
id string,
oldState DeploymentState,
input DeploymentArgs,
preview bool) (string, DeploymentState, error) {
preview bool) (DeploymentState, error) {
state := DeploymentState{DeploymentArgs: input}
if preview {
return id, state, nil
return state, nil
}

deployment, err := parseInputToDeployment(input)
if err != nil {
return id, state, err
return state, err
}

if err := updateDeploymentFromState(&deployment, oldState); err != nil {
return id, state, err
return state, err
}

config := infer.GetConfig[Config](ctx)

dl_network := config.TFPluginClient.State.Networks.GetNetwork(deployment.NetworkName)
dl_network.SetNodeSubnet(deployment.NodeID, deployment.IPrange)

if err := config.TFPluginClient.DeploymentDeployer.Deploy(ctx, &deployment); err != nil {
return id, state, err
return state, err
}

if err := config.TFPluginClient.DeploymentDeployer.Sync(ctx, &deployment); err != nil {
return id, state, err
return state, err
}

state = parseDeploymentToState(deployment)

return id, state, nil
return state, nil
}

// Read gets the state of the deployment resource
Expand Down
14 changes: 7 additions & 7 deletions provider/gateway_fqdn_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,35 +74,35 @@ func (*GatewayFQDN) Update(
id string,
oldState GatewayFQDNState,
input GatewayFQDNArgs,
preview bool) (string, GatewayFQDNState, error) {
preview bool) (GatewayFQDNState, error) {

state := GatewayFQDNState{GatewayFQDNArgs: input}
if preview {
return id, state, nil
return state, nil
}

fqdnGateway, err := parseToGatewayFQDN(input)
if err != nil {
return id, state, err
return state, err
}

if err := updateGatewayFQDNFromState(&fqdnGateway, oldState); err != nil {
return id, state, err
return state, err
}

config := infer.GetConfig[Config](ctx)

if err := config.TFPluginClient.GatewayFQDNDeployer.Deploy(ctx, &fqdnGateway); err != nil {
return id, state, err
return state, err
}

if err := config.TFPluginClient.GatewayFQDNDeployer.Sync(ctx, &fqdnGateway); err != nil {
return id, state, err
return state, err
}

state = parseToGatewayFQDNState(fqdnGateway)

return id, state, nil
return state, nil

}

Expand Down
2 changes: 2 additions & 0 deletions provider/k8s_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ func (*Kubernetes) Update(

config := infer.GetConfig[Config](ctx)

config.TFPluginClient.State.Networks.UpdateNetworkSubnets(k8sCluster.NetworkName, k8sCluster.NodesIPRange)

if err := config.TFPluginClient.K8sDeployer.Deploy(ctx, &k8sCluster); err != nil {
return state, err
}
Expand Down

0 comments on commit 2ec0897

Please sign in to comment.