DevFW-CICD/garm-provider-edge-connect
15
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

chore(api): upgrade edge connect client to v2
Some checks failed
Go Tests / go-tests (push) Failing after 1m13s
Details

Browse source
This commit is contained in:
Martin McCaffery 2025-10-21 16:28:40 +02:00
parent f92a4a7c06
commit 25eab2277d
Signed by: martin.mccaffery
GPG key ID: 7C4D0F375BCEE533
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -3,7 +3,7 @@ module edp.buildth.ing/DevFW-CICD/garm-provider-edge-connect
go 1.25.1
require (
edp.buildth.ing/DevFW-CICD/edge-connect-client v1.0.0
edp.buildth.ing/DevFW-CICD/edge-connect-client/v2 v2.0.2
github.com/BurntSushi/toml v1.5.0
github.com/cloudbase/garm-provider-common v0.1.7
k8s.io/api v0.34.1

4
go.sum
View file

@ -1,5 +1,5 @@
edp.buildth.ing/DevFW-CICD/edge-connect-client v1.0.0 h1:WcQmJNHS/4dlGx3lpw3x0hZdPj+GKSdGsQrWRxpdhyI=
edp.buildth.ing/DevFW-CICD/edge-connect-client v1.0.0/go.mod h1:qZUPl2hFLNuhtkIojGfSq/MF7DQJGwvq6KbmtqPwZws=
edp.buildth.ing/DevFW-CICD/edge-connect-client/v2 v2.0.2 h1:AcHIt5oOevf8NJPDRE/rpWHBWMStMWlq0A+jz7Wd5Oo=
edp.buildth.ing/DevFW-CICD/edge-connect-client/v2 v2.0.2/go.mod h1:nPZ4K4BB7eXyeSrcHXvSPkNZbs+XgmxbDJOM4KhbI1A=
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/cloudbase/garm-provider-common v0.1.7 h1:V0upTejFRDiyFBO4hhkMWmPtmRTguyOt/4i1u9/rfbg=

24
provider/provider.go
View file

@ -25,7 +25,7 @@ import (
"strings"
"time"
"edp.buildth.ing/DevFW-CICD/edge-connect-client/sdk/edgeconnect"
edgeconnect "edp.buildth.ing/DevFW-CICD/edge-connect-client/v2/sdk/edgeconnect/v2"
"edp.buildth.ing/DevFW-CICD/garm-provider-edge-connect/config"
"edp.buildth.ing/DevFW-CICD/garm-provider-edge-connect/internal/spec"
@ -83,7 +83,7 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
log.Printf("Executing CreateInstance with %v\n", bootstrapParams)
log.Printf("Executing CreateInstance with RepoURL %v\n", bootstrapParams.RepoURL)
instancename := fmt.Sprintf("garm-%v-%v-%v", a.controllerID[:8], bootstrapParams.PoolID[:8], strings.ToLower(bootstrapParams.Name))
instancename := fmt.Sprintf("garm-%v-%v", bootstrapParams.PoolID[:8], strings.ToLower(bootstrapParams.Name))
gitHubScopeDetails, err := spec.ExtractGitHubScopeDetails(bootstrapParams.RepoURL)
if err != nil {
@ -147,7 +147,7 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
_, err = a.client.ShowApp(ctx, edgeconnect.AppKey{
Organization: a.cfg.Organization,
Name: instancename,
Version: "0.0.1",
Version: "1",
}, a.cfg.Region)
if err != nil && !errors.Is(err, edgeconnect.ErrResourceNotFound) {
return params.ProviderInstance{}, err
@ -159,7 +159,7 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
Key: edgeconnect.AppKey{
Organization: a.cfg.Organization,
Name: instancename,
Version: "0.0.1",
Version: "1",
},
Deployment: "kubernetes",
ImageType: "Docker",
@ -167,18 +167,18 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
AllowServerless: true,
ServerlessConfig: struct{}{},
DefaultFlavor: edgeconnect.Flavor{
Name: "EU.small",
Name: "defualt",
},
DeploymentGenerator: "kubernetes-basic",
DeploymentManifest: string(manifest),
RequiredOutboundConnections: []edgeconnect.SecurityRule{
edgeconnect.SecurityRule{
{
PortRangeMax: 65535,
PortRangeMin: 1,
Protocol: "TCP",
RemoteCIDR: "0.0.0.0/0",
},
edgeconnect.SecurityRule{
{
PortRangeMax: 65535,
PortRangeMin: 1,
Protocol: "UDP",
@ -212,10 +212,10 @@ func (a *edgeConnectProvider) CreateInstance(ctx context.Context, bootstrapParam
AppKey: edgeconnect.AppKey{
Organization: a.cfg.Organization,
Name: instancename,
Version: "0.0.1",
Version: "1",
},
Flavor: edgeconnect.Flavor{
Name: "EU.small",
Name: "defualt",
},
},
})
@ -263,6 +263,10 @@ func GetRunnerEnvs(gitHubScope GitHubScopeDetails, bootstrapParams params.Bootst
Name: "RUNNER_LABELS",
Value: strings.Join(bootstrapParams.Labels, ","),
},
{
Name: "RUNNER_HOME",
Value: "/tmp",
},
{
Name: "RUNNER_NO_DEFAULT_LABELS",
Value: "true",
@ -273,7 +277,7 @@ func GetRunnerEnvs(gitHubScope GitHubScopeDetails, bootstrapParams params.Bootst
},
{
Name: "RUNNER_WORKDIR",
Value: "/runner/_work/",
Value: "/tmp/_work/",
},
{
Name: "GITHUB_URL",