Skip to content

Support multiple gateway backends #1350

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Apr 16, 2025
Merged

Support multiple gateway backends #1350

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f4d59e
remove: len restriction on backends count
Nabil-Salah Apr 9, 2025
18d5859
feat: change tfgrid to use zosbase
Nabil-Salah Apr 10, 2025
0dacc0b
fix: go mods
Nabil-Salah Apr 10, 2025
997fdd6
update: gridify and tfrobot dependancy
Nabil-Salah Apr 10, 2025
eddef4a
update: user-contracts-mon mod file
Nabil-Salah Apr 15, 2025
e06a294
refactor: change workload function name from workload3 and workload4 …
Nabil-Salah Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grid-client/deployer/deployment_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func CountDeploymentPublicIPs(dl zosTypes.Deployment) (uint32, error) {
var res uint32
for _, wl := range dl.Workloads {
if wl.Type == zosTypes.PublicIPType {
data, err := wl.Workload3().WorkloadData()
data, err := wl.Workload().WorkloadData()
if err != nil {
return res, errors.Wrapf(err, "could not parse workload data for workload %s", wl.Name)
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/deployer/gateway_fqdn_deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ func (d *GatewayFQDNDeployer) Sync(ctx context.Context, gw *workloads.GatewayFQD
gw.Network = gwWorkload.Network

if wl != nil && wl.Result.State.IsOkay() {
gwWorkload, err := workloads.NewGatewayFQDNProxyFromZosWorkload(*wl.Workload.Workload3())
gwWorkload, err := workloads.NewGatewayFQDNProxyFromZosWorkload(*wl.Workload.Workload())
gw.Backends = gwWorkload.Backends
gw.Name = gwWorkload.Name
gw.FQDN = gwWorkload.FQDN
Expand Down
2 changes: 1 addition & 1 deletion grid-client/deployer/gateway_name_deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ func (d *GatewayNameDeployer) Sync(ctx context.Context, gw *workloads.GatewayNam

// if the node acknowledges it, we are golden
if wl != nil && wl.Result.State.IsOkay() {
gwWorkload, err := workloads.NewGatewayNameProxyFromZosWorkload(*wl.Workload.Workload3())
gwWorkload, err := workloads.NewGatewayNameProxyFromZosWorkload(*wl.Workload.Workload())
gw.Backends = gwWorkload.Backends
gw.Name = gwWorkload.Name
gw.FQDN = gwWorkload.FQDN
Expand Down
6 changes: 3 additions & 3 deletions grid-client/deployer/k8s_deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func (d *K8sDeployer) UpdateFromRemote(ctx context.Context, k8sCluster *workload
for _, dl := range currentDeployments {
for _, w := range dl.Workloads {
if w.Type == zosTypes.ZMachineType {
d, err := w.Workload3().WorkloadData()
d, err := w.Workload().WorkloadData()
if err != nil {
zerolog.Error().Err(err).Msg("failed to get workload data")
}
Expand Down Expand Up @@ -303,7 +303,7 @@ func (d *K8sDeployer) UpdateFromRemote(ctx context.Context, k8sCluster *workload
for _, w := range dl.Workloads {
if w.Type == zosTypes.ZMachineType {
workloadNodeID[w.Name] = node
workloadObj[w.Name] = *w.Workload3()
workloadObj[w.Name] = *w.Workload()

} else if w.Type == zosTypes.PublicIPType {
ipResult := zos.PublicIPResult{}
Expand All @@ -313,7 +313,7 @@ func (d *K8sDeployer) UpdateFromRemote(ctx context.Context, k8sCluster *workload
publicIPs[w.Name] = ipResult.IP.String()
publicIP6s[w.Name] = ipResult.IPv6.String()
} else if w.Type == zosTypes.ZMountType {
wl, err := w.Workload3().WorkloadData()
wl, err := w.Workload().WorkloadData()
if err != nil {
return d.tfPluginClient.sentry.error(errors.Wrap(err, "failed to load disk data"))
}
Expand Down
10 changes: 5 additions & 5 deletions grid-client/state/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func (st *State) LoadGatewayFQDNFromGrid(ctx context.Context, nodeID uint32, nam
if err != nil {
return workloads.GatewayFQDNProxy{}, errors.Wrapf(err, "could not generate deployment metadata for %s", name)
}
gateway, err := workloads.NewGatewayFQDNProxyFromZosWorkload(*wl.Workload3())
gateway, err := workloads.NewGatewayFQDNProxyFromZosWorkload(*wl.Workload())
if err != nil {
return workloads.GatewayFQDNProxy{}, err
}
Expand Down Expand Up @@ -127,7 +127,7 @@ func (st *State) LoadGatewayNameFromGrid(ctx context.Context, nodeID uint32, nam
if err != nil {
return workloads.GatewayNameProxy{}, errors.Wrapf(err, "could not generate deployment metadata for %s", deploymentName)
}
gateway, err := workloads.NewGatewayNameProxyFromZosWorkload(*wl.Workload3())
gateway, err := workloads.NewGatewayNameProxyFromZosWorkload(*wl.Workload())
if err != nil {
return workloads.GatewayNameProxy{}, err
}
Expand Down Expand Up @@ -194,12 +194,12 @@ func (st *State) LoadK8sFromGrid(ctx context.Context, nodeIDs []uint32, deployme
return workloads.K8sCluster{}, errors.Wrapf(err, "could not compute node %s, resources", workload.Name)
}

node, err := workloads.NewK8sNodeFromWorkload(*workload.Workload3(), nodeID, workloadDiskSize[workload.Name], workloadComputedIP[workload.Name], workloadComputedIP6[workload.Name])
node, err := workloads.NewK8sNodeFromWorkload(*workload.Workload(), nodeID, workloadDiskSize[workload.Name], workloadComputedIP[workload.Name], workloadComputedIP6[workload.Name])
if err != nil {
return workloads.K8sCluster{}, errors.Wrapf(err, "could not generate node data for %s", workload.Name)
}

isMaster, err := isMasterNode(*workload.Workload3())
isMaster, err := isMasterNode(*workload.Workload())
if err != nil {
return workloads.K8sCluster{}, err
}
Expand Down Expand Up @@ -282,7 +282,7 @@ func (st *State) computeK8sDeploymentResources(dl zosTypes.Deployment) (

case zos.ZMountType.String():

d, err := w.Workload3().WorkloadData()
d, err := w.Workload().WorkloadData()
if err != nil {
return workloadDiskSize, workloadComputedIP, workloadComputedIP6, errors.Wrap(err, "failed to load disk data")
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type Disk struct {
func NewDiskFromWorkload(wl *zosTypes.Workload) (Disk, error) {
var dataI interface{}

dataI, err := wl.Workload3().WorkloadData()
dataI, err := wl.Workload().WorkloadData()
if err != nil {
return Disk{}, errors.Wrap(err, "failed to get workload data")
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/qsfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func GroupsFromZos(gs []zos.ZdbGroup) (groups Groups) {
func NewQSFSFromWorkload(wl *zosTypes.Workload) (QSFS, error) {
var dataI interface{}

dataI, err := wl.Workload3().WorkloadData()
dataI, err := wl.Workload().WorkloadData()
if err != nil {
return QSFS{}, errors.Wrap(err, "failed to get workload data")
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/volume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type Volume struct {
func NewVolumeFromWorkload(wl *zosTypes.Workload) (Volume, error) {
var dataI interface{}

dataI, err := wl.Workload3().WorkloadData()
dataI, err := wl.Workload().WorkloadData()
if err != nil {
return Volume{}, errors.Wrap(err, "failed to get workload data")
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/zdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type ZDB struct {
func NewZDBFromWorkload(wl *zosTypes.Workload) (ZDB, error) {
var dataI interface{}

dataI, err := wl.Workload3().WorkloadData()
dataI, err := wl.Workload().WorkloadData()
if err != nil {
return ZDB{}, errors.Wrap(err, "failed to get workload data")
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/workloads/zlog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func zlogs(dl *zosTypes.Deployment, name string) []Zlog {

var dataI interface{}

dataI, err := wl.Workload3().WorkloadData()
dataI, err := wl.Workload.Workload().WorkloadData()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not only renaming here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it give error because embedded field Workload is shadowing the method

also it should act the same
https://go101.org/article/type-embedding.html
section: Shorthands of Selectors

if err != nil {
continue
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/zos/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ func (d *Deployment) zosDeployment() *gridtypes.Deployment {
var workloads []gridtypes.Workload

for _, wl := range d.Workloads {
workloads = append(workloads, *wl.Workload3())
workloads = append(workloads, *wl.Workload())
}

for _, req := range d.SignatureRequirement.Requests {
Expand Down
2 changes: 1 addition & 1 deletion grid-client/zos/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func (r *ZMachineResult) UnmarshalJSON(data []byte) error {
}

func (wl *Workload) ZMachineWorkload() (*zos.ZMachine, error) {
dataI, err := wl.Workload3().WorkloadData()
dataI, err := wl.Workload().WorkloadData()
if err != nil {
return nil, errors.Wrap(err, "failed to get workload data")
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/zos/machine_light.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ type ZMachineLightResult struct {
}

func (wl *Workload) ZMachineLightWorkload() (*zos.ZMachineLight, error) {
dataI, err := wl.Workload3().WorkloadData()
dataI, err := wl.Workload().WorkloadData()
if err != nil {
return nil, errors.Wrap(err, "failed to get workload data")
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/zos/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ type Peer struct {
}

func (wl *Workload) NetworkWorkload() (*zos.Network, error) {
dataI, err := wl.Workload3().WorkloadData()
dataI, err := wl.Workload().WorkloadData()
if err != nil {
return nil, errors.Wrap(err, "failed to get workload data")
}
Expand Down
2 changes: 1 addition & 1 deletion grid-client/zos/network_light.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (h Bytes) MarshalText() (text []byte, err error) {
}

func (wl *Workload) NetworkLightWorkload() (*zos.NetworkLight, error) {
dataI, err := wl.Workload3().WorkloadData()
dataI, err := wl.Workload().WorkloadData()
if err != nil {
return nil, errors.Wrap(err, "failed to get workload data")
}
Expand Down
6 changes: 3 additions & 3 deletions grid-client/zos/workload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func NewWorkloadFromZosWorkload(wl gridtypes.Workload) Workload {
}
}

func (wl *Workload) Workload3() *gridtypes.Workload {
func (wl *Workload) Workload() *gridtypes.Workload {
return &gridtypes.Workload{
Version: wl.Version,
Name: gridtypes.Name(wl.Name),
Expand All @@ -109,13 +109,13 @@ func (wl *Workload) Workload3() *gridtypes.Workload {

func (wl *Workload) Challenge(w io.Writer) error {

return wl.Workload3().Challenge(w)
return wl.Workload().Challenge(w)
}

// Capacity returns the used capacity by this workload
func (wl *Workload) Capacity() (Capacity, error) {

cap, err := wl.Workload3().Capacity()
cap, err := wl.Workload().Capacity()
return Capacity{
CRU: cap.CRU,
SRU: uint64(cap.SRU),
Expand Down
Loading