Skip to content

Commit b704002

Browse files
committed
migrate from proxmox to proxmox-go
1 parent 3040fd1 commit b704002

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.20
44

55
require (
66
github.com/pkg/errors v0.9.1
7-
github.com/sp-yduck/proxmox v0.0.0-20230702124708-d086ca37fd8f
7+
github.com/sp-yduck/proxmox-go v0.0.0-20230717071731-9fdab94cfe8d
88
github.com/spf13/pflag v1.0.5
99
gopkg.in/yaml.v3 v3.0.1
1010
k8s.io/api v0.27.3

go.sum

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
263263
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
264264
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
265265
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
266-
github.com/sp-yduck/proxmox v0.0.0-20230702124708-d086ca37fd8f h1:n32eSWqWLtjk+jb4B1Ok+W5KoAxuYuouEkXjumqySXI=
267-
github.com/sp-yduck/proxmox v0.0.0-20230702124708-d086ca37fd8f/go.mod h1:VIKtGZXlx0nO9Y+K2vJ4z3rJLkZ3v0OvTnKbO22EnL4=
266+
github.com/sp-yduck/proxmox-go v0.0.0-20230717071731-9fdab94cfe8d h1:qCiXtxzEl9h5YLd9yOhLULnt7dCcEP5DS7PCGhmX3J0=
267+
github.com/sp-yduck/proxmox-go v0.0.0-20230717071731-9fdab94cfe8d/go.mod h1:hrQc1bUUCN71yn+in+LkfdpJstaaMv2nrn3+GeKFbkA=
268268
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
269269
github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI=
270270
github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
@@ -281,8 +281,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
281281
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
282282
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
283283
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
284-
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
285284
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
285+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
286286
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
287287
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
288288
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

pkg/cloudprovider/instances.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,33 @@ package proxmox
22

33
import (
44
"context"
5+
"crypto/tls"
56
"fmt"
7+
"net/http"
68

7-
"github.com/sp-yduck/proxmox/pkg/service"
8-
// "github.com/sp-yduck/proxmox/pkg/service/node/vm"
9+
"github.com/sp-yduck/proxmox-go/rest"
910
v1 "k8s.io/api/core/v1"
1011
cloudprovider "k8s.io/cloud-provider"
1112
"k8s.io/klog/v2"
1213
)
1314

1415
type instance struct {
15-
compute *service.Service
16+
compute *rest.RESTClient
1617
}
1718

1819
func newInstances(config proxmoxConfig) (cloudprovider.InstancesV2, error) {
19-
svc, err := service.NewServiceWithLogin(config.URL, config.User, config.Password)
20+
base := &http.Client{
21+
Transport: &http.Transport{
22+
TLSClientConfig: &tls.Config{
23+
InsecureSkipVerify: true,
24+
},
25+
},
26+
}
27+
client, err := rest.NewRESTClient(config.URL, rest.WithUserPassword(config.User, config.Password), rest.WithClient(base))
2028
if err != nil {
2129
return nil, err
2230
}
23-
return &instance{compute: svc}, nil
31+
return &instance{compute: client}, nil
2432
}
2533

2634
func (i *instance) InstanceExists(ctc context.Context, node *v1.Node) (bool, error) {
@@ -35,7 +43,7 @@ func (i *instance) InstanceShutdown(ctx context.Context, node *v1.Node) (bool, e
3543

3644
func (i *instance) InstanceMetadata(ctx context.Context, node *v1.Node) (*cloudprovider.InstanceMetadata, error) {
3745
providerID := fmt.Sprintf("%s://%s", ProviderName, node.Status.NodeInfo.SystemUUID)
38-
klog.Infof("initializing node %s with providerID=%s", node.Name, providerID)
46+
klog.Infof("getting metadata for node %s (providerID=%s)", node.Name, providerID)
3947
return &cloudprovider.InstanceMetadata{
4048
ProviderID: providerID,
4149
NodeAddresses: []v1.NodeAddress{},

0 commit comments

Comments
 (0)